修改拼团

app/adminapi/logic/group_activity/GroupActivityCategoryLogic.php

@@ -122,7 +122,7 @@ class GroupActivityCategoryLogic extends BaseLogic
         try {
             $mnp_page = 'pages/web_view/group';
             
-            $scene_page = 'group';
+            $scene_page = 'good';
             Log::info('getQRCode:'.rawurlencode($scene_page));
             $response = (new WeChatMnpService())->getUnlimitedQRCode(
                 'page='.$scene_page.'&id='.$params['id'],

app/api/logic/GroupActivityLogic.php

@@ -312,7 +312,7 @@ class GroupActivityLogic extends BaseLogic
             $order =  GroupUserOrder::where([
                     'user_id' => $params['user_id'],
                     'id'=>$params['order_id']
-                ])->field('id,sn,status,order_amount,pay_status,pay_way,user_equity_id,user_id,order_terminal')->findOrEmpty()->toArray();
+                ])->field('id,group_order_id,sn,status,order_amount,pay_status,pay_way,user_equity_id,user_id,order_terminal,transaction_id')->findOrEmpty()->toArray();
             if(empty($order)){
                 throw new Exception('订单不存在');
             }
@@ -333,6 +333,11 @@ class GroupActivityLogic extends BaseLogic
             //将用户订单状态更新为申请退款
             GroupUserOrder::where('id',$order['id'])->update(['status' => 3,'refund_status' => 1]);
 
+            //更新拼团订单
+            GroupOrder::where('id',$order['group_order_id'])->update([
+                'num' => Db::raw('num-1'),
+            ]);
+
             // 生成退款记录
             $recordSn = generate_sn(RefundRecord::class, 'sn');
             $record = RefundRecord::create([
@@ -364,6 +369,7 @@ class GroupActivityLogic extends BaseLogic
         catch (\Exception $e) {
             Db::rollback();
             self::$error = $e->getMessage();
+            Log::write("[拼团订单退款失败]:".$e->getMessage());
             return [false, $e->getMessage()];
         }
     }
@@ -400,9 +406,9 @@ class GroupActivityLogic extends BaseLogic
         try {
             $mnp_page = 'pages/group/team';
             
-            $scene_page = 'group';
+            $scene_page = 'team';
             $response = (new WeChatMnpService())->getUnlimitedQRCode(
-                'page='.$scene_page.'&id='.$params['id'].'&order_id='.$params['order_id']."&category_id=".$params['category_id'],
+                'page='.$scene_page.'&id='.$params['id'].'&oid='.$params['order_id']."&cid=".$params['category_id'],
                 $mnp_page,
                 env('miniprogram.mini_env_version', 'release'),
                 false

app/api/validate/GroupOrderValidate.php

@@ -12,20 +12,24 @@ class GroupOrderValidate extends BaseValidate
 {
 
     protected $rule = [
+        'id'=>'require',
         'order_id'=>'require',
         'pay_way' => 'require',
         'group_activity_id' => 'require',
         'area' => 'require',
         'address' =>'require',
+        'category_id' => 'require',
     ];
 
 
     protected $field = [
+        'id' => '活动ID',
         'order_id' => '订单ID',
         'pay_way' => '支付方式',
         'group_activity_id' => '拼团活动ID',
         'area' => '小区',
         'address' => '详细地址',
+        'category_id' => '分类ID',
     ];