修改拼团

app/adminapi/lists/group_activity/GroupUserOrderLists.php

@@ -38,7 +38,7 @@ class GroupUserOrderLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '=' => ['a.sn','a.status','a.pay_status','a.pay_way','a.refund_status','a.group_activity_id','a.user_equity_id','a.group_order_id','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','c.group_order_status','d.mobile'],
         ];
     }
 
@@ -70,7 +70,7 @@ class GroupUserOrderLists extends BaseAdminDataLists implements ListsSearchInter
             ->leftJoin('user d', 'd.id = a.user_id')
             ->where($this->searchWhere)
             ->where($this->queryWhere())
-            ->field(['a.*', 'b.title','b.image','c.status as group_order_status','d.mobile'])
+            ->field(['a.*', 'b.title','b.image','c.sn as group_order_sn','c.status as group_order_status','d.mobile'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['a.id' => 'desc'])
             ->select()

app/api/logic/GroupActivityLogic.php

@@ -167,8 +167,8 @@ class GroupActivityLogic extends BaseLogic
         Db::startTrans();
         try {
             
-            $userOrder = GroupUserOrder::where(['group_activity_id' => $params['group_activity_id'], 'user_id' => $params['user_id']])->findOrEmpty()->toArray();
-            if ($userOrder && $userOrder['pay_status'] == 1 && $userOrder['refund_status'] == 0) {
+            $userOrder = GroupUserOrder::where(['group_activity_id' => $params['group_activity_id'], 'user_id' => $params['user_id'],'refund_status' => 0])->findOrEmpty()->toArray();
+            if ($userOrder && $userOrder['pay_status'] == 1) {
                 throw new Exception('您已参加过该活动！');
             }