Bläddra i källkod

Merge branch 'master' of iqiyoo:zhuishuyun_wap

onlinetest 6 år sedan
förälder
incheckning
a9cdebfa3b

+ 1 - 0
app/Console/Commands/selectCrmSites.php

@@ -72,6 +72,7 @@ class selectCrmSites extends Command
         $innerSites = $this->getInnerSite();
         $result = [];
         foreach ($distribution_channel_id as $item){
+            if(Redis::Hexists('specialChannelAuthInfoV2',$item)) continue;
             //去除设置了二维码的站点
             if(in_array($item,$setServiceSites)) continue;
             //去除内部站点

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 31 - 22
app/Http/Controllers/Wap/Book/ChapterController.php


+ 42 - 0
app/Http/Controllers/Wap/Other/XiyueController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers\Wap\Other;
+
+use App\Modules\Subscribe\Services\YearOrderService;
+use App\Modules\User\Models\User;
+use App\Modules\User\Models\UserWealthyOperateRecord;
+use App\Modules\User\Services\UserService;
+use App\Modules\User\Services\UserWealthyOperateRecordService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use DB;
+
+class XiyueController extends Controller
+{
+    public function xiyuePayNotity(Request $request){
+        $openid = $request->post('openid');
+        $sign = $request->post('sign');
+        $mySign = _sign(compact('openid'),'8T5MJy4FsJoZspq8');
+        if($sign != $mySign){
+            return response()->error('PARAM_ERROR');
+        }
+        $user = UserService::getUserByUnionAndChannelId($openid,6985);
+        if(!$user){
+            $user =  UserService::addUser(
+                ['openid' => $openid,
+                    'unionid' => $openid,
+                    'distribution_channel_id' =>6985,
+                    'send_order_id'=>0,
+                    'is_new'=>1,
+                    'register_ip'=>''
+                ]);
+        }
+        YearOrderService::save_year_order([
+            'uid'=>$user->id,
+            'fee'=>0,
+            'send_order_id'=>0
+        ]);
+        UserWealthyOperateRecordService::create($user->id,365,6985,'yearRecharge');
+        return response()->success();
+    }
+}

+ 15 - 8
app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -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;
     }
 
@@ -1773,8 +1774,8 @@ class OrdersController extends Controller
 
     private function payAlert($pay_merchant_id, $trade_no = '', $pay_info = '', $n = 0)
     {
-        $change_pay_id = 40;
-        if ($pay_merchant_id == 40) {
+        $change_pay_id = 96;
+        if ($pay_merchant_id == 96) {
             $change_pay_id = 9;
         }
         try {
@@ -2068,7 +2069,13 @@ class OrdersController extends Controller
     private function notifyXiyue($uid,$price,$type='recharge'){
         $xiyue_user = DB::table('xiyue_zsy_users')->where('uid',$uid)->select('openid')->first();
         if($xiyue_user){
-
+            $client = new Client(['timeout' => 5]);
+            $url = env('XIYUE_HOST').'/order/success';
+            $param = ['openid'=>$xiyue_user->openid,'price'=>$price];
+            $param['sign'] = _sign($param,'8T5MJy4FsJoZspq8');
+            try{
+                $client->request('post',$url,['form_params'=>$param])->getBody()->getContents();
+            }catch (\Exception $e){}
         }
     }
 }

+ 2 - 2
app/Http/Controllers/Wap/User/CoflController.php

@@ -729,8 +729,8 @@ class CoflController extends Controller
             return view('jump.guidePersonalAccountOurs',['img'=>$cookie_crm_img,'name'=>$cookie_crm_name,'fee'=>$fee]);
         }
 
-        //$distribution_channel_id = decodeDistributionChannelId($channel_id);
-        $distribution_channel_id = $channel_id;
+        $distribution_channel_id = decodeDistributionChannelId($channel_id);
+        //$distribution_channel_id = $channel_id;
         //if(in_array($distribution_channel_id,Redis::SISMEMBER('')));
         //$out = false;
         $group = 'ACTIVE';

+ 1 - 0
app/Http/Routes/Wap/WapRoutes.php

@@ -23,6 +23,7 @@ Route::group(['domain'=>env('PAY_WAP_DOMAIN'),'namespace'=>'App\Http\Controllers
     Route::get('monthpay/getWechatRedirectUrl','Pay\MonthOrderController@getWechatRedirectUrl');
     Route::any('monthpay/signcallback','Pay\MonthOrderController@signCallBack');
     Route::post('monthpay/ordercallback','Pay\MonthOrderController@orderCallBack');
+    Route::post('xiyue/paynotify','Other\XiyueController@xiyuePayNotity');
 
 });
 Route::group(['domain'=>env('OFFICIAL_AUTH_FOMAIN'),'namespace'=>'App\Http\Controllers\Wap'],function(){

+ 6 - 0
app/Modules/User/Services/UserService.php

@@ -436,6 +436,7 @@ WHERE u.openid in (SELECT openid from users WHERE  id = %s)";
             $i = 1;
             $chapter_model = new ChapterOrder();
             $chapter_model->setCurrentTable($to);
+
             foreach ($chapter_order_record as $chapter_order){
                 $temp[] = [
                     'distribution_channel_id'=>$distribution_channel_id,
@@ -449,6 +450,11 @@ WHERE u.openid in (SELECT openid from users WHERE  id = %s)";
                     'created_at'=>$chapter_order->created_at,
                     'updated_at'=>date('Y-m-d H:i:s')
                 ];
+                if($i % 100 == 0){
+                    $chapter_model->insert($temp);
+                    $temp = [];
+                }
+                $i ++;
             }
             //\Log::info('chapter order  is');
             //\Log::info($temp);