From b1438c322619391ef1299d4824d63278dd042702 Mon Sep 17 00:00:00 2001
From: ljl <liaojinling@jiancent.com>
Date: Wed, 6 Dec 2023 18:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ms/api/queue/consumer/RsyncOrderPageConsumer.java     | 4 ----
 .../java/com/ms/api/service/impl/OutstorageServiceImpl.java   | 4 ++--
 .../java/com/ms/api/service/impl/RsyncOrderServiceImpl.java   | 3 +++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ms-biz/src/main/java/com/ms/api/queue/consumer/RsyncOrderPageConsumer.java b/ms-biz/src/main/java/com/ms/api/queue/consumer/RsyncOrderPageConsumer.java
index c7c78c21..0d222580 100644
--- a/ms-biz/src/main/java/com/ms/api/queue/consumer/RsyncOrderPageConsumer.java
+++ b/ms-biz/src/main/java/com/ms/api/queue/consumer/RsyncOrderPageConsumer.java
@@ -1,19 +1,15 @@
 package com.ms.api.queue.consumer;
 
 import com.alibaba.fastjson.JSON;
-import com.doudian.open.api.order_searchList.data.OrderSearchListData;
-import com.doudian.open.api.order_searchList.param.OrderSearchListParam;
 import com.jinritemai.cloud.base.core.util.AuthThreadLocalUtil;
 import com.jinritemai.cloud.base.core.util.LogUtils;
 import com.ms.api.bo.ShopBO;
 import com.ms.api.queue.ConsumerListener;
 import com.ms.api.queue.Group;
 import com.ms.api.queue.Topic;
-import com.ms.api.queue.message.RsyncOrderMessage;
 import com.ms.api.queue.message.RsyncOrderPageMessage;
 import com.ms.api.service.RsyncOrderService;
 import com.ms.api.service.ShopService;
-import com.ms.api.util.DDApi;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
index 30ea8245..00cdf947 100644
--- a/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
+++ b/ms-biz/src/main/java/com/ms/api/service/impl/OutstorageServiceImpl.java
@@ -147,9 +147,9 @@ public class OutstorageServiceImpl implements OutstorageService {
         param.setPackList(itemList);
 
         request.setParam(param);
-        log.error("OrderLogisticsAddMultiPackRequest: " + request);
+        log.info("OrderLogisticsAddMultiPackRequest: " + request);
         OrderLogisticsAddMultiPackResponse response = request.execute();
-        log.error("OrderLogisticsAddMultiPackResponse: " + response);
+        log.info("OrderLogisticsAddMultiPackResponse: " + response);
         if (!response.isSuccess()) {
             // 模拟成功
             if (Objects.equals(response.getCode(), "30002") && Objects.equals(response.getSubCode(), "isv.test-order-permissions-insufficient")) {
diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/RsyncOrderServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/RsyncOrderServiceImpl.java
index 7e4aeda5..21e2987f 100644
--- a/ms-biz/src/main/java/com/ms/api/service/impl/RsyncOrderServiceImpl.java
+++ b/ms-biz/src/main/java/com/ms/api/service/impl/RsyncOrderServiceImpl.java
@@ -125,6 +125,9 @@ public class RsyncOrderServiceImpl implements RsyncOrderService {
         if (!Arrays.asList(1, 3, 7, 15, 20, 30).contains(rsyncOrderDate)) {
             throw new RuntimeException("参数不合法");
         }
+        if (rsyncOrderDate > 7) {
+            rsyncOrderDate = 7;
+        }
         OpOrderRsyncInfo rsyncInfo = opOrderRsyncInfoMapper.getByShopId(shopId);
         Date lastRsyncOrderTime = null;
         if (ObjectUtil.isNotNull(rsyncInfo)) {