修改拼团

app/adminapi/lists/group_activity/GroupUserOrderLists.php

@@ -50,7 +50,7 @@ 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'])) {
+        if (isset($this->params['group_order_status']) && $this->params['group_order_status'] !== '') {
             $where[] = ['c.status', '=', $this->params['group_order_status']];
         }
         return $where;

app/api/logic/GroupActivityLogic.php

@@ -92,9 +92,10 @@ class GroupActivityLogic extends BaseLogic
             }
             //如果开启了模拟成团，成团后，自动填补剩余人数
             if ($detail['status'] == 1 && $detail['num'] < $detail['activity']['participant_num']) {
-                $num = $detail['activity']['participant_num'] - $detail['num'];
+                $num = $detail['activity']['participant_num'][0] - $detail['num'];
                 $robot = self::getRobot($num,$url);
                 $detail['users'] = array_merge($detail['users'],$robot);
+                $detail['num'] = (int)$detail['activity']['participant_num'][0];
             }
             $detail['timestamp'] = time();
         }
@@ -113,7 +114,7 @@ class GroupActivityLogic extends BaseLogic
                 'id' => 0,
                 'user_id' => 0,
                 'status' => 1,
-                'avatar' => $url.'/uploads/group_activity/robot/0be648e5767f18d6af2dbb630c53ba28'.rand(1,33).'.jpg',
+                'avatar' => 'https://cdnweixiu.kyjlkj.com/resource/image/adminapi/default/default_avatar.png',
                 'nickname' => $nicknames[$i],
             ];
         }