diff --git a/README.md b/README.md index 2b127a25..a0951f76 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 启航电商ERP系统-电商企业数智化底座 +# 启航电商ERP系统-电商企业数字化底座 > **欢迎来到我们的开源项目!创新、协作、高质量的代码。您的Star🌟,是我们前进的动力! 💪✨🏆** diff --git a/api/oms-api/libs/open-sdk-2.1.12.jar b/api/oms-api/libs/open-sdk-2.1.12.jar new file mode 100644 index 00000000..56e07c3f Binary files /dev/null and b/api/oms-api/libs/open-sdk-2.1.12.jar differ diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 3277cada..9b5f8e8a 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -98,7 +98,7 @@ open-sdk 1.0 system - ${project.basedir}/libs/open-sdk-2.1.11.jar + ${project.basedir}/libs/open-sdk-2.1.12.jar diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java index e47a2529..c1e4901b 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java @@ -110,7 +110,7 @@ public class TaoOrderApiController { //第一次获取 // ApiResultVo upResult = OrderApiHelper.pullIncrementOrder(startTime,endTime,pageIndex, pageSize, url, appKey, appSecret, sessionKey); - ApiResultVo upResult = TaoOrderApiHelper.pullTradeList(startTime,endTime,appKey, appSecret, sessionKey); + ApiResultVo upResult = TaoOrderApiHelper.pullOrderList(startTime,endTime,appKey, appSecret, sessionKey); if (upResult.getCode() != ResultVoEnum.SUCCESS.getIndex()) { log.info("/**************主动更新tao订单:第一次获取结果失败:" + upResult.getMsg() + "****************/"); if(upResult.getCode() == HttpStatus.UNAUTHORIZED){ diff --git a/vue/src/views/tao/order/index.vue b/vue/src/views/tao/order/index.vue index a14a2707..ecc49297 100644 --- a/vue/src/views/tao/order/index.vue +++ b/vue/src/views/tao/order/index.vue @@ -163,7 +163,7 @@ - +