需求

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

@@ -1011,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();
 
@@ -1023,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();
 
@@ -1036,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();
 
@@ -1045,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();