Merge branch 'order' into test

modules/Channel/Http/Controllers/OrdersController.php

@@ -56,7 +56,7 @@ class OrdersController extends CatchController
                 if (getProp($param, 'user_id')) {
                     $val->total_count = $val->promotion_count;
                 }
-                unset($val->caompany_count, $val->promotion_count, $val->id, $val->pay_product_id, $val->create_ip, $val->transaction_id);
+                unset($val->caompany_count, $val->promotion_count, $val->pay_product_id, $val->create_ip, $val->transaction_id);
                 unset($val->third_orderid, $val->pay_merchant_sourcem, $val->video_id, $val->video_series_sequence, $val->updated_at);
             }
         }

modules/Channel/Services/Order/OrderService.php

@@ -27,15 +27,16 @@ class OrderService
     public static function getOrderList(array $param, $isAll = false)
     {
         print_sql();
-        $sql = self::getOrderQuerySql($param);
+        $list = self::getOrderQuerySql($param);
 
         if ($isAll) {
-            $list = $sql->get();
+            $list = $list->get();
         } else {
-            $list = $sql->paginate(getProp($param, 'limit', 15));
+            $list = $list->paginate(getProp($param, 'limit', 15));
         }
 
         if (!$list->isEmpty()) {
+
             $status = array_column(self::getOrderPayType(), null, 'value');
             $types = array_column(self::getOrderType(), null, 'value');
             foreach ($list as $val) {
@@ -88,7 +89,7 @@ class OrderService
 
     private static function getOrderQuerySql(array $param)
     {
-        $sql = Order::query();
+        $sql = DB::table('orders');
         // 优化师查询
         if (!empty(getProp($param, 'user_id'))) {
             $sql->where('user_id', $param['user_id']);

modules/OrderRefund/Services/RefundOrderService.php

@@ -121,14 +121,14 @@ class RefundOrderService extends BaseServices
         }
 
         if (getProp($param,'created_at_start','')){
-            $sql->where('orders_refund_verify.created_at',">=".$param['created_at_start']);
+            $sql->where('orders.created_at',">=".$param['created_at_start']);
         }
         if (getProp($param,'created_at_start','')){
             $end =$param['created_at_end'];
             if ($end == getProp($param,'created_at_start','')){
                 $end = date("Y-m-d",strtotime($end)) . " 23:59:59";
             }
-            $sql->where('orders_refund_verify.created_at',"<=".$end);
+            $sql->where('orders.created_at',"<=".$end);
         }
 
         if (getProp($param,'checked_at_start','')){