客户端-京东服务商从京推推换成官方

app/controller/api/store/product/Jd.php

@@ -5,6 +5,7 @@ namespace app\controller\api\store\product;
 use app\common\repositories\store\product\ProductRepository;
 use app\common\repositories\user\UserThirdRepository;
 use app\model\common\JdOrderModel;
+use DateTime;
 use think\App;
 use crmeb\basic\BaseController;
 use think\db\exception\DbException;
@@ -622,47 +623,67 @@ class Jd extends BaseController
         // ]);
         $time['startTime'] = request()->param('startTime', '');
         $time['endTime'] = request()->param('endTime', '');
-
-        //自定义时间  每20分钟执行一次查询前半小时的数据
         if (!$time['startTime'] && !$time['endTime']) {
-            $time['startTime'] = date("Y-m-d H:i:s", strtotime("-1 hour"));
-            $time['endTime'] = date('Y-m-d H:i:s');
+            // $time['startTime'] = date("Y-m-d H:i:s", strtotime("-1 hour"));
+            // $time['endTime'] = date('Y-m-d H:i:s');
+            // 获取当前时间
+            $currentTime = new DateTime();
+
+            // 生成时间范围数组
+            $timeRanges = [];
+            for ($i = 0; $i < 30 * 24; $i++) {
+                $endTime = clone $currentTime;
+                $endTime->modify("-$i hour");
+
+                $startTime = clone $endTime;
+                $startTime->modify("-1 hour");
+                $startTime->modify("+1 second");
+
+                $timeRanges[] = [
+                    'startTime' => $startTime->format('Y-m-d H:i:s'),
+                    'endTime' => $endTime->format('Y-m-d H:i:s')
+                ];
+            }
+        } else {
+            $timeRanges[] = $time;
         }
         try {
-            $orderLists = [];
-            $page = 1;
-            $pageSize = 200;
-            $apiName = 'jd.union.open.order.row.query';
-            do {
-                $params = [
-                    'orderReq' => [
-                        'pageIndex' => $page,
-                        'pageSize' => $pageSize,
-                        'type' => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
-                        'startTime' => $time['startTime'],//格式2020-01-02 21:23:00
-                        'endTime' => $time['endTime'], //格式2020-01-02 21:24:00
-                        'fields' => 'goodsInfo'
-                    ],
-                ];
-                $result = $this->getUrlResult($apiName, $params);
-                $result = json_decode($result, true);
-                $result = json_decode($result['jd_union_open_order_row_query_responce']['queryResult'], true);
-                $lists = $result['data'];
-                $countList = count($lists);
-                if (!empty($countList)) {
-                    $orderLists = array_merge($orderLists, $lists);
-                }
+            foreach ($timeRanges as $time) {
+                $orderLists = [];
+                $page = 1;
+                $pageSize = 200;
+                $apiName = 'jd.union.open.order.row.query';
+                do {
+                    $params = [
+                        'orderReq' => [
+                            'pageIndex' => $page,
+                            'pageSize' => $pageSize,
+                            'type' => 3,//(1：下单时间，2：完成时间（购买用户确认收货时间），3：更新时间
+                            'startTime' => $time['startTime'],//格式2020-01-02 21:23:00
+                            'endTime' => $time['endTime'], //格式2020-01-02 21:24:00
+                            'fields' => 'goodsInfo'
+                        ],
+                    ];
+                    $result = $this->getUrlResult($apiName, $params);
+                    $result = json_decode($result, true);
+                    $result = json_decode($result['jd_union_open_order_row_query_responce']['queryResult'], true);
+                    $lists = $result['data'];
+                    $countList = count($lists);
+                    if (!empty($countList)) {
+                        $orderLists = array_merge($orderLists, $lists);
+                    }
 
-                $page++;
-            } while ($countList == $pageSize && $result['hasMore'] ?? false);
-            if (!empty($orderLists)) {
-                //格式化从京东拉取的订单列表
-                $formatLists = $this->formatOrderList($orderLists);
-                //将京东订单列表中的订单进行处理
-                $this->operatePinOrder($formatLists);
-                return app("json")->success("京东订单写入成功");
-            } else {
-                return app("json")->success("暂无最新数据");
+                    $page++;
+                } while ($countList == $pageSize && $result['hasMore'] ?? false);
+                if (!empty($orderLists)) {
+                    //格式化从京东拉取的订单列表
+                    $formatLists = $this->formatOrderList($orderLists);
+                    //将京东订单列表中的订单进行处理
+                    $this->operatePinOrder($formatLists);
+                    return app("json")->success("京东订单写入成功");
+                } else {
+                    return app("json")->success("暂无最新数据");
+                }
             }
         } catch (\Exception $e) {
             return app("json")->fail($e->getMessage());