Wesmiler

app/Services/Api/OrderService.php

@@ -991,13 +991,8 @@ class OrderService extends BaseService
             return false;
         }
 
-        $revenueRate = $revenueRate>0 && $revenueRate<100? $revenueRate: 0;
-        if($revenueRate<=0){
-            $this->error = '订单分账比例未配置';
-            return false;
-        }
-
         // 订单信息
+        RedisService::set($cacheLockKey, ['id'=>$id,'date'=>date('Y-m-d H:i:s')], 20);
         $info = $this->model->where(['id' => $id, 'mark' => 1])
             ->select(['id', 'order_no','revenue_no','user_id','transaction_id', 'pay_total','revenue_amount', 'status'])
             ->first();
@@ -1005,11 +1000,13 @@ class OrderService extends BaseService
         $revenueAmount = isset($info['revenue_amount']) ? $info['revenue_amount'] : 0;
         $status = isset($info['status']) ? $info['status'] : 0;
         if($status != 4){
+            RedisService::clear($cacheLockKey);
             $this->error = '订单状态错误，未完成收货的订单无法分账';
             return false;
         }
 
         if($revenueAmount<=0){
+            RedisService::clear($cacheLockKey);
             $this->error = '订单分账金额不足';
             return false;
         }
@@ -1026,9 +1023,11 @@ class OrderService extends BaseService
         $orderId = isset($result->order_id)? $result->order_id : '';
         if($state == 'FINISHED'){
             $this->model->where(['id'=>$id])->update(['revenue_status'=>1,'revenue_order_id'=>$orderId,'update_time'=>time()]);
+            RedisService::clear($cacheLockKey);
             $this->error = '分账处理成功';
             return true;
         }else{
+            RedisService::clear($cacheLockKey);
             $this->error = $message;
             return false;
         }