修改拼团

app/api/logic/GroupActivityLogic.php

@@ -7,7 +7,6 @@ use think\facade\Log;
 use app\common\enum\RefundEnum;
 use app\common\logic\BaseLogic;
 use app\common\logic\RefundLogic;
-use app\common\model\goods\Goods;
 use app\common\model\equity\UserEquity;
 use app\common\model\equity\EquityConfig;
 use app\common\model\refund\RefundRecord;
@@ -15,7 +14,6 @@ use app\common\model\equity\UserEquityLog;
 use app\common\model\group_activity\GroupOrder;
 use app\common\service\wechat\WeChatMnpService;
 use app\common\model\group_activity\GroupActivity;
-use app\common\model\group_activity\GroupActivityCategory;
 use app\common\model\group_activity\GroupUserOrder;
 
 
@@ -37,7 +35,7 @@ class GroupActivityLogic extends BaseLogic
             return [
                 'timestamp' => time(),
                 'block_key' => $block_key,
-                'activity' => current($result['block_data']),
+                'activity' => current($result['block_data'])['activity'],
             ];
         } else {
             $result = GroupActivity::getActivityList($id);

app/common/model/group_activity/GroupActivity.php

@@ -55,14 +55,16 @@ class GroupActivity extends BaseModel
             $where['block_key'] = $block_key;
         }
         $detail = GroupActivityCategory::where('id',$catetory_id)
-                ->field('id,title,images,start_time,end_time,area,participant_num,form_time_limit,is_simulate_form,simulate_num,type')
+                ->field('id,title,images,start_time,end_time,area,participant_num,form_time_limit,is_simulate_form,simulate_num,type,block_data')
                 ->findOrEmpty()
                 ->toArray();
         $category = [
             'id' => $detail['id'],
             'title' => $detail['title'],
             'images' => explode(",",$detail['images']),
+            'block_data' => json_decode($detail['block_data'],true),
         ];
+        unset($detail['block_data']);
         $detail = array_diff_key($detail,$category);
         $detail['area'] = explode(",",$detail['area']);
         $detail['participant_num'] = explode(",",$detail['participant_num']);
@@ -77,7 +79,12 @@ class GroupActivity extends BaseModel
             $list[$item['block_key']]['block_key'] = $item['block_key'];
             $list[$item['block_key']]['activity'][] = $item;
         }
-        $category['block_data'] = $list;
+
+        foreach($category['block_data'] as &$item) {
+            if (isset($list[$item['block_key']])) {
+                $item['activity'] = $list[$item['block_key']]['activity'];
+            }
+        }
         return $category;
     }