Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -55,6 +55,7 @@ public class PayOrderController {
     public ResponseHelper<Page<WorkerOrder>> orderPage(
             @ApiParam(required = false, value = "商品类型 M=辅材 P=配件") @RequestParam(required = false) String goodsType,
             @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
+            @ApiParam(required = false, value = "工单号") @RequestParam(required = false) String workerOrderId,
             @ApiParam(required = false, value = "销售类型 OWN自有 OUT 外购") @RequestParam(required = false) String settlementType,
             @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime,
             @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
@@ -63,7 +64,7 @@ public class PayOrderController {
             @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws Exception {
-        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
+        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(workerOrderId,yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
         return ResponseHelper.success(workerOrderVOPage);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -885,7 +885,7 @@ public class PayOrderLogic {
 
     }
 
-    public Page<WorkerOrder> orderPage(String yearMonth,String settlementType,String goodsType, String orderId, String startTime, String endTime, String payStatus, Integer pageNum, Integer pageSize) {
+    public Page<WorkerOrder> orderPage(String workerOrderId,String yearMonth,String settlementType,String goodsType, String orderId, String startTime, String endTime, String payStatus, Integer pageNum, Integer pageSize) {
 
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         String startMonTime = null;
@@ -900,6 +900,7 @@ public class PayOrderLogic {
                 .like(!StringUtil.isEmpty(goodsType),WorkerOrder::getGoodsType,goodsType)
                 .like(!StringUtil.isEmpty(settlementType),WorkerOrder::getSettlementType,settlementType)
                 .eq(!StringUtil.isEmpty(orderId),WorkerOrder::getOrderId,orderId)
+                .eq(!StringUtil.isEmpty(workerOrderId),WorkerOrder::getWorkerOrderId,workerOrderId)
                 .and(!StringUtil.isEmpty(payStatus),item -> item
                 .eq(!StringUtil.isEmpty(payStatus),WorkerOrder::getPayStatus,payStatus)
 

mall-server-api/src/main/java/com/gree/mall/manager/enums/workorder/AppraiseStatusEnum.java

@@ -19,6 +19,7 @@ public enum AppraiseStatusEnum implements BaseEnum {
     A("A","满意"),
     B("B","一般"),
     C("C","不满意"),
+    D("D","默认好评"),
     N("N","未评价"),
     O("O","其他"),
     T("T","剔除");

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -332,7 +332,9 @@
             and a.is_exception =1 and a.order_status NOT IN ('YWG','YWGO','YJS')
         </if>
         <if test="ex.orderStatus != null and ex.orderStatus.key =='DYY'.toString()">
-            and a.appointment_time is null
+            and a.appointment_time is null  and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+            'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+            )
         </if>
         <if test="ex.partsApplyStatus != null and ex.partsApplyStatus =='PJSQZ'.toString()">
             and a.id in(select order_base_id from websit_parts_apply where `status` = 'ING')

mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -45,7 +45,9 @@
             'DYY' as 'orderStatus',
             '待预约' as 'orderStatusText'
         from pg_order_base a
-        where appointment_time is null
+        where appointment_time is null and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+        'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+        )
         <include refid="orderBaseSqlWhere"></include>
         <if test="orderSmallType != null and orderSmallType != ''">
             and a.order_small_type = #{orderSmallType}
@@ -115,7 +117,9 @@
             count(if(order_status in ('DJD'),1,null)) as 'djs',
             count(if(order_status in ('DQD'),1,null)) as 'dqd',
             count(if(order_status in ('FWZ'),1,null)) as 'fwz',
-            count(if(appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD'),1,null)) as 'dyy',
+            count(if(appointment_time is null  and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB',
+        'FWQX','FL','YJS','LRCD','DSHPG','CJ','YPD','DXSPD','DZBPG','DWDSPGP','DXSSPGP','DTJXSSPGP','DZBSPGP'
+        ),1,null)) as 'dyy',
             count(if(is_exception = 1 and a.order_status not in  ('YWG','YWGO','YJS'),1,null)) as 'ycdcl',
             count(if(appraise_status in ('C'),1,null)) as 'cp'
         from pg_order_base a