Merge branch 'stabble'

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

@@ -630,7 +630,8 @@ class OrdersController extends BaseController
         if(!$start_time){
             return 0;
         }
-        if(!in_array($this->distribution_channel_id,[2,14,211])){
+        //if(!in_array($this->distribution_channel_id,[2,14,211,155,4427,4488,256,691,146,255,722,4364,5,202,318,4237,266,196,273,4236,148,8,4241,160,271,4053,123,4334,4487,4593,695,4025,4426,4174])){
+        if(!in_array($this->distribution_channel_id,[2,14,123,211,5,8,160,4236,4237,4241])){
             return 0;
         }
         $user = $this->_user_info;

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

@@ -270,7 +270,7 @@ class OrdersController extends Controller
         }
         $from_bid = ReadRecordService::getSimpleFirstReadRecord($uid);
         $inner_send_order_id = ReadRecordService::getInnerSendOrderId($uid);
-        $result = $this->createUnPayOrder([
+        $init_order = [
             'distribution_channel_id' => $distribution_channel_id,
             'uid' => $uid,
             'product_id' => $product_id,
@@ -287,7 +287,14 @@ class OrdersController extends Controller
             'from_type' => $fromtype,
             'activity_id' => $activity_id,
             'inner_send_order_id'=>$inner_send_order_id
-        ]);
+        ];
+        $result = $this->createUnPayOrder($init_order);
+
+        //订单创建成功后增加统计
+        if($result)
+        {
+            $this->orderCreated($init_order);
+        }
 
         if ($request->get('suid')) {
             $this->createSubstituteOrder($result->id, $uid, $request->get('suid'));
@@ -357,6 +364,40 @@ class OrdersController extends Controller
         }
         return false;
     }
+
+    //订单创建后统计
+    private function orderCreated($init_order)
+    {
+        try {
+            if(isset($init_order['pay_merchant_id']))
+            {
+                $key = 'pay_merchant:'.$init_order['pay_merchant_id'];
+                Redis::hincrby($key,'unpaid_num',1);
+                Redis::hset($key,'last_create_time', time());
+            }
+
+        }catch (\Exception $e)
+        {
+
+        }
+    }
+
+    //订单回调后统计
+    private function orderPaid($init_order)
+    {
+        try {
+            if(isset($init_order['pay_merchant_id']))
+            {
+                $key = 'pay_merchant:'.$init_order['pay_merchant_id'];
+                Redis::hset($key,'unpaid_num',0);
+            }
+
+        }catch (\Exception $e)
+        {
+
+        }
+    }
+
     public function reportError(Request $request)
     {
         $data = $request->post('data');
@@ -1191,6 +1232,12 @@ class OrdersController extends Controller
                     }
                 }
             }
+
+            if(isset($order->pay_merchant_id) && $order->pay_merchant_id)//临时统计队列清0 用于报警
+            {
+                $key = 'pay_merchant:'.$order->pay_merchant_id;
+                Redis::hset($key,'unpaid_num',0);
+            }
         }catch (\Exception $e){}
 
     }

app/Http/Controllers/Wap/Web/WelcomeController.php

@@ -749,11 +749,11 @@ class WelcomeController extends BaseController
             }
             //活动未开始
             if (time() < strtotime($activity_info->start_time)) {
-                return view('pay.order.longactivitysixtyeight', ['url' => '###', 'code' => -3, 'start_time' => date('Y-m-d', time() - 86400 * 2), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
+                return view('pay.order.longactivitysixtyeight', ['url' => '###', 'code' => -3, 'start_time' => date('Y-m-d', strtotime($activity_info->start_time)), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
             }
             //活动结束
             if (time() > strtotime($activity_info->end_time)) {
-                return view('pay.order.longactivitysixtyeight', ['url' => '###', 'code' => -1, 'start_time' => date('Y-m-d', time() - 86400 * 2), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
+                return view('pay.order.longactivitysixtyeight', ['url' => '###', 'code' => -1, 'start_time' => date('Y-m-d', strtotime($activity_info->start_time)), 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
             }
 
             if (time() > strtotime($activity_info->start_time) && time() < strtotime($activity_info->end_time)) {