Wesmiler

app/Services/Api/OrderService.php

@@ -469,25 +469,25 @@ class OrderService extends BaseService
     /**
      * 订单取消
      * @param $userId
-     * @param $id
+     * @param $orderId
      * @return array|false
      */
-    public function cancel($userId, $id)
+    public function cancel($userId, $orderId)
     {
-        if ($id <= 0) {
+        if ($orderId <= 0) {
             $this->error = '请选择订单';
             return false;
         }
 
         // 缓存锁
-        $cacheLockKey = "caches:orders:cancel_lock:{$userId}_{$id}";
+        $cacheLockKey = "caches:orders:cancel_lock:{$userId}_{$orderId}";
         if (RedisService::get($cacheLockKey)) {
             $this->error = '订单处理中～';
             return false;
         }
 
         // 商品数据
-        RedisService::set($cacheLockKey, ['order_id' => $id, 'user_id' => $userId], rand(3, 5));
+        RedisService::set($cacheLockKey, ['order_id' => $orderId, 'user_id' => $userId], rand(3, 5));
 
         // 用户信息
         $userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
@@ -501,7 +501,7 @@ class OrderService extends BaseService
         }
 
         // 订单信息
-        $info = $this->model->where(['id' => $id, 'mark' => 1])
+        $info = $this->model->where(['id' => $orderId, 'mark' => 1])
             ->select(['id', 'order_no', 'pay_total', 'status'])
             ->first();
         $orderNo = isset($info['order_no']) ? $info['order_no'] : '';
@@ -523,10 +523,10 @@ class OrderService extends BaseService
         DB::beginTransaction();
         if($orderGoods){
             foreach($orderGoods as $goods){
-                $id = isset($goods['goods_id'])?$goods['goods_id']:0;
+                $goodsId = isset($goods['goods_id'])?$goods['goods_id']:0;
                 $num = isset($goods['num'])?$goods['num']:0;
                 $skuId = isset($goods['sku_id'])?$goods['sku_id']:0;
-                if($id && !GoodsModel::where(['id'=>$id])->update(['stock'=>DB::raw("stock + {$num}"),'update_time'=>time()])){
+                if($goodsId && !GoodsModel::where(['id'=>$goodsId])->update(['stock'=>DB::raw("stock + {$num}"),'update_time'=>time()])){
                     DB::rollBack();
                     RedisService::clear($cacheLockKey);
                     $this->error = '商品库存处理失败';
@@ -545,10 +545,10 @@ class OrderService extends BaseService
         $this->error = '取消订单成功';
         $this->model->where(['user_id' => $userId, 'mark' => 0])->where('update_time', '<=', time() - 300)->delete();
         OrderGoodsModel::where(['order_no' => $orderNo, 'mark' => 0])->where('update_time', '<=', time() - 300)->delete();
-        $this->model->where(['id' => $id])->update(['mark' => 0, 'update_time' => time()]);
+        $this->model->where(['id' => $orderId])->update(['mark' => 0, 'update_time' => time()]);
         OrderGoodsModel::where(['order_no' => $orderNo])->update(['mark' => 0, 'update_time' => time()]);
         DB::commit();
-        return ['id' => $id];
+        return ['id' => $orderId];
     }
 
     /**