diff --git a/api/oms-api/libs/open-sdk-1.10.9.3.jar b/api/oms-api/libs/open-sdk-2.1.1.jar similarity index 77% rename from api/oms-api/libs/open-sdk-1.10.9.3.jar rename to api/oms-api/libs/open-sdk-2.1.1.jar index 2aab21ca..84af983e 100644 Binary files a/api/oms-api/libs/open-sdk-1.10.9.3.jar and b/api/oms-api/libs/open-sdk-2.1.1.jar differ diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 8dcac7b2..eb112f01 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -93,7 +93,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-1.10.9.3.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar diff --git a/core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java index e51ce880..3a4f6a69 100644 --- a/core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java @@ -24,12 +24,12 @@ public class DouGoodsSku implements Serializable { /** * 商品ID；抖店系统生成。 */ - private Long productId; + private String productId; /** * 规格ID */ - private Long specId; + private String specId; /** * sku外部编码 diff --git a/microservices/dou-api/libs/open-sdk-1.10.1.jar b/microservices/dou-api/libs/open-sdk-1.10.1.jar deleted file mode 100644 index 8ef4821b..00000000 Binary files a/microservices/dou-api/libs/open-sdk-1.10.1.jar and /dev/null differ diff --git a/microservices/wei-api/libs/open-sdk-1.10.9.3.jar b/microservices/dou-api/libs/open-sdk-2.1.1.jar similarity index 77% rename from microservices/wei-api/libs/open-sdk-1.10.9.3.jar rename to microservices/dou-api/libs/open-sdk-2.1.1.jar index 2aab21ca..84af983e 100644 Binary files a/microservices/wei-api/libs/open-sdk-1.10.9.3.jar and b/microservices/dou-api/libs/open-sdk-2.1.1.jar differ diff --git a/microservices/dou-api/pom.xml b/microservices/dou-api/pom.xml index 9baec29c..955fcd7a 100644 --- a/microservices/dou-api/pom.xml +++ b/microservices/dou-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-1.10.1.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar cn.qihangerp.service diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java index 5fc311d6..448496e1 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java @@ -84,11 +84,14 @@ public class DouApiCommon { } }else{ if(StringUtils.hasText(shop.getRefreshToken())) { - ApiResultVo token1 = DouTokenApiHelper.refreshToken(appKey, appSecret, accessToken, shop.getRefreshToken()); + ApiResultVo token1 = DouTokenApiHelper.getToken(appKey, appSecret, shop.getSellerId()); +// ApiResultVo token1 = DouTokenApiHelper.refreshToken(appKey, appSecret, accessToken, shop.getRefreshToken()); if (token1.getCode() == 0) { shopService.updateSessionKey(shopId, token1.getData().getAccessToken(), token1.getData().getRefreshToken()); params.setAccessToken(token1.getData().getAccessToken()); accessToken = token1.getData().getAccessToken(); + }else{ + return ResultVo.error(ResultVoEnum.API_FAIL.getIndex(), token1.getMsg(), params); } } } diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java index e695adfd..9311b3ab 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java @@ -95,7 +95,7 @@ public class DouGoodsApiController { for (var goods: resultVo.getData().getGoodsList()){ DouGoods douGoods = new DouGoods(); BeanUtils.copyProperties(goods,douGoods); - + douGoods.setProductId(goods.getProductId().toString()); // TODO:转换goods douGoods.setShopId(params.getShopId()); douGoods.setPullTime(new Date()); diff --git a/microservices/jd-api/libs/open-sdk-1.10.1.jar b/microservices/jd-api/libs/open-sdk-1.10.1.jar deleted file mode 100644 index 8ef4821b..00000000 Binary files a/microservices/jd-api/libs/open-sdk-1.10.1.jar and /dev/null differ diff --git a/microservices/pdd-api/libs/open-sdk-1.10.9.3.jar b/microservices/jd-api/libs/open-sdk-2.1.1.jar similarity index 77% rename from microservices/pdd-api/libs/open-sdk-1.10.9.3.jar rename to microservices/jd-api/libs/open-sdk-2.1.1.jar index 2aab21ca..84af983e 100644 Binary files a/microservices/pdd-api/libs/open-sdk-1.10.9.3.jar and b/microservices/jd-api/libs/open-sdk-2.1.1.jar differ diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml index 6d6b4a22..5cd3a54d 100644 --- a/microservices/jd-api/pom.xml +++ b/microservices/jd-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.10.1.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar org.codehaus.jackson diff --git a/microservices/tao-api/libs/open-sdk-1.10.2.jar b/microservices/pdd-api/libs/open-sdk-2.1.1.jar similarity index 72% rename from microservices/tao-api/libs/open-sdk-1.10.2.jar rename to microservices/pdd-api/libs/open-sdk-2.1.1.jar index 8bd3583a..84af983e 100644 Binary files a/microservices/tao-api/libs/open-sdk-1.10.2.jar and b/microservices/pdd-api/libs/open-sdk-2.1.1.jar differ diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml index 3ed3c84c..a2b210b3 100644 --- a/microservices/pdd-api/pom.xml +++ b/microservices/pdd-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.10.9.3.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar cn.qihangerp.service diff --git a/microservices/tao-api/libs/open-sdk-2.1.1.jar b/microservices/tao-api/libs/open-sdk-2.1.1.jar new file mode 100644 index 00000000..84af983e Binary files /dev/null and b/microservices/tao-api/libs/open-sdk-2.1.1.jar differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml index fa528cda..7f80112c 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.10.2.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar com.squareup.okhttp3 diff --git a/microservices/wei-api/libs/open-sdk-2.1.1.jar b/microservices/wei-api/libs/open-sdk-2.1.1.jar new file mode 100644 index 00000000..84af983e Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-2.1.1.jar differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml index 51b46df8..fcb28e15 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.10.9.3.jar + ${project.basedir}/libs/open-sdk-2.1.1.jar cn.qihangerp.service diff --git a/vue/src/views/dou/goods/goods_list.vue b/vue/src/views/dou/goods/goods_list.vue index 9f3c8b5b..d9520d2a 100644 --- a/vue/src/views/dou/goods/goods_list.vue +++ b/vue/src/views/dou/goods/goods_list.vue @@ -284,6 +284,7 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { + this.pullLoading = false this.queryParams.pageNum = 1; this.getList(); }, diff --git a/vue/src/views/dou/goods/goods_sku.vue b/vue/src/views/dou/goods/goods_sku.vue index 9698241d..a673efb8 100644 --- a/vue/src/views/dou/goods/goods_sku.vue +++ b/vue/src/views/dou/goods/goods_sku.vue @@ -1,9 +1,9 @@