diff --git a/api/open-api/libs/open-sdk-1.5.1.jar b/api/open-api/libs/open-sdk-1.5.4.jar similarity index 89% rename from api/open-api/libs/open-sdk-1.5.1.jar rename to api/open-api/libs/open-sdk-1.5.4.jar index b373fa9b..27ab6f94 100644 Binary files a/api/open-api/libs/open-sdk-1.5.1.jar and b/api/open-api/libs/open-sdk-1.5.4.jar differ diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 3480e35f..1a0f12d5 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -89,7 +89,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-1.5.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar diff --git a/microservices/dou-api/libs/open-sdk-1.5.1.jar b/microservices/dou-api/libs/open-sdk-1.5.4.jar similarity index 89% rename from microservices/dou-api/libs/open-sdk-1.5.1.jar rename to microservices/dou-api/libs/open-sdk-1.5.4.jar index b373fa9b..27ab6f94 100644 Binary files a/microservices/dou-api/libs/open-sdk-1.5.1.jar and b/microservices/dou-api/libs/open-sdk-1.5.4.jar differ diff --git a/microservices/dou-api/pom.xml b/microservices/dou-api/pom.xml index 816a897a..d8a5c6e1 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.5.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar cn.qihangerp.module 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 d142ac8c..d66ae5c3 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 @@ -67,7 +67,7 @@ public class DouApiCommon { params.setAppSecret(shop.getAppSecret()); params.setAccessToken(shop.getAccessToken()); params.setRedirectUri(shop.getApiRedirectUrl()); -// params.setServerUrl(platform.getServerUrl()); + params.setServerUrl(shop.getApiRequestUrl()); params.setSellerId(shop.getSellerId()); if (!StringUtils.hasText(shop.getAccessToken())) { diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java index b36bd57d..92230e22 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java @@ -57,7 +57,7 @@ public class DouGoodsController extends BaseController { @PostMapping(value = "/sku/linkErp") public AjaxResult linkErp(@RequestBody LinkErpGoodsSkuBo bo) { - if(bo.getId()!=null){ + if(bo.getId()==null){ return AjaxResult.error(500,"缺少参数Id"); } if(StringUtils.isBlank(bo.getErpGoodsSkuId())){ diff --git a/microservices/jd-api/libs/open-sdk-1.5.1.jar b/microservices/jd-api/libs/open-sdk-1.5.4.jar similarity index 89% rename from microservices/jd-api/libs/open-sdk-1.5.1.jar rename to microservices/jd-api/libs/open-sdk-1.5.4.jar index b373fa9b..27ab6f94 100644 Binary files a/microservices/jd-api/libs/open-sdk-1.5.1.jar and b/microservices/jd-api/libs/open-sdk-1.5.4.jar differ diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml index 8e72c3cd..0cf748ba 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.5.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar org.codehaus.jackson diff --git a/microservices/pdd-api/libs/open-sdk-1.5.1.jar b/microservices/pdd-api/libs/open-sdk-1.5.4.jar similarity index 89% rename from microservices/pdd-api/libs/open-sdk-1.5.1.jar rename to microservices/pdd-api/libs/open-sdk-1.5.4.jar index b373fa9b..27ab6f94 100644 Binary files a/microservices/pdd-api/libs/open-sdk-1.5.1.jar and b/microservices/pdd-api/libs/open-sdk-1.5.4.jar differ diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml index 54f15632..b3876aa2 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.5.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar cn.qihangerp.module diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java index 4eb0b428..2d0f2202 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java @@ -51,7 +51,7 @@ public class PddGoodsController extends BaseController { @PostMapping(value = "/sku/linkErp") public AjaxResult linkErp(@RequestBody LinkErpGoodsSkuBo bo) { - if(bo.getId()!=null){ + if(bo.getId()==null){ return AjaxResult.error(500,"缺少参数Id"); } if(StringUtils.isBlank(bo.getErpGoodsSkuId())){ diff --git a/microservices/tao-api/libs/open-sdk-1.5.1.jar b/microservices/tao-api/libs/open-sdk-1.5.1.jar deleted file mode 100644 index b373fa9b..00000000 Binary files a/microservices/tao-api/libs/open-sdk-1.5.1.jar and /dev/null differ diff --git a/microservices/tao-api/libs/open-sdk-1.5.4.jar b/microservices/tao-api/libs/open-sdk-1.5.4.jar new file mode 100644 index 00000000..27ab6f94 Binary files /dev/null and b/microservices/tao-api/libs/open-sdk-1.5.4.jar differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml index 7f2dfc65..22b20588 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.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar cn.qihangerp.module diff --git a/microservices/wei-api/libs/open-sdk-1.5.1.jar b/microservices/wei-api/libs/open-sdk-1.5.1.jar deleted file mode 100644 index b373fa9b..00000000 Binary files a/microservices/wei-api/libs/open-sdk-1.5.1.jar and /dev/null differ diff --git a/microservices/wei-api/libs/open-sdk-1.5.4.jar b/microservices/wei-api/libs/open-sdk-1.5.4.jar new file mode 100644 index 00000000..27ab6f94 Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-1.5.4.jar differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml index 60823f44..5ca66351 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.1.jar + ${project.basedir}/libs/open-sdk-1.5.4.jar cn.qihangerp.module