修改拼团

app/adminapi/lists/group_activity/GroupOrderLists.php

@@ -38,7 +38,7 @@ class GroupOrderLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['a.group_activity_id', 'a.sn','a.goods_id','a.equity_id','a.status','a.user_id'],
+            '=' => ['a.id','a.group_activity_id', 'a.sn','a.goods_id','a.equity_id','a.status','a.user_id'],
         ];
     }
 

app/adminapi/lists/group_activity/GroupUserOrderLists.php

@@ -38,7 +38,7 @@ class GroupUserOrderLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '=' => ['a.status','a.pay_status','a.pay_way','a.refund_status','a.group_activity_id','a.user_equity_id','a.group_order_id','c.sn','c.group_order_status','d.mobile'],
+            '=' => ['a.status','a.pay_status','a.pay_way','a.refund_status','a.group_activity_id','a.user_equity_id','a.group_order_id','c.sn','d.mobile'],
         ];
     }
 
@@ -50,6 +50,9 @@ class GroupUserOrderLists extends BaseAdminDataLists implements ListsSearchInter
         if(!empty($this->params['title'])){
             $where[] = ['b.title', 'like', '%'.$this->params['title'].'%'];
         }
+        if (isset($this->params['group_order_status'])) {
+            $where[] = ['c.status', '=', $this->params['group_order_status']];
+        }
         return $where;
     }
 

app/adminapi/logic/group_activity/GroupActivityLogic.php

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

app/api/logic/GroupActivityLogic.php

@@ -288,7 +288,7 @@ class GroupActivityLogic extends BaseLogic
             }
 
             //将用户订单状态更新为已取消
-            GroupUserOrder::where('id',$detail['id'])->update(['status' => 4, 'pay_status' => 2]);
+            GroupUserOrder::where('id',$detail['id'])->update(['status' => 3, 'pay_status' => 2]);
             
             Db::commit();
             return true;
@@ -331,7 +331,7 @@ class GroupActivityLogic extends BaseLogic
             }
 
             //将用户订单状态更新为申请退款
-            GroupUserOrder::where('id',$order['id'])->update(['status' => 3,'refund_status' => 1]);
+            GroupUserOrder::where('id',$order['id'])->update(['status' => 2,'refund_status' => 1]);
 
             //更新拼团订单
             GroupOrder::where('id',$order['group_order_id'])->update([
@@ -404,7 +404,7 @@ class GroupActivityLogic extends BaseLogic
     public static function getQRCode($params,$url)
     {
         try {
-            $mnp_page = 'pages/group/team';
+            $mnp_page = 'pages/web_view/group';
             
             $scene_page = 'team';
             $response = (new WeChatMnpService())->getUnlimitedQRCode(

app/common/command/GroupOrder.php

@@ -153,7 +153,7 @@ class GroupOrder extends Command
                     GroupUserOrder::where('id',$item['id'])->update(['remark' => $remark]);
                 } else {
                     //退款成功
-                    GroupUserOrder::where('id',$item['id'])->update(['status' => 3,'refund_status' => 1]);
+                    GroupUserOrder::where('id',$item['id'])->update(['status' => 2,'refund_status' => 1]);
                 }
 
             }