需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/SettlementOrderLogic.java

@@ -828,7 +828,8 @@ public class SettlementOrderLogic {
 
             List<PgOrderBase> pgOrderBaseList = pgOrderBases.stream().filter(item ->
                     item.getOrderSmallTypeText().equals(record.getOrderSmallTypeText())
-                    && item.getWorkerName().equals(record.getWorkerNumber())
+                            && !StringUtil.isEmpty(item.getWorkerNumber())
+                    && item.getWorkerNumber().equals(record.getWorkerNumber())
                     && item.getWebsitId().equals(record.getWebsitId())
             ).collect(Collectors.toList());
 

mall-server-api/src/main/java/com/gree/mall/manager/schedule/OrderBaseSchedule.java

@@ -81,7 +81,7 @@ public class OrderBaseSchedule {
     @Scheduled(cron = "0 0 17 * * ?")
   //  @Scheduled(fixedDelay = 60  * 1000)
     public void fenzhang() throws WxPayException {
-        List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().eq(SettlementOrder::getStatus, "WAIT").list();
+        List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().in(SettlementOrder::getStatus, "WAIT","YC").list();
 
         for (SettlementOrder settlementOrder : settlementOrders) {
             wechatLogic.shareSettlementAmountCorn(settlementOrder);