Merge branch 'master' into stabble

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

@@ -756,7 +756,7 @@ class OrdersController extends Controller
         $de_pay_redirect_url = urldecode($pay_redirect_url);
 
         $pay_url_info = parse_url($de_pay_redirect_url);
-        $data['pay_wait_url'] = $pay_url_info['scheme'] . '://' . $pay_url_info['host'] . '/pay/waitv2?order=' . $data['trade_no'] . '&redirect=' . urlencode($de_pay_redirect_url);
+        $data['pay_wait_url'] = $pay_url_info['scheme'] . '://' . $pay_url_info['host'] . '/pay/wait_union?order=' . $data['trade_no'] . '&redirect=' . urlencode($de_pay_redirect_url);
         Log::info($data);
 
         $pay_info = $wechatPay->send($data);
@@ -954,19 +954,28 @@ class OrdersController extends Controller
 
     public function waitPageUnion(Request $request)
     {
-        $order = $request->input('merOrderId');
-        if ($order) {
-            $from = 'pay';
-            $order = (string) $order;
-            $order_info = OrderService::getByTradeNo($order);
-            $uid = $order_info->uid;
-            $bind_info = UserBindPhoneService::bindInfo($uid);
-            $page = 'pay.order.wait';
-            if (!$bind_info) {
-                $page = 'pay.order.bindPhone';
+        $url = urldecode($request->get('redirect', ''));
+        Log::info($request->except('_url'));
+        if ($url) {
+            $status = $request->get('status', '');
+            if ($status && $status === 'TRADE_SUCCESS') {
+                $order = $request->get('merOrderId', '');
+                if ($order) {
+                    $from = 'pay';
+                    $order = (string) $order;
+                    $order_info = OrderService::getByTradeNo($order);
+                    $uid = $order_info->uid;
+                    $bind_info = UserBindPhoneService::bindInfo($uid);
+                    $page = 'pay.order.wait';
+                    if (!$bind_info) {
+                        $page = 'pay.order.bindPhone';
+                    }
+                    $url = urldecode($request->input('redirect'));
+                    return view($page, compact('order', 'url', 'from'));
+                }
+            } else {
+                return redirect($url);
             }
-            $url = urldecode($request->input('redirect'));
-            return view($page, compact('order', 'url', 'from'));
         }
     }
 

app/Http/Routes/Wap/WapRoutes.php

@@ -105,6 +105,7 @@ Route::group(['domain'=>env('WAP_DOMAIN'),'namespace'=>'App\Http\Controllers\Wap
 
     Route::get('pay/wait','Pay\OrdersController@waitPage');
     Route::get('pay/waitv2','Pay\OrdersController@waitPageV2');
+    Route::get('pay/wait_union','Pay\OrdersController@waitPageUnion');
 
     Route::get('monthpay/wait','Pay\MonthOrderController@wait');
     Route::get('api/monthorder/issuccess','Pay\MonthOrderController@issuccess');

app/Modules/Activity/Services/NationalDay.php

@@ -42,7 +42,7 @@ trait NationalDay
         $this->start_time = strtotime('2019-10-01');
         $this->end_time = strtotime('2019-10-08');
         $this->title = "十月金秋&国庆666书币福利";
-        $this->product_id = 6634;
+        $this->product_id = 7498;
         $this->product = $this->getProduct();
         $this->sign_config = [
             ['day' => 1, 'bonus' => 50, 'is_strong' => false],

app/Modules/Book/Services/CrmBookAutoRecommendService.php

@@ -73,6 +73,7 @@ class CrmBookAutoRecommendService
    {
       $results = $this->getRecommendBooksFromDB();
       Redis::setex($this->redis_key, SysConsts::ONE_WEEK_SECONDS, json_encode($results));
+      return $results;
    }
 
    /**
@@ -84,9 +85,7 @@ class CrmBookAutoRecommendService
       if ($value) {
          return json_decode($value, true);
       } else {
-         $results = $this->getRecommendBooksFromDB();
-         Redis::setex($this->redis_key, SysConsts::ONE_WEEK_SECONDS, json_encode($results));
-         return $results;
+         return  $this->setRecommendBooksRedis();
       }
    }