From 8221ea32a525612d7e5949d1abcedede596a2954 Mon Sep 17 00:00:00 2001 From: Owen <595466820@qq.com> Date: Sun, 5 Jan 2025 14:22:10 +0800 Subject: [PATCH] staging --- .../haoka/api/liantong/LianTongApiUtil.java | 13 +++--- .../api/liantong/client/ZopHttpClient.java | 2 +- .../api/strategy/LianTongApiDealStrategy.java | 43 ++++++++++++++++++- .../main/resources/application-staging.yaml | 6 +-- 4 files changed, 53 insertions(+), 11 deletions(-) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/LianTongApiUtil.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/LianTongApiUtil.java index 3bbec5ce3c..1fc5b6cb9f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/LianTongApiUtil.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/LianTongApiUtil.java @@ -44,16 +44,17 @@ public class LianTongApiUtil { String appCode = "1A2715D230724895AFB318FE8919244A"; String hmac = "wi/iBAuOWhfn63nEw8/yi2g1kypvdc1X7qt901z1G+uZN2JzdW0SwsxBwYDGYBDW+etr2i4V/rLpXp5yQb9BBg=="; String aes = "uH6eH0iGoFsgsfOHOF/kUw=="; - - ZopClient zopClient = new ZopHttpClient(appCode, hmac, aes); - +String reqUrl = "http://cd.10010.com/zop/"; +// ZopClient zopClient = new ZopHttpClient(appCode, hmac, aes); + ZopClient zopClient = LianTongApiUtil.getClient(reqUrl, appCode, hmac, aes); KingNumSelectRequest request = new KingNumSelectRequest(); - request.setProvinceCode("11"); - request.setCityCode("110"); + + request.setProvinceCode("36"); + request.setCityCode("470"); request.setQryType("02"); request.setSearchCategory("1"); - request.setGoodsId("982112279603"); + request.setGoodsId("363212082744"); request.setAmounts("10"); KingNumSelectResponse response = zopClient.execute(request); System.out.println("response=" + JSONObject.toJSONString(response)); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/client/ZopHttpClient.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/client/ZopHttpClient.java index 282ab82f5e..610e155d49 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/client/ZopHttpClient.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/liantong/client/ZopHttpClient.java @@ -102,7 +102,7 @@ public class ZopHttpClient implements ZopClient { @Override public T execute(ZopRequest request, String reqSecTag) { try { - // FieldValidateUtils.validateAllField(request); + FieldValidateUtils.validateAllField(request); StringBuilder sb = new StringBuilder(StringUtils.isEmpty(reqUrl) ? HttpConstant.DEFAULT_URL : reqUrl); sb.append(request.getPath()); LOG.info("ZOP【" + request.getPathName() + "】请求地址URL=" + sb.toString()); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java index d47c38ff51..8371cc5dd2 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java @@ -76,6 +76,23 @@ public class LianTongApiDealStrategy implements ApiDealStrategy { ziLiao.setCity(numAddress.getPhoneCityCode()); ziLiao.setCertName(param.getIdCardName()); ziLiao.setCertNum(param.getIdCardNum()); + if (skuConfigVO != null && StringUtils.isNotEmpty(skuConfigVO.getConfig())) { + String config = skuConfigVO.getConfig(); + JSONObject configs = JSON.parseObject(config); + { + String string = configs.getString("ApiPrefix_provinceCode"); + if (StringUtils.isNotEmpty(string)){ + ziLiao.setProvince(string); + } + } + { + String string = configs.getString("ApiPrefix_cityCode"); + if (StringUtils.isNotEmpty(string)){ + ziLiao.setCity(configs.getString("ApiPrefix_cityCode")); + } + } + + } logVO.setParam(JSON.toJSONString(ziLiao)); KingIdentityCustV2Response ziLiaoResponse @@ -139,7 +156,31 @@ public class LianTongApiDealStrategy implements ApiDealStrategy { syncV2.setPhoneNum(param.getPlanMobile()); syncV2.setGoodsId(preProduct.getSuperiorProductConfigRespVO().getSuperiorCode()); - syncV2.setToken(preOrderResponse.getBody()); + String body = preOrderResponse.getBody(); + if (StringUtils.isNotEmpty(body)){ + JSONObject jsonObject = JSON.parseObject(body); + syncV2.setToken(jsonObject.getString("token")); + } + + if (skuConfigVO != null && StringUtils.isNotEmpty(skuConfigVO.getConfig())) { + String config = skuConfigVO.getConfig(); + JSONObject configs = JSON.parseObject(config); + { + String string = configs.getString("ApiPrefix_provinceCode"); + if (StringUtils.isNotEmpty(string)){ + syncV2.setProvinceCode(string); + + } + } + { + String string = configs.getString("ApiPrefix_cityCode"); + if (StringUtils.isNotEmpty(string)){ + syncV2.setCityCode(string); + } + } + + } + logVO.setParam(JSON.toJSONString(syncV2)); KingOrderSyncResponse response = apiLianTongService.lianTongOrderSyncV2(syncV2); diff --git a/yudao-server/src/main/resources/application-staging.yaml b/yudao-server/src/main/resources/application-staging.yaml index fc98907b57..8419cea706 100644 --- a/yudao-server/src/main/resources/application-staging.yaml +++ b/yudao-server/src/main/resources/application-staging.yaml @@ -45,7 +45,7 @@ spring: primary: master datasource: master: - url: jdbc:mysql://127.0.0.1:3306/haoka-staging?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 + url: jdbc:mysql://127.0.0.1:3306/hk_staging?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例 # url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true # MySQL Connector/J 5.X 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 @@ -63,7 +63,7 @@ spring: # password: Yudao@2024 # OpenGauss 连接的示例 slave: # 模拟从库，可根据自己需要修改 lazy: true # 开启懒加载，保证启动速度 - url: jdbc:mysql://127.0.0.1:3306/haoka-staging?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://127.0.0.1:3306/hk_staging?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: root password: UDMUSJv5iRq4R% @@ -72,7 +72,7 @@ spring: redis: host: 127.0.0.1 # 地址 port: 6379 # 端口 - database: 0 # 数据库索引 + database: 3 # 数据库索引 password: haoka2024 # 密码，建议生产环境开启 --- #################### 定时任务相关配置 ####################