ソースを参照

'增加clickid'

lh 1 年間 前
コミット
f9cc89d1b4

+ 7 - 0
app/Http/Controllers/Order/OrderController.php

@@ -44,6 +44,7 @@ class OrderController extends BaseController
     }
 
     /**
+     * 用户列表
      * @param Request $request
      * @return mixed
      */
@@ -54,6 +55,7 @@ class OrderController extends BaseController
     }
 
     /**
+     * 派单列表
      * @param Request $request
      * @return mixed
      */
@@ -63,6 +65,11 @@ class OrderController extends BaseController
         return $this->success($result, [new OrderTransformer(), 'newBuildSendOrderList']);
     }
 
+    /**
+     * 订单列表
+     * @param Request $request
+     * @return mixed
+     */
     public function orderList(Request $request) {
         $data   = $request->all();
         $result = $this->orderService->orderList($data);

+ 1 - 1
app/Services/Order/OrderService.php

@@ -145,7 +145,7 @@ class OrderService
             ->where('orders.status', '<>', 'UNPAID')
             ->select('orders.id', 'orders.trade_no', 'orders.uid', 'users.created_at as register_time', 'channel_copy_user_mappings.created_at as bind_send_order_time',
                 'orders.price', 'orders.status', 'orders.created_at', 'orders.pay_end_at as pay_time', 'send_orders.distribution_channel_id', 'dy_report_logs.id as report_id',
-                'orders.send_order_id', 'dy_report_logs.advertiserid', 'dy_report_logs.promotionid', 'dy_report_logs.callback_result', 'orders.pay_num',
+                'orders.send_order_id', 'dy_report_logs.advertiserid', 'dy_report_logs.promotionid',  'dy_report_logs.clickid', 'dy_report_logs.callback_result', 'orders.pay_num',
                 'dy_report_logs.remark', 'dy_report_logs.updated_at as report_time', 'book_configs.book_name', 'orders.order_type', 'orders.transaction_id');
 
         if ($uid) {

+ 1 - 0
app/Transformer/Order/OrderTransformer.php

@@ -144,6 +144,7 @@ class OrderTransformer
                 'send_order_id'             => getProp($item, 'send_order_id'),
                 'advertiser_id'             => getProp($item, 'advertiserid'),
                 'promotion_id'              => getProp($item, 'promotionid'),
+                'clickid'                   => getProp($item, 'clickid'),
                 'report_result'             => $remark,
                 'report_time'               => transDate(getProp($item, 'report_time')),
                 'pay_num'                   => getProp($item, 'pay_num'),