wesmiler 3 týždňov pred
rodič
commit
0cfb23a1d3

+ 6 - 1
app/Services/Common/OrderService.php

@@ -452,10 +452,15 @@ class OrderService extends BaseService
             return ['code' => 1, 'msg' => '订单不存在'];
         }
 
-        if ($order->bonus_settle != 1) {
+        if ($order->bonus_settle == 1) {
             return ['code' => 1, 'msg' => '佣金收益已结算'];
         }
 
+
+        if ($order->status != 4) {
+            return ['code' => 1, 'msg' => '订单未完成'];
+        }
+
         RedisService::set($cacheLockKey, $order, rand(10,20));
         DB::beginTransaction();
         // 结算商家收益

+ 5 - 1
app/Services/Common/PayOrdersService.php

@@ -372,10 +372,14 @@ class PayOrdersService extends BaseService
             return ['code' => 1, 'msg' => '订单不存在'];
         }
 
-        if ($order->bonus_settle != 1) {
+        if ($order->bonus_settle == 1) {
             return ['code' => 1, 'msg' => '佣金收益已结算'];
         }
 
+        if ($order->status != 4) {
+            return ['code' => 1, 'msg' => '订单未完成'];
+        }
+
         RedisService::set($cacheLockKey, $order, rand(10,20));
         DB::beginTransaction();