diff --git a/microservices/jd-api/libs/open-sdk-1.10.1.jar b/microservices/jd-api/libs/open-sdk-1.10.1.jar
index c174c811..8ef4821b 100644
Binary files a/microservices/jd-api/libs/open-sdk-1.10.1.jar and b/microservices/jd-api/libs/open-sdk-1.10.1.jar differ
diff --git a/microservices/pdd-api/libs/open-sdk-1.10.1.jar b/microservices/pdd-api/libs/open-sdk-1.10.1.jar
index c174c811..8ef4821b 100644
Binary files a/microservices/pdd-api/libs/open-sdk-1.10.1.jar and b/microservices/pdd-api/libs/open-sdk-1.10.1.jar differ
diff --git a/microservices/tao-api/libs/open-sdk-1.10.1.jar b/microservices/tao-api/libs/open-sdk-1.10.1.jar
new file mode 100644
index 00000000..8ef4821b
Binary files /dev/null and b/microservices/tao-api/libs/open-sdk-1.10.1.jar differ
diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml
index 9661091d..09173335 100644
--- a/microservices/tao-api/pom.xml
+++ b/microservices/tao-api/pom.xml
@@ -23,7 +23,7 @@
open-sdk
1.0.2
system
- ${project.basedir}/libs/open-sdk-1.5.4.jar
+ ${project.basedir}/libs/open-sdk-1.10.1.jar
cn.qihangerp.service
diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java
index abda7c47..9c6dc42f 100644
--- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java
+++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -56,7 +57,7 @@ public class TaoOrderApiController {
*/
@PostMapping("/pull_order_tao")
@ResponseBody
- public AjaxResult pullIncrementOrder(@RequestBody TaoRequest req) {
+ public AjaxResult pullIncrementOrder(@RequestBody TaoRequest req) throws IOException {
log.info("/**************增量拉取tao订单****************/");
if (req.getShopId() == null || req.getShopId() <= 0) {
return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,没有店铺Id");
@@ -184,7 +185,7 @@ public class TaoOrderApiController {
*/
@RequestMapping("/pull_order_detail")
@ResponseBody
- public AjaxResult getOrderPullDetail(@RequestBody TaoRequest taoRequest) {
+ public AjaxResult getOrderPullDetail(@RequestBody TaoRequest taoRequest) throws IOException {
log.info("/**************主动更新tao订单by number****************/");
if (taoRequest.getShopId() == null || taoRequest.getShopId() <= 0) {
return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,没有店铺Id");
diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java
index 0b08643c..57506578 100644
--- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java
+++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import java.io.IOException;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.Date;
@@ -52,7 +53,7 @@ public class TaoRefundApiController {
*/
@RequestMapping("/pull_refund")
@ResponseBody
- public AjaxResult refundOrderPull(@RequestBody TaoRequest taoRequest) {
+ public AjaxResult refundOrderPull(@RequestBody TaoRequest taoRequest) throws IOException {
log.info("/**************主动更新tao退货订单****************/");
if (taoRequest.getShopId() == null || taoRequest.getShopId() <= 0) {
// return new ApiResult<>(EnumResultVo.ParamsError.getIndex(), "参数错误,没有店铺Id");
@@ -172,7 +173,7 @@ public class TaoRefundApiController {
@RequestMapping("/pull_refund_detail")
@ResponseBody
- public AjaxResult refundDetailPull(@RequestBody TaoRequest taoRequest) {
+ public AjaxResult refundDetailPull(@RequestBody TaoRequest taoRequest) throws IOException {
log.info("/**************主动更新tao退货订单****************/");
if (taoRequest.getShopId() == null || taoRequest.getShopId() <= 0) {
return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,没有店铺Id");
diff --git a/microservices/wei-api/libs/open-sdk-1.10.1.jar b/microservices/wei-api/libs/open-sdk-1.10.1.jar
new file mode 100644
index 00000000..8ef4821b
Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-1.10.1.jar differ
diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml
index df3e8cfd..780cb00e 100644
--- a/microservices/wei-api/pom.xml
+++ b/microservices/wei-api/pom.xml
@@ -23,7 +23,7 @@
open-sdk
1.0.2
system
- ${project.basedir}/libs/open-sdk-1.5.4.jar
+ ${project.basedir}/libs/open-sdk-1.10.1.jar
cn.qihangerp.service
diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java
index 4b587424..9e54f8a1 100644
--- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java
+++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java
@@ -1,6 +1,5 @@
package cn.qihangerp.api.wei;
-
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.api.ShopApiParams;
import cn.qihangerp.common.enums.EnumShopType;
@@ -9,7 +8,7 @@ import cn.qihangerp.model.entity.OShop;
import cn.qihangerp.module.service.OShopService;
import cn.qihangerp.open.common.ApiResultVo;
import cn.qihangerp.open.wei.WeiTokenApiHelper;
-import cn.qihangerp.open.wei.WeiTokenResponse;
+import cn.qihangerp.open.wei.response.WeiTokenResponse;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java
index b40579ac..2de877ee 100644
--- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java
+++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java
@@ -56,7 +56,7 @@ public class WeiOrderApiController extends BaseController {
// String appSecret = checkResult.getData().getAppSecret();
LocalDateTime endTime = LocalDateTime.now();
LocalDateTime startTime = endTime.minusHours(1);
- ApiResultVo orderApiResultVo = WeiOrderApiHelper.pullOrderList(startTime, endTime, accessToken);
+ ApiResultVo orderApiResultVo = WeiOrderApiHelper.pullOrderList(startTime, endTime, accessToken,1,100);
// ApiResultVo apiResultVo = OrderApiHelper.pullOrderList(startTime, endTime, accessToken);
int insertSuccess = 0;//新增成功的订单