‘linchangsheng’ vor 5 Monaten
Ursprung
Commit
d5b427ed8c

+ 3 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/withdrawal/WithdrawalLogic.java

@@ -198,7 +198,9 @@ public class WithdrawalLogic {
             list = settlementOrderService.lambdaQuery()
                     //.eq(SettlementOrder::getStatus, SettlementStatusEnum.WAIT_ING.getKey())
                     .eq(SettlementOrder::getPayType, PayTypeEnum.WECHAT.getKey())
-                    .eq(SettlementOrder::getUserId, currentCompanyWechat.getUserId()).list();
+                    .and(item -> item.eq(SettlementOrder::getUserId, currentCompanyWechat.getUserId()).or()
+                            .eq(!StringUtils.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),SettlementOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                    ).list();
         }
         if(StringUtils.isNotBlank(websitId)){
             list = list.stream().filter(v -> StringUtils.equals(websitId,v.getWebsitId())).collect(Collectors.toList());