‘linchangsheng’ 2 周之前
父節點
當前提交
708ec1970b

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

@@ -406,7 +406,7 @@ public class PayOrderLogic {
             if (workerOrderOne != null){
                 Integer countWait = workerOrderService.lambdaQuery()
                         .ge(WorkerOrder::getTotalAmount, workerOrderOne.getTotalAmount())
-                        .eq(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey())
+                        .in(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey(),PayStatusEnum.PAID.getKey())
                         .eq(WorkerOrder::getWorkerOrderId, workerOrderDetail.getWorkerOrderId())
                         .count();
 
@@ -941,7 +941,7 @@ public class PayOrderLogic {
                 if (workerOrder != null){
                     Integer countWait = workerOrderService.lambdaQuery()
                             .ge(WorkerOrder::getTotalAmount, workerOrder.getTotalAmount())
-                            .eq(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey())
+                            .in(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey(),PayStatusEnum.PAID.getKey())
                             .eq(WorkerOrder::getWorkerOrderId, workerOrderDetail.getWorkerOrderId())
                             .count();