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

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

@@ -890,7 +890,9 @@ public class PayOrderLogic {
                 )
                 .eq(!StringUtil.isEmpty(payStatus) && payStatus.equals(MaterialExamineStatusEnum.PAID.getKey()),WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
-                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                    .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime,startTime,endTime)
                 .in(WorkerOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(WorkerOrder::getCreateTime)
@@ -1009,7 +1011,9 @@ public class PayOrderLogic {
 
                         .or(iter -> iter.eq(WorkerOrder::getRefundStatus, IsYesNoEnum.YES.getKey()))
                 )
-                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUserId())
+                .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                        .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .in(WorkerOrder::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
 
@@ -1021,7 +1025,9 @@ public class PayOrderLogic {
                 .eq(!StringUtil.isEmpty(currentCompanyWechat.getUserId()), WorkerOrder::getUserId, currentCompanyWechat.getUserId())
 
                 .eq( WorkerOrder::getPayStatus, "WAIT")
-                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUserId())
+                .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                        .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .in(WorkerOrder::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
 
@@ -1034,7 +1040,9 @@ public class PayOrderLogic {
                 .eq(WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
                 .eq( WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
-                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUserId())
+                .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                        .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .in(WorkerOrder::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
 
@@ -1043,7 +1051,9 @@ 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(currentCompanyWechat.getUserId()), WorkerOrder::getUserId, currentCompanyWechat.getUserId())
+                .and(item -> item.eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
+                        .or().eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                )
                 .between(!StringUtil.isEmpty(startTime), WorkerOrder::getCreateTime, startTime, endTime)
                 .in(WorkerOrder::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
 

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -15,7 +15,8 @@
             COUNT(DISTINCT a.id) AS 'all'
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id
-    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
+    where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or (a.order_status = 'DQD' and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB'))
+    ) and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>