diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index 550daf73c..c3ce425fe 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -87,13 +87,6 @@ public class PushServiceImpl implements PushService { @Resource ObjectMapper objectMapper; - - @Value("${xgj.open.organization.X-key}") - private String xgjOpenOrganizationXKey; - @Value("${xgj.open.organization.X-Secret}") - private String xgjOpenOrganizationXSecret; - @Value("${xgj.open.organization.url}") - private String xgjOpenOrganizationUrl; @Resource private RedisUtilPool redisUtilPool; @@ -139,7 +132,7 @@ public class PushServiceImpl implements PushService { @Override public String getXzgToken(GetAccessTokenDTO dto) { - String apiUrl = xzgUrl + "XXX"; + String apiUrl = xzgUrl + "/api/supply-chain/get-token-byshopcode"; return executeApiCall(apiUrl, dto, String.class, xzgUsername, xzgSecret); } @@ -154,8 +147,8 @@ public class PushServiceImpl implements PushService { String key = active+"_XgjOrganization_" + eid; String resObject = redisUtilPool.getString(key); if (StringUtils.isBlank(resObject)) { - String apiUrl = xgjOpenOrganizationUrl + "/open/organization"; - resObject = JSONObject.toJSONString(executeApiGetCall(apiUrl, null, Object.class, xgjOpenOrganizationXKey, xgjOpenOrganizationXSecret)); + String apiUrl = xgjUrl + "/open/organization"; + resObject = JSONObject.toJSONString(executeApiGetCall(apiUrl, null, Object.class, xgjUsername, xgjSecret)); redisUtilPool.setNxExpire(key, resObject, 7200000); } List response = new ArrayList<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index 53697e458..a8a050b1e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -141,8 +141,16 @@ public class ShopAccountServiceImpl implements ShopAccountService { if (!OpenStatusEnum.OPENSTATUSENUM_2.getCode().equals(shopAccountDO.getStatus())){ throw new ServiceException(ErrorCodeEnum.CURRENT_STATUS_NOT_OPERATION); } + //同一份数据到新管家 + List list = Arrays.asList(shopAccountDO.getSystemName()); + if (ShopAccountEnum.YLS.equals(accountAuditDTO.getShopAccountEnum())){ + list.add(ShopAccountEnum.XZG.getSystemName()); + } + if (ShopAccountEnum.XZG.equals(accountAuditDTO.getShopAccountEnum())){ + list.add(ShopAccountEnum.YLS.getSystemName()); + } OpenStatusEnum openStatusEnum = accountAuditDTO.getAuditFlag() == 1 ? OpenStatusEnum.OPENSTATUSENUM_4 : OpenStatusEnum.OPENSTATUSENUM_3; - shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(shopAccountDO.getSystemName()),openStatusEnum.getCode(),null); + shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),list,openStatusEnum.getCode(),null); return Boolean.TRUE; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index 170f7d95d..0fbf4f9e0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -23,8 +23,7 @@ public class OpenApiController { @PostMapping("/statusRefresh") public ApiResponse statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){ - //openApiService.statusRefresh(statusRefreshDTO) - return ApiResponse.success(Boolean.TRUE); + return ApiResponse.success(openApiService.statusRefresh(statusRefreshDTO)); } } diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 33103cff4..42c947151 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -106,8 +106,8 @@ api.auth.secret=H9YKHF6R7N16Fvy #新管家账号 xgj.api.auth.url=http://117.139.13.24:11180/dmp/one-id -xgj.api.auth.username=2677a58dd9e24fc6b20e835ef5f19e63 -xgj.api.auth.secret=3fe724f9607448728ee3393eff75718a +xgj.api.auth.username=6446346061e043e392dd53c9c8d1af0b +xgj.api.auth.secret=3ba6e4c5632547b8b2b3acefe08667bb #云流水账号 yls.api.auth.url=**** @@ -115,13 +115,10 @@ yls.api.auth.username=**** yls.api.auth.secret=**** #新掌柜账号 -xzg.api.auth.url=**** +xzg.api.auth.url=http://webapi.zhengxinfood.com xzg.api.auth.username=**** xzg.api.auth.secret=**** cool.api.appKey=k8J7fG2qR5tY9vX3 cool.api.secret=wP4sN6dL8zK2xM9c -xgj.open.organization.X-key = 2677a58dd9e24fc6b20e835ef5f19e63 -xgj.open.organization.X-Secret = 3fe724f9607448728ee3393eff75718a -xgj.open.organization.url = http://117.139.13.24:11180/dmp/one-id