ith5 3 месяцев назад
Родитель
Сommit
23ddd93733

+ 1 - 0
app/v1/controller/customer/SdkOrderController.php

@@ -50,6 +50,7 @@ class SdkOrderController extends BaseController
         }
 
         $data = $this->logic->getOrderList($where);
+        $data['data'] = $this->logic->trandformListColumn($data['data'], ['ip']);
         return $this->success($data);
     }
 

+ 4 - 5
app/v1/logic/customer/SdkOrderLogic.php

@@ -5,7 +5,7 @@ namespace app\v1\logic\customer;
 use plugin\saiadmin\basic\BaseLogic;
 use plugin\saiadmin\exception\ApiException;
 use plugin\saiadmin\utils\Helper;
-use app\v1\model\customer\SdkOrder;
+// use app\v1\model\customer\SdkOrder;
 use DateTime;
 use support\Redis;
 use support\think\Db;
@@ -20,7 +20,7 @@ class SdkOrderLogic extends BaseLogic
      */
     public function __construct()
     {
-        $this->model = new SdkOrder();
+        // $this->model = new SdkOrder();
     }
 
     /**
@@ -31,8 +31,6 @@ class SdkOrderLogic extends BaseLogic
         $orderBy = $params['orderBy'] ?: 'pay_date';
         $orderType = $params['orderType'] ?: 'DESC';
 
-       
-
         if(!$params['pay_time']){
             throw new ApiException('请选择时间范围');
         }
@@ -56,7 +54,7 @@ class SdkOrderLogic extends BaseLogic
         }
 
 
-        $where[] = ['pay_time', 'between', [strtotime($params['pay_time'][0]), strtotime($params['pay_time'][1])]];
+        $where[] = ['pay_time', 'between', [strtotime($params['pay_time'][0].'00:00:00'), strtotime($params['pay_time'][1].'23:59:59')]];
 
         $db = Db::connect('db_game_log');
         $unionQuery = [];
@@ -76,6 +74,7 @@ class SdkOrderLogic extends BaseLogic
             'money' => $allMoney,
         ];
 
+
         return $list;
     }