Wesmiler

app/Services/Api/OrderService.php

@@ -83,9 +83,9 @@ class OrderService extends BaseService
             ->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list ? $list->toArray() : [];
         if ($list) {
-            $statusArr = [1 => '待支付', 2 => '待发货', 3 => '待收货', 4 => '确认收货'];
+            $statusArr = [1 => '待支付', 2 => '待发货', 3 => '待收货', 4 => '待评价',5=>'已完成'];
             foreach ($list['data'] as &$item) {
-                $item['create_time'] = $item['create_time'] ? dateFormat(strtotime($item['create_time']), 'Y-m-d') : '';
+                $item['create_time'] = $item['create_time'] ? datetime(strtotime($item['create_time']), 'Y-m-d H:i') : '';
                 $status = isset($item['status']) ? $item['status'] : 0;
                 $item['status_text'] = '待支付';
                 if ($status) {
@@ -110,46 +110,6 @@ class OrderService extends BaseService
         ];
     }
 
-    /**
-     * 用户佣金订单列表
-     * @param $userId
-     * @param $params date-数组日期范围
-     * @return array
-     */
-    public function getCommissionBill($userId, $params)
-    {
-        $pageSize = isset($params['pageSize'])&&$params['pageSize']?$params['pageSize']:10;
-        $query = OrderCommissionModel::where(['user_id'=>$userId])
-            ->with(['user','order'])
-            ->where(function($query) use($params){
-                // 日期
-                $date = isset($params['date']) ? $params['date'] : [];
-                $start = isset($date[0]) && $date[0]? $date[0] : date('Y-m-d 00:00:00', time() - 30 *3 *86400);
-                $end = isset($date[1]) && $date[1]? $date[1] : date('Y-m-d 23:59:59');
-                $end = $start>=$end? '' : $end;
-                if ($start) {
-                    $query->where('created_at','>=', $start);
-                }
-                if($end){
-                    $query->where('created_at','<=', $end);
-                }
-            });
-
-        // 统计
-        $query1 = clone $query;
-        $amount = $query1->sum('commission');
-
-        $list = $query->orderBy('created_at', 'desc')
-            ->paginate($pageSize > 0 ? $pageSize : 9999999);
-        $list = $list ? $list->toArray() : [];
-
-        return [
-            'pageSize' => $pageSize,
-            'amount'=>$amount,
-            'total' => isset($list['total']) ? $list['total'] : 0,
-            'list' => isset($list['data']) ? $list['data'] : []
-        ];
-    }
 
     /**
      * 查询条件