This commit is contained in:
小鱼开发
2024-06-21 18:06:10 +08:00
parent 1c40a6f07b
commit bb2004cb0d
+2 -2
View File
@@ -156,8 +156,9 @@ class Item extends Wx{
}
$user = $this->user_model->get(['userId'=>$this->uid]);
$act_user = $this->act_user_model->get(['userId'=>$this->uid,'activityId'=>$a_id]);
$act = $this->market_sylive_activity_model->get(['activityId'=>$row['activityId']]);
if($act_user['channelId'] != $act_user['pid'] && $act_user['pid'] && in_array($a_id, array(21))) {
if($act['orderType'] && $act_user['channelId'] != $act_user['pid'] && $act_user['pid'] ) {
$p_user = $this->act_user_model->get(['userId'=>$act_user['pid'], 'activityId'=>$a_id]);
} else{
$p_user = $this->act_user_model->get(['userId'=>$act_user['channelId'], 'activityId'=>$a_id]);
@@ -228,7 +229,6 @@ class Item extends Wx{
}
$notify_url = http_host_com('home').'/h5/market/sylive2/notify/item';
$other_data = [];
$act = $this->market_sylive_activity_model->get(['activityId'=>$row['activityId']],'mchId');
$pay_config = $this->market_sylive_activity_model->pay_config($act['mchId']);
$pay_config && $other_data['pay_config'] = $pay_config;
$result = $this->unorder($unpay['sid'],$unpay['totalPrice'],$user['openid'],$unpay['itemTitle'],$notify_url,$unpay['expireTime'],$other_data);