需求

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

@@ -388,7 +388,9 @@ public class SettlementOrderLogic {
 
         List<WorkerOrder> workerOrders = workerOrderService.lambdaQuery().eq(WorkerOrder::getPayState, IsYesNoEnum.YES.getKey())
                 .ne(WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey())
-                .ge(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(), -3)).list();
+                .ge(WorkerOrder::getPayStateTime, DateUtil.offsetMinute(new Date(), -3))
+                .lt(WorkerOrder::getPayStateTime,DateUtil.offsetMillisecond(new Date(),))
+                .list();
 
         for (WorkerOrder workerOrder : workerOrders) {
 
@@ -715,6 +717,10 @@ public class SettlementOrderLogic {
             settlementOrder.setChangeTime(dateTime);
         }
 
+        if (settlementOrderService.lambdaQuery()
+                .eq(SettlementOrder::getOrderId,settlementOrder.getOrderId()).count() > 0)
+            throw new RemoteServiceException(settlementOrder.getOrderId()+"订单已生成");
+
         settlementOrder.insert();
         List<SettlementOrderItem> settlementOrderItems = BeanUtil.copyToList(workerOrderItems, SettlementOrderItem.class);
         for (SettlementOrderItem settlementOrderItem : settlementOrderItems) {