Merge branch 'zhoulj' of iqiyoo:zhuishuyun_wap into zhoulj

app/Modules/User/Services/UserService.php

@@ -12,6 +12,7 @@ use App\Modules\User\Models\User;
 use DB;
 use App\Jobs\ActionTrigger;
 use App\Modules\OfficialAccount\Models\DistributionSelfDefineConfig;
+use App\Modules\Channel\Models\Channel;
 
 class UserService
 {
@@ -269,6 +270,16 @@ class UserService
 //     			\Log::info('not_action_call_ycsd:'.$distribution_channel_id);
     			return '';
     		}else{
+    			// 如果支付通道已经切换回去，则不推送了
+    			$pay_merchant_id = env('YCSD_CALL_PAY_MERCHANT_ID');
+    			$channel = Channel::getById($distribution_channel_id);
+    			$current_pay_merchant_id = isset($channel->pay_merchant_id)?$channel->pay_merchant_id:'';
+    			\Log::info('action_call_ycsd:'.$distribution_channel_id.' $pay_merchant_id:'.$pay_merchant_id.' $current_pay_merchant_id:'.$current_pay_merchant_id);
+    			if($current_pay_merchant_id != $pay_merchant_id){
+    				\Log::info('action_call_ycsd_has_change_pay_return:'.$distribution_channel_id);
+    				return '';
+    			}
+
     			\Log::info('action_call_ycsd:'.$distribution_channel_id);
     		}