|
|
@@ -74,7 +74,7 @@ class GroupActivityLogic extends BaseLogic
|
|
|
/**
|
|
|
* @notes 拼团订单详情
|
|
|
*/
|
|
|
- public static function orderDetail($order_id,$url){
|
|
|
+ public static function orderDetail($order_id,$user_id,$url){
|
|
|
|
|
|
$detail = GroupOrder::where(['id'=>$order_id])->findOrEmpty()->toArray();
|
|
|
if(!empty($detail)){
|
|
|
@@ -82,7 +82,7 @@ class GroupActivityLogic extends BaseLogic
|
|
|
'id','title','image','start_time','end_time','type','equity_id',
|
|
|
'participant_num','origin_price','price','form_time_limit','area'
|
|
|
])->findOrEmpty()->toArray();
|
|
|
-
|
|
|
+ $detail['is_paid'] = 0;
|
|
|
$detail['activity']['area'] = explode(",",$detail['activity']['area']);
|
|
|
|
|
|
$detail['users'] = GroupUserOrder::alias('a')
|
|
|
@@ -96,6 +96,9 @@ class GroupActivityLogic extends BaseLogic
|
|
|
if (strpos($item['avatar'], 'http') === false && !empty($item['avatar'])) {
|
|
|
$item['avatar'] = config('custom.cdn_url').$item['avatar'];
|
|
|
}
|
|
|
+ if ($item['user_id'] == $user_id) {
|
|
|
+ $detail['is_paid'] = 1;
|
|
|
+ }
|
|
|
}
|
|
|
//如果开启了模拟成团,成团后,自动填补剩余人数
|
|
|
if ($detail['status'] == 1 && $detail['num'] < $detail['activity']['participant_num']) {
|