|
@@ -899,7 +899,7 @@ class OrdersController extends Controller
|
|
|
$key = 'leyuee:to_send_not_pay_uid:distribution_channel_id:' . $distribution_channel_id;
|
|
|
Redis::hdel($key, $uid);
|
|
|
DB::commit();
|
|
|
- $this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
+ //$this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
// 注册动作-》回调订单
|
|
|
$action_type = 'CallBackOrder';
|
|
|
$param = [
|
|
@@ -1057,7 +1057,7 @@ class OrdersController extends Controller
|
|
|
$this->orderStatistical($order);
|
|
|
DB::commit();
|
|
|
$this->userProperty($uid,$price,$product->type,$order->activity_id);
|
|
|
- $this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
+ //$this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
//交换订单时间
|
|
|
$this->exchangeUpdateAndCreated($order->id);
|
|
|
//redis 删除未支付的uid
|
|
@@ -1170,7 +1170,7 @@ class OrdersController extends Controller
|
|
|
$this->orderStatistical($order);
|
|
|
DB::commit();
|
|
|
$this->userProperty($uid,$price,$product->type,$order->activity_id);
|
|
|
- $this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
+ //$this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
//redis 删除未支付的uid
|
|
|
$key = 'leyuee:to_send_not_pay_uid:distribution_channel_id' . $distribution_channel_id;
|
|
|
Redis::hdel($key, $uid);
|
|
@@ -1309,7 +1309,7 @@ class OrdersController extends Controller
|
|
|
UserService::PushUserActionToQueue($action_type, $distribution_channel_id, $param);
|
|
|
|
|
|
$this->userProperty($uid,$price,$product->type,$order->activity_id);
|
|
|
- $this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
+ //$this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
//交换订单时间
|
|
|
$this->exchangeUpdateAndCreated($order->id);
|
|
|
}
|
|
@@ -1439,7 +1439,7 @@ class OrdersController extends Controller
|
|
|
UserService::PushUserActionToQueue($action_type, $distribution_channel_id, $param);
|
|
|
|
|
|
$this->userProperty($uid,$price,$product->type,$order->activity_id);
|
|
|
- $this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
+ //$this->huaweiActivity($order->activity_id,$uid,$product_id);
|
|
|
//交换订单时间
|
|
|
$this->exchangeUpdateAndCreated($order->id);
|
|
|
|
|
@@ -1692,6 +1692,7 @@ class OrdersController extends Controller
|
|
|
Log::info('pay_success_push error');
|
|
|
Log::info($e);
|
|
|
}
|
|
|
+ $this->notifyXiyue($uid,$product_info->price);
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -2069,9 +2070,9 @@ class OrdersController extends Controller
|
|
|
$xiyue_user = DB::table('xiyue_zsy_users')->where('uid',$uid)->select('openid')->first();
|
|
|
if($xiyue_user){
|
|
|
$client = new Client(['timeout' => 5]);
|
|
|
- $url = '';
|
|
|
+ $url = env('XIYUE_HOST').'/order/success';
|
|
|
$param = ['openid'=>$xiyue_user->openid,'price'=>$price];
|
|
|
- $param['sign'] = _sign($param,'xxx');
|
|
|
+ $param['sign'] = _sign($param,'8T5MJy4FsJoZspq8');
|
|
|
try{
|
|
|
$client->request('post',$url,['form_params'=>$param])->getBody()->getContents();
|
|
|
}catch (\Exception $e){}
|