回调原创书殿从redis取

app/Console/Commands/Tool/TestSmartPush.php

@@ -10,7 +10,6 @@ use Illuminate\Console\Command;
 use App\Modules\User\Services\UserService;
 use App\Modules\User\Services\UserSignService;
 use App\Modules\Book\Services\BookConfigService;
-
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\OfficialAccount\Services\OfficialAccountService;
 use App\Modules\User\Services\ReadRecordService;
@@ -58,11 +57,17 @@ class TestSmartPush extends Command
 //         $result = OfficialAccountService::get_short_url($distribution_channel_id,$url);
         
 //         $result = ReadRecordService::getFirstReadRecord($uid);
-        for($i =109861725;$i<=109861735;$i++){
-        	UserSignService::signToday($i);
-        }
-        
+//         for($i =109861725;$i<=109861735;$i++){
+//         	UserSignService::signToday($i);
+//         }
         
+        // 注册动作-》回调订单
+        $action_type = 'CallBackOrder';
+        $param = [
+	        'order_sn' => '123',
+	        'openid' => '123',// 没有openid，用uid写log
+        ];
+        UserService::PushUserActionToQueue($action_type,14,$param);
         
         print_r("======智能推送测试 【任务执行结束】=====".date("y-m-d H:i:s"."\n"));
         print_r('memory_used:'.memory_get_usage()."\n");

app/Modules/Trade/Models/Order.php

@@ -222,7 +222,11 @@ class Order extends Model
         if (isset($params['distribution_channel_id']) && $params['distribution_channel_id']) $search_obj->where('distribution_channel_id', $params['distribution_channel_id']);
         return $search_obj->count();
     }
-
+    static function getByTradeNo($distribution_channel_id,$trade_no)
+    {
+    	return self::where('distribution_channel_id', $distribution_channel_id)->where('trade_no', $trade_no)->first();
+    }
+    
     //获取派单下的普通用户订单总数
     static function getNormalOrderCount($send_order_id)
     {

app/Modules/User/Services/UserService.php

@@ -13,6 +13,8 @@ use DB;
 use App\Jobs\ActionTrigger;
 use App\Modules\OfficialAccount\Models\DistributionSelfDefineConfig;
 use App\Modules\Channel\Models\Channel;
+use App\Modules\Trade\Models\Order;
+use Redis;
 
 class UserService
 {
@@ -274,13 +276,27 @@ class UserService
     		}else{
     			\Log::info('PushUserActionToQueue_param:'.$distribution_channel_id.' action_type:'.$action_type. ' param:'.json_encode($param));
     			// 如果支付通道已经切换回去，则不推送了
-    			$pay_merchant_id = env('YCSD_CALL_PAY_MERCHANT_ID');
+//     			$pay_merchant_id = env('YCSD_CALL_PAY_MERCHANT_ID');
+
+    			// 当前默认
+    			$pay_merchant_id = Redis::get('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 '';
+    				//  判断订单是否是默认支付，放行，切换期间的bug
+    				if($action_type == 'CallBackOrder'){
+    					$order = Order::getByTradeNo($distribution_channel_id, $param['order_sn']);
+    					if(isset($order->pay_merchant_id) && $order->pay_merchant_id == $pay_merchant_id){
+    						\Log::info('action_call_ycsd_old_order_continue:'.$param['order_sn']);
+    					}else{
+    						\Log::info('action_call_ycsd_has_change_pay_return:'.$distribution_channel_id);
+    						return '';
+    					}
+    				}else{
+    					\Log::info('action_call_ycsd_has_change_pay_return:'.$distribution_channel_id);
+    					return '';
+    				}
     			}
 
     			\Log::info('action_call_ycsd:'.$distribution_channel_id);