add:订单加活动id统计;

add:订单加包季类型;

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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\QuickApp\Order;
 
+use App\Modules\Activity\Models\Activity;
 use App\Modules\Statistic\Services\AdVisitStatService;
 use App\Http\Controllers\QuickApp\BaseController;
 use Illuminate\Http\Request;
@@ -383,6 +384,7 @@ class OrdersController extends BaseController
 
     private function getPayParams(Request $request)
     {
+        myLog('pay-order')->info('request', ['params' => $request->all()]);
         $uid           = $this->uid;
         $product_id    = $request->get('product_id', 0);
         $send_order_id = $this->send_order_id;
@@ -407,6 +409,8 @@ class OrdersController extends BaseController
         $from_type = 'QuickApp';
         if ($product_info->type == 'YEAR_ORDER') {
             $order_type = 'YEAR';
+        } elseif ($product_info->type == 'QUARTER') {
+            $order_type = 'QUARTER';
         } elseif ($product_info->type == 'BOOK_ORDER') {
             $order_type = 'BOOK';
         } elseif ($product_info->type == 'TICKET_RECHARGE') {
@@ -415,6 +419,15 @@ class OrdersController extends BaseController
             $order_type = '';
         }
         $create_ip = _getIp();
+
+        // 活动
+        $activity_token = $request->get('activity_token', '');
+        $activity_id    = 0;
+        if ($activity_token) {
+            $activity    = Activity::getActivityBuToken($activity_token);
+            $activity_id = (int)getProp($activity, 'id');
+        }
+
         return compact(
             'distribution_channel_id',
             'uid',
@@ -425,7 +438,8 @@ class OrdersController extends BaseController
             'send_order_id',
             'from_bid',
             'from_type',
-            'order_type'
+            'order_type',
+            'activity_id'
         );
     }
 

app/Modules/Activity/Models/Activity.php

@@ -36,4 +36,14 @@ class Activity extends Model
         }
         return $search_obj->pluck('id');
     }
+
+    //获取活动ID
+    public static function getActivityBuToken($token)
+    {
+        if (empty($token)) {
+            return [];
+        }
+
+        return self::where('token', $token)->first();
+    }
 }

app/Modules/Trade/Pay/OrderArousePayAbstract.php

@@ -29,25 +29,25 @@ abstract class OrderArousePayAbstract
     public function createOrder(array $data)
     {
         $params = [
-            'uid' => $this->uid,
-            'product_id' => $data['product_id'],
+            'uid'                     => $this->uid,
+            'product_id'              => $data['product_id'],
             'distribution_channel_id' => $data['distribution_channel_id'],
-            'trade_no' => $data['trade_no'],
-            'pay_merchant_id' => isset($data['pay_merchant_id']) ?  $data['pay_merchant_id'] : 0,
-            'order_type' => $data['order_type'],
-            'create_ip' => $data['create_ip'],
-            'send_order_id' => $data['send_order_id'],
-            'from_type' => $data['from_type'],
-            'price' =>  $data['price'] / 100,
-            'status' => 'UNPAID',
-            'transaction_id' => '',
-            'pay_end_at' => '0000-00-00 00:00:00',
-            'pay_merchant_source' => '',
-            'send_order_name' => isset($data['send_order_name']) ? $data['send_order_name'] : '',
-            'pay_type' => isset($data['pay_type']) ? $data['pay_type'] : 1,
-            'from_bid' => isset($data['from_bid']) ? $data['from_bid'] : 0,
-            'activity_id' => isset($data['activity_id']) ? $data['activity_id'] : 0,
-            'inner_send_order_id' => isset($data['inner_send_order_id']) ? $data['inner_send_order_id'] : '',
+            'trade_no'                => $data['trade_no'],
+            'pay_merchant_id'         => isset($data['pay_merchant_id']) ? $data['pay_merchant_id'] : 0,
+            'order_type'              => $data['order_type'],
+            'create_ip'               => $data['create_ip'],
+            'send_order_id'           => $data['send_order_id'],
+            'from_type'               => $data['from_type'],
+            'price'                   => $data['price'] / 100,
+            'status'                  => 'UNPAID',
+            'transaction_id'          => '',
+            'pay_end_at'              => '0000-00-00 00:00:00',
+            'pay_merchant_source'     => '',
+            'send_order_name'         => isset($data['send_order_name']) ? $data['send_order_name'] : '',
+            'pay_type'                => isset($data['pay_type']) ? $data['pay_type'] : 1,
+            'from_bid'                => isset($data['from_bid']) ? $data['from_bid'] : 0,
+            'activity_id'             => isset($data['activity_id']) ? $data['activity_id'] : 0,
+            'inner_send_order_id'     => isset($data['inner_send_order_id']) ? $data['inner_send_order_id'] : '',
         ];
         Order::firstOrCreate($params);
     }
@@ -55,7 +55,7 @@ abstract class OrderArousePayAbstract
     protected function getSubjectName(int $channel_id)
     {
         $package = QappPackage::where('channel_id', $channel_id)->select('name')->first();
-        $name = $package ? $package->name : '';
+        $name    = $package ? $package->name : '';
         return "搜索快应用（{$name}）继续阅读，投诉电话：0571-56680189";
     }
 }