Merge remote-tracking branch 'origin/master'

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -689,12 +689,17 @@ public class OrderController extends BaseController {
             response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
             // 统计待确认单量
             orderDetail.setOrderStatus(null);
+            orderDetail.setOrderStatusList(new ArrayList<Integer>(){{
+                add(4);
+                add(5);
+            }});
             orderDetail.setWorkFinishTimeExisted(true);
             orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{
                 add(0);
                 add(1);
             }});
             response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
+            orderDetail.setOrderStatusList(null);
             // 统计已完成子单量
             orderDetail.setOrderStatus(OrderStatus.FINISH.code());
             orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{

ghy-admin/src/main/resources/application.yaml

@@ -59,7 +59,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: dev
+    active: druid
   # 文件上传
   servlet:
      multipart:

ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java

@@ -144,4 +144,6 @@ public class OrderDetail extends BaseEntity {
     private BigDecimal changeMoney;
 
     private boolean workFinishTimeExisted;
+
+    private List<Integer> orderStatusList;
 }

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -107,6 +107,12 @@
             <if test="orderStatus != null">
                 AND od.order_status = #{orderStatus}
             </if>
+            <if test="orderStatusList != null and orderStatusList.size() > 0">
+                AND od.order_status in
+                <foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
+                    #{orderStatus}
+                </foreach>
+            </if>
             <if test="orderMasterCode != null and orderMasterCode != ''">
                 AND od.order_master_code = #{orderMasterCode}
             </if>
@@ -178,6 +184,12 @@
             <if test="orderStatus != null">
                 AND od.order_status = #{orderStatus}
             </if>
+            <if test="orderStatusList != null and orderStatusList.size() > 0">
+                AND od.order_status in
+                <foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
+                    #{orderStatus}
+                </foreach>
+            </if>
             <if test="orderMasterCode != null and orderMasterCode != 0">
                 AND od.order_detail_code = #{orderMasterCode}
             </if>