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

Merge #14 into master from cc_20251218_opening

Browse Source 
fix:信发查询bug

* cc_20251218_opening: (1 commits squashed)

  - fix:信发查询bug

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/14
This commit is contained in:
苏竹红
2025-12-18 08:29:16 +00:00
parent dd58d70fa2
commit a273b37a73
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java
View File

@@ -22,18 +22,12 @@ public class HuoMaAccountDTO {
private String account; private String account;
/** /**
* 密码
*/ */
private String password; private String password;
/**
* 是否已查询
*/
private Boolean isQuery;
public HuoMaAccountDTO(String account, String password) { public HuoMaAccountDTO(String account, String password) {
this.account = account; this.account = account;
this.password = password; this.password = password;
this.isQuery = false;
} }
} }

13
coolstore-partner-service/src/main/java/com/cool/store/service/xinfa/XinFaDeviceService.java
View File

@@ -161,13 +161,11 @@ public class XinFaDeviceService {
} }
for (Map.Entry<String, HuoMaAccountDTO> entry : accountMap.entrySet()) { for (Map.Entry<String, HuoMaAccountDTO> entry : accountMap.entrySet()) {
HuoMaAccountDTO huoMaAccountDTO = entry.getValue(); HuoMaAccountDTO huoMaAccountDTO = entry.getValue();
if (!huoMaAccountDTO.getIsQuery()) { String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword());
String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword()); List<StoreXinFaDeviceDetail> deviceDetailDetail = getStoreXinFaDeviceDetailDetail(storeNum, token);
List<StoreXinFaDeviceDetail> deviceDetailDetail = getStoreXinFaDeviceDetailDetail(storeNum, token); if (CollectionUtils.isNotEmpty(deviceDetailDetail)) {
if (CollectionUtils.isNotEmpty(deviceDetailDetail)) { redisUtilPool.hashSet(RedisConstant.HUOMA_STORE_DEVICE_RESOURCE_KEY, storeNum, entry.getKey(), Constants.REFRESH_TOKEN_EXPIRE);
redisUtilPool.hashSet(RedisConstant.HUOMA_STORE_DEVICE_RESOURCE_KEY, storeNum, entry.getKey(), Constants.REFRESH_TOKEN_EXPIRE); return deviceDetailDetail;
return deviceDetailDetail;
}
} }
} }
return Collections.emptyList(); return Collections.emptyList();
@@ -189,7 +187,6 @@ public class XinFaDeviceService {
} }
HuoMaAccountDTO huoMaAccountDTO = accountMap.get(source); HuoMaAccountDTO huoMaAccountDTO = accountMap.get(source);
if (Objects.nonNull(huoMaAccountDTO)){ if (Objects.nonNull(huoMaAccountDTO)){
huoMaAccountDTO.setIsQuery(true);
String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword()); String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword());
TagDTO tagDTO = new TagDTO("DEFAULT", 0, 30,"program"); TagDTO tagDTO = new TagDTO("DEFAULT", 0, 30,"program");
String responseBody = null; String responseBody = null;