conflict

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -211,11 +211,13 @@ class OrdersController extends BaseController
         if ($template_id == 2) { //模板2只有在长篇小说过来的用户才显示
             //部分渠道需要2元模板不管哪个入口进来都展示
             $exclude_channels = explode(',', env('PRICE_TWO_SHOW_ALL_CHANNEL'));
-            if (!in_array($this->distribution_channel_id, $exclude_channels)) {
-                if ($book_config) {
-                    if ($book_config->charge_type == 'BOOK') $template_id = 1;
-                } else {
-                    $template_id = 1;
+
+            if(!in_array($this->distribution_channel_id,$exclude_channels))
+            {
+                if($book_config){
+                    if($book_config->charge_type == 'BOOK') $template_id = 1;
+                }else{
+                    //$template_id = 1;
                 }
                 /*if ($bid) {
                     $bid = Hashids::decode($bid)[0];

app/Libs/Helpers.php

@@ -538,6 +538,7 @@ function specialChannelAuthInfoV2(){
         '4980'=>'wx002be80fb65d808e',
         '5148'=>'wx8e9ff7a97fa67675',
         '5189'=>'wx475125bc6dd942f9',
-        '4941'=>'wxe7f83fba4596cb03'
+        '4941'=>'wxe7f83fba4596cb03',
+        '5319'=>'wxa697fd62760dfc53'
     ];
 }

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);
     		}