Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Console/Commands/BookTest.php

@@ -2,9 +2,13 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\SendTexts;
 use App\Modules\Book\Services\BookSubscribleChapterService;
+use App\Modules\Product\Services\ProductService;
 use App\Modules\Subscribe\Services\ChapterOrderService;
+use App\Modules\Subscribe\Services\SubstituteOrderService;
 use App\Modules\User\Services\ReadRecordService;
+use App\Modules\User\Services\UserService;
 use App\Modules\YunQi\Models\BookUser;
 use App\Modules\YunQi\Models\YqUserBidRelation;
 use App\Modules\YunQi\Models\YqZsyTest;
@@ -69,6 +73,7 @@ class BookTest extends Command
         //$this->sendOrderStats105();
         //$this->you2();
         //$this->transfromUserOrder();
+        $this->successPayPushMsg();
     }
 
 
@@ -557,4 +562,60 @@ class BookTest extends Command
         }
     }
 
+
+    protected function successPayPushMsg()
+    {
+        try {
+            $uid = 10008;
+            $order_id = 10910163;
+            $product_info = ProductService::getProductSingle(2);
+            $force_sub_info = DB::table('force_subscribe_users')->where('uid',$uid)->where('is_subscribed', 1)->get();
+            $data = UserService::getById($uid);
+            if (!in_array($data->distribution_channel_id, [5, 123])) {
+                //return false;
+            }
+            if ($force_sub_info) {
+                //$content_format = "您好,你已经成功充值\r\n\r\n会员:%s\r\n会员ID:%s\r\n充值金额:%s\r\n充值状态:充值成功\r\n如有疑问,请点击用户中心-联系客服\r\n\r\n><a href='%s'>点击继续阅读上次阅读</a>";
+                if (SubstituteOrderService::getByOrderId($order_id)) {
+                    $content_format = "代充值客服消息：\r\n\r\n你好，您的好友为你代付成功\r\n会员:%s\r\n会员ID:%s\r\n代付金额:%s\r\n充值状态:充值成功\r\n如有疑问,请点击用户中心-联系客服\r\n\r\n><a href='%s'>点击继续阅读上次阅读</a>";
+                } else {
+                    $content_format = "您好,你已经成功充值\r\n\r\n会员:%s\r\n会员ID:%s\r\n充值金额:%s\r\n充值状态:充值成功\r\n如有疑问,请点击用户中心-联系客服\r\n\r\n><a href='%s'>点击继续阅读上次阅读</a>";
+                }
+                if ($product_info->type == 'YEAR_ORDER') {
+                    $money_text = $product_info->price . '元(尊贵的年费VIP会员)';
+                } elseif ($product_info->type == 'TICKET_RECHARGE') {
+                    if ($product_info->given) {
+                        $money_text = $product_info->price . '元(' . ($product_info->price * 100) . '书币+赠送' . $product_info->given . '书币)';
+                    } else {
+                        $money_text = $product_info->price . '元(' . ($product_info->price * 100) . '书币)';
+                    }
+                } else {
+                    $money_text = '未知';
+                }
+                $delay = 0;
+                $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($data->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/continue';;
+                $content = sprintf($content_format, $data->nickname ? $data->nickname : '匿名', $uid, $money_text, $url);
+                foreach ($force_sub_info as $item){
+                    $res['openid'] = $item->openid;
+                    $res['appid'] = $item->appid;
+                    $res['content'] = $content;
+                    $res['type'] = 'one_task';
+                    $res['send_time'] = date("Y-m-d H:i:s");
+                    $res['task_id'] = md5('pay_success_push');
+                    $send_data = array(
+                        'send_time' => date("Y-m-d H:i:s"),
+                        'data' => $res
+                    );
+                    Log::info($send_data);
+                    dispatch((new SendTexts($send_data))->onConnection('rabbitmq')->delay($delay)->onQueue('send_texts_list'));
+                }
+
+            }
+        } catch (\Exception $e) {
+            Log::info('pay_success_push error');
+            Log::info($e);
+        }
+        return true;
+    }
+
 }

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

@@ -1160,7 +1160,7 @@ class OrdersController extends Controller
     protected function successPayPushMsg($uid, $product_info, $order_id)
     {
         try {
-            $force_sub_info = $this->getSubscribe($uid);
+            $force_sub_info = $this->getSubscribeV2($uid);
             $data = UserService::getById($uid);
             if (!in_array($data->distribution_channel_id, [5, 123])) {
                 //return false;
@@ -1186,22 +1186,24 @@ class OrdersController extends Controller
                 $delay = 0;
                 $url = env('PROTOCOL') . '://site' . encodeDistributionChannelId($data->distribution_channel_id) . '.' . env('CUSTOM_HOST') . '.com/continue';;
                 $content = sprintf($content_format, $data->nickname ? $data->nickname : '匿名', $uid, $money_text, $url);
-                $res['openid'] = $force_sub_info->openid;
-                $res['appid'] = $force_sub_info->appid;
-                $res['content'] = $content;
-                $res['type'] = 'one_task';
-                $res['send_time'] = date("Y-m-d H:i:s");
-                $res['task_id'] = md5('pay_success_push');
-                $send_data = array(
-                    'send_time' => date("Y-m-d H:i:s"),
-                    'data' => $res
-                );
-                dispatch((new SendTexts($send_data))->onConnection('rabbitmq')->delay($delay)->onQueue('send_texts_list'));
+                foreach ($force_sub_info as $item){
+                    $res['openid'] = $item->openid;
+                    $res['appid'] = $item->appid;
+                    $res['content'] = $content;
+                    $res['type'] = 'one_task';
+                    $res['send_time'] = date("Y-m-d H:i:s");
+                    $res['task_id'] = md5('pay_success_push');
+                    $send_data = array(
+                        'send_time' => date("Y-m-d H:i:s"),
+                        'data' => $res
+                    );
+                    dispatch((new SendTexts($send_data))->onConnection('rabbitmq')->delay($delay)->onQueue('send_texts_list'));
+                }
             }
         } catch (\Exception $e) {
-
+            Log::info('pay_success_push error');
+            Log::info($e);
         }
-
         return true;
     }
 
@@ -1248,6 +1250,11 @@ class OrdersController extends Controller
         return ForceSubscribeService::forceSubscribeUsersByUid(['uid' => $uid]);
     }
 
+    private function getSubscribeV2($uid)
+    {
+        return DB::table('force_subscribe_users')->where('uid',$uid)->where('is_subscribed', 1)->get();
+    }
+
     public function getSubscribeOfficialName($uid)
     {
         $subscribe = $this->getSubscribe($uid);

app/Http/Middleware/ReadOauth.php

@@ -365,6 +365,8 @@ class ReadOauth
 
         ForceSubscribeService::tempForceSubscribeUsersLastTimeUpdate([
             'openid' => $openid,
+        	'appid' => $appid,
+        	'distribution_channel_id' => $distribution_channel_id,
             'last_interactive_time' => date('Y-m-d H:i:s')
         ]);
 

app/Libs/Helpers.php

@@ -489,6 +489,7 @@ function specialChannelAuthInfoV2(){
         '4908'=>'wx8d46d69ab9d76c55',
         '4909'=>'wx2c62f7f4a02176d7',
         '4910'=>'wx7ee2ad6685e3d5b3',
-        '4820'=>'wx30ecb35d13959f8d'
+        '4820'=>'wx30ecb35d13959f8d',
+        '4980'=>'wx002be80fb65d808e'
     ];
 }