‘linchangsheng’ 9 ay önce
ebeveyn
işleme
242ceab0c6

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

@@ -296,14 +296,14 @@ public class SettlementOrderLogic {
 
         if (settlementOrderService.lambdaQuery()
                 .in(SettlementOrder::getSettlementOrderId, id)
-                .notIn(SettlementOrder::getStatus, SettlementStatusEnum.WAIT.getKey())
+                .notIn(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
                 .count() > 0) {
-            throw new RemoteServiceException("存在非待结算得结算");
+            throw new RemoteServiceException("存在非异常结算得结算单");
         }
 
         settlementOrderService.lambdaUpdate()
                 .in(SettlementOrder::getSettlementOrderId, id)
-                .eq(SettlementOrder::getStatus, SettlementStatusEnum.WAIT.getKey())
+                .eq(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
                 .set(SettlementOrder::getStatus, SettlementStatusNewEnum.LINE.getKey()).update();
     }
 }

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

@@ -57,4 +57,15 @@ public class OrderBaseSchedule {
         pgOrderBaseService.lambdaUpdate().set(PgOrderBase::getIsQdNotice,true).in(PgOrderBase::getId,orderBaseIds).update();
     }
 
+
+
+    /**
+     * 每天五点结算所有结算单
+     */
+    @Transactional
+    @Scheduled(cron = "0 0 12 * * ?")
+    public void fenzhang(){
+
+    }
+
 }