fix

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -159,66 +159,65 @@ class StoreGroupOrderRepository extends BaseRepository
                 // 取消订单时 删除限制合伙人商品代理限制
                 $key ='area_manage_order:'.$order['area_manage_address_ids'];
                 $redis->del($key);
-            }
-            $groupOrder->save();
 
-            //取消订单，返还京豆和积分
-            $orderId = $order->order_id;
-            $userSignScoreInfo = Db::name('user_sign_score')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
-            if($userSignScoreInfo){
-                $userDecScore = $userSignScoreInfo['reward_socre'];
-                Db::name('user_sign_score')
-                    ->where('id', $userSignScoreInfo['id'])
-                    ->update([
-                        'status' => 0,
-                    ]);
-
-                //返还扣除积分
-                $user = Db::name('user')->where('uid', $uid)->find();
-                $userScore = $user['score'];
-                $ins_data['uid'] = $uid;
-                $ins_data['reward_socre'] = $userDecScore;
-                $ins_data['addtime'] = time();
-                $ins_data['status'] = 1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
-                $ins_data['order_type'] = 'cancel_order';
-                $ins_data['order_id'] = $orderId;
-                $ins_data['mark'] = "取消订单返还预扣积分";
-                $ins_data['desc'] = '取消订单返还预扣积分';
-                $ins_data['surplus'] = $userScore + $userDecScore;
-                $ins_data['type'] = 4;//没用
-                $ins_data['pm'] = 1;
-                Db::name('user_sign_score')->insertGetId($ins_data);
-                Db::name('user')->where('uid', $uid)->inc('score', $userDecScore)->update();
-            }
+                //取消订单，返还京豆和积分
+                $orderId = $order->order_id;
+                $userSignScoreInfo = Db::name('user_sign_score')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                if($userSignScoreInfo){
+                    $userDecScore = $userSignScoreInfo['reward_socre'];
+                    Db::name('user_sign_score')
+                        ->where('id', $userSignScoreInfo['id'])
+                        ->update([
+                            'status' => 0,
+                        ]);
+
+                    //返还扣除积分
+                    $user = Db::name('user')->where('uid', $uid)->find();
+                    $userScore = $user['score'];
+                    $ins_data['uid'] = $uid;
+                    $ins_data['reward_socre'] = $userDecScore;
+                    $ins_data['addtime'] = time();
+                    $ins_data['status'] = 1;//京豆状态1-有效 0-失效 -1待确认 创建的时候-1待确认 取消订单返还积分变为0 支付成功变为1
+                    $ins_data['order_type'] = 'cancel_order';
+                    $ins_data['order_id'] = $orderId;
+                    $ins_data['mark'] = "取消订单返还预扣积分";
+                    $ins_data['desc'] = '取消订单返还预扣积分';
+                    $ins_data['surplus'] = $userScore + $userDecScore;
+                    $ins_data['type'] = 4;//没用
+                    $ins_data['pm'] = 1;
+                    Db::name('user_sign_score')->insertGetId($ins_data);
+                    Db::name('user')->where('uid', $uid)->inc('score', $userDecScore)->update();
+                }
+
+                $userSignJingdouInfo = Db::name('user_sign_jingdou')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
+                if($userSignJingdouInfo){
+                    $userDecJingScore = $userSignJingdouInfo['number'];
+                    Db::name('user_sign_jingdou')
+                        ->where('id',$userSignJingdouInfo['id'])
+                        ->update([
+                            'status' => 0,
+                        ]);
+
+                    //返还扣除京豆
+                    $user = Db::name('user')->where('uid', $uid)->find();
+                    $userJingdou = $user['jingdou'];
+                    $ins_data['uid'] = $uid;
+                    $ins_data['number'] = $userDecJingScore;
+                    $ins_data['status'] = 1;
+                    $ins_data['mark'] = "取消订单返还预扣京豆";
+                    $ins_data['desc'] = "取消订单返还预扣京豆";
+                    $ins_data['order_id'] = $orderId;
+                    $ins_data['surplus'] = $userJingdou + $userDecJingScore;
+                    $ins_data['order_type'] = 'cancel_order';
+                    $ins_data['type'] = 1;
+                    $ins_data['addtime'] = time();
+                    Db::name('user_sign_jingdou')
+                        ->insertGetId($ins_data);
+                    Db::name('user')->where('uid', $uid)->inc('jingdou', $userDecJingScore)->update();
+                }
 
-            $userSignJingdouInfo = Db::name('user_sign_jingdou')->where('order_id', $orderId)->where('status',-1)->where('order_type','store_order')->find();
-            if($userSignJingdouInfo){
-                $userDecJingScore = $userSignJingdouInfo['number'];
-                Db::name('user_sign_jingdou')
-                    ->where('id',$userSignJingdouInfo['id'])
-                    ->update([
-                        'status' => 0,
-                    ]);
-
-                //返还扣除京豆
-                $user = Db::name('user')->where('uid', $uid)->find();
-                $userJingdou = $user['jingdou'];
-                $ins_data['uid'] = $uid;
-                $ins_data['number'] = $userDecJingScore;
-                $ins_data['status'] = 1;
-                $ins_data['mark'] = "取消订单返还预扣京豆";
-                $ins_data['desc'] = "取消订单返还预扣京豆";
-                $ins_data['order_id'] = $orderId;
-                $ins_data['surplus'] = $userJingdou + $userDecJingScore;
-                $ins_data['order_type'] = 'cancel_order';
-                $ins_data['type'] = 1;
-                $ins_data['addtime'] = time();
-                Db::name('user_sign_jingdou')
-                    ->insertGetId($ins_data);
-                Db::name('user')->where('uid', $uid)->inc('jingdou', $userDecJingScore)->update();
             }
-
-
+            $groupOrder->save();
 
             app()->make(StoreOrderStatusRepository::class)->insertAll($orderStatus);