后端代码逻辑优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDetailDTO.java

@@ -22,4 +22,6 @@ public class OmsOrderDetailDTO extends OmsOrderDTO {
     private static final long serialVersionUID = 5402866033633311581L;
 
     private List<OmsOrderItemDTO> orderItemList;
+
+    private boolean isReservation = false;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/OmsOrderMapper.java

@@ -122,4 +122,7 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder>
     OrderDTO queryOrderManage(@Param("merchantId")Long merchantId);
 
     MerchantTeamDTO queryTeamOrder(@Param("merchantId")Long merchantId);
+
+
+    Integer countReservationByOrderId(@Param("orderId") Long orderId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -483,6 +483,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         orderDetail.setOrderItemList(orderItemList);
         MerchantDTO merchant = this.merchantService.getMerchantById(omsOrder.getMerchantId());
         orderDetail.setMerchantInfo(merchant);
+        Integer count = this.baseMapper.countReservationByOrderId(orderId);
+        if (count > 0){
+            orderDetail.setReservation(true);
+        }
         return orderDetail;
     }
 

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -9,7 +9,7 @@
     </sql>
 
     <select id="listNearbyMerchants" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantDTO">
-        select mt.id, mt.name, mt.logo, mt.score, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
+        select mt.id, mt.name, mt.logo, mt.score, mt.sale,mt.opening, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
         round(st_distance_sphere(
             point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
         )) distance
@@ -20,7 +20,7 @@
 
 
     <select id="listNearbyMerchantPaging" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantDTO">
-        select mt.id, mt.name, mt.logo, mt.score, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
+        select mt.id, mt.name, mt.logo, mt.score, mt.sale,mt.opening, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
                round(st_distance_sphere(
                        point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
                    )) distance
@@ -30,7 +30,7 @@
     </select>
 
     <select id="listRecommendMerchants" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantDTO">
-        select mt.id, mt.name, mt.logo, mt.score, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
+        select mt.id, mt.name, mt.logo, mt.score,mt.opening, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
         round(st_distance_sphere(
             point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
         )) distance
@@ -41,7 +41,7 @@
 
 
     <select id="listRecommendMerchantPaging" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantDTO">
-        select mt.id, mt.name, mt.logo, mt.score, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
+        select mt.id, mt.name, mt.logo, mt.score, mt.opening,mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
                round(st_distance_sphere(
                        point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
                    )) distance
@@ -51,7 +51,7 @@
     </select>
 
     <select id="listSimpleMerchants" resultType="com.chelvc.cloud.vehicle.client.dto.MerchantDTO">
-        select mt.id, mt.name, mt.logo, mt.score, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
+        select mt.id, mt.name, mt.logo, mt.score,mt.opening, mt.sale, mt.address,mt.business_status,c.name as mainBusinessName,mt.main_business,
         round(st_distance_sphere(
             point(mt.longitude, mt.latitude), point(#{longitude}, #{latitude})
         )) distance

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -930,7 +930,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             oms_order
         WHERE
-            STATUS = '4'
+            STATUS = '3'
             and merchant_id = #{merchantId}
           AND DATE_FORMAT( payment_time, '%Y%m%d' ) = DATE_FORMAT(
                 now(),
@@ -976,4 +976,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and
             o.user_id in (select i.target_id FROM user_invite i where i.user_id = #{merchantId})
     </select>
+
+    <select id="countReservationByOrderId" resultType="java.lang.Integer">
+        SELECT
+            count(0)
+        FROM
+            reservation
+        WHERE
+            order_id = #{orderId}
+    </select>
 </mapper>