suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:POS

Browse Source
This commit is contained in:
苏竹红
2025-04-15 13:48:49 +08:00
parent 20e0bab663
commit 7bb472de68
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java
View File

@@ -87,13 +87,6 @@ public class PushServiceImpl implements PushService {
@Resource @Resource
ObjectMapper objectMapper; 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 @Resource
private RedisUtilPool redisUtilPool; private RedisUtilPool redisUtilPool;
@@ -139,7 +132,7 @@ public class PushServiceImpl implements PushService {
@Override @Override
public String getXzgToken(GetAccessTokenDTO dto) { 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); return executeApiCall(apiUrl, dto, String.class, xzgUsername, xzgSecret);
} }
@@ -154,8 +147,8 @@ public class PushServiceImpl implements PushService {
String key = active+"_XgjOrganization_" + eid; String key = active+"_XgjOrganization_" + eid;
String resObject = redisUtilPool.getString(key); String resObject = redisUtilPool.getString(key);
if (StringUtils.isBlank(resObject)) { if (StringUtils.isBlank(resObject)) {
String apiUrl = xgjOpenOrganizationUrl + "/open/organization"; String apiUrl = xgjUrl + "/open/organization";
resObject = JSONObject.toJSONString(executeApiGetCall(apiUrl, null, Object.class, xgjOpenOrganizationXKey, xgjOpenOrganizationXSecret)); resObject = JSONObject.toJSONString(executeApiGetCall(apiUrl, null, Object.class, xgjUsername, xgjSecret));
redisUtilPool.setNxExpire(key, resObject, 7200000); redisUtilPool.setNxExpire(key, resObject, 7200000);
} }
List<XgjOrganizationDTO> response = new ArrayList<>(); List<XgjOrganizationDTO> response = new ArrayList<>();

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java
View File

@@ -141,8 +141,16 @@ public class ShopAccountServiceImpl implements ShopAccountService {
if (!OpenStatusEnum.OPENSTATUSENUM_2.getCode().equals(shopAccountDO.getStatus())){ if (!OpenStatusEnum.OPENSTATUSENUM_2.getCode().equals(shopAccountDO.getStatus())){
throw new ServiceException(ErrorCodeEnum.CURRENT_STATUS_NOT_OPERATION); throw new ServiceException(ErrorCodeEnum.CURRENT_STATUS_NOT_OPERATION);
} }
//同一份数据到新管家
List<String> 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; 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; return Boolean.TRUE;
} }

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
View File

@@ -23,8 +23,7 @@ public class OpenApiController {
@PostMapping("/statusRefresh") @PostMapping("/statusRefresh")
public ApiResponse<Boolean> statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){ public ApiResponse<Boolean> statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){
//openApiService.statusRefresh(statusRefreshDTO) return ApiResponse.success(openApiService.statusRefresh(statusRefreshDTO));
return ApiResponse.success(Boolean.TRUE);
} }
} }

9
coolstore-partner-web/src/main/resources/application-test.properties
View File

@@ -106,8 +106,8 @@ api.auth.secret=H9YKHF6R7N16Fvy
#新管家账号 #新管家账号
xgj.api.auth.url=http://117.139.13.24:11180/dmp/one-id xgj.api.auth.url=http://117.139.13.24:11180/dmp/one-id
xgj.api.auth.username=2677a58dd9e24fc6b20e835ef5f19e63 xgj.api.auth.username=6446346061e043e392dd53c9c8d1af0b
xgj.api.auth.secret=3fe724f9607448728ee3393eff75718a xgj.api.auth.secret=3ba6e4c5632547b8b2b3acefe08667bb
#云流水账号 #云流水账号
yls.api.auth.url=**** yls.api.auth.url=****
@@ -115,13 +115,10 @@ yls.api.auth.username=****
yls.api.auth.secret=**** yls.api.auth.secret=****
#新掌柜账号 #新掌柜账号
xzg.api.auth.url=**** xzg.api.auth.url=http://webapi.zhengxinfood.com
xzg.api.auth.username=**** xzg.api.auth.username=****
xzg.api.auth.secret=**** xzg.api.auth.secret=****
cool.api.appKey=k8J7fG2qR5tY9vX3 cool.api.appKey=k8J7fG2qR5tY9vX3
cool.api.secret=wP4sN6dL8zK2xM9c 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