Merge branch 'group_0313'

app/api/logic/GroupActivityLogic.php

@@ -109,7 +109,7 @@ class GroupActivityLogic extends BaseLogic
      * @notes 用户订单详情
      */
     public static function userOrderDetail($order_id,$userId){
-        $detail = GroupUserOrder::with('groupOrder')->where(['id'=>$order_id, 'user_id' => $userId])->field('id,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,user_equity_id,area,address')->findOrEmpty()->toArray();
+        $detail = GroupUserOrder::with('groupOrder')->where(['id'=>$order_id, 'user_id' => $userId])->field('id,status,pay_way,pay_time,pay_status,refund_status,remark,create_time,group_order_id,group_activity_id,user_equity_id,area,address')->findOrEmpty()->toArray();
         if ($detail) {
             $detail['is_refund'] = 0;
             if ($detail['pay_status'] == 1 && $detail['refund_status'] == 0) {
@@ -119,7 +119,12 @@ class GroupActivityLogic extends BaseLogic
                     $detail['is_refund'] = 1;
                 }
             }
-            $detail['goods'] = EquityConfig::where('id', $detail['groupOrder']['equity_id'])->field('id,equity_name,number,day_num')->findOrEmpty()->toArray();
+            $detail['activity'] = GroupActivity::with('goods')->where(['id'=>$detail['group_activity_id']])->visible([
+                'id','title','image','start_time','end_time','type','equity_id',
+                'participant_num','origin_price','price','form_time_limit','area'
+            ])->findOrEmpty()->toArray();
+            
+            $detail['activity']['area'] = explode(",",$detail['activity']['area']);
             $detail['timestamp'] = time();
         }
         return $detail;
@@ -205,7 +210,7 @@ class GroupActivityLogic extends BaseLogic
                 'group_order_id' => $groupOrder['id'],
                 'group_activity_id' => $params['group_activity_id'],
                 'user_id' => $params['user_id'],
-                'remark' => isset($params['remark']) ?? '',
+                'remark' => isset($params['remark']) ? $params['remark'] : '',
                 'order_amount' => $order_amount,
                 'order_terminal' => $params['terminal'],
             ];