From a273b37a737c9f316fdc7ca9261a44538b811f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <570057076@qq.com> Date: Thu, 18 Dec 2025 08:29:16 +0000 Subject: [PATCH] Merge #14 into master from cc_20251218_opening MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../com/cool/store/dto/huoma/HuoMaAccountDTO.java | 6 ------ .../store/service/xinfa/XinFaDeviceService.java | 13 +++++-------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java index 4ccaccdf9..fbba95075 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/huoma/HuoMaAccountDTO.java @@ -22,18 +22,12 @@ public class HuoMaAccountDTO { private String account; /** - * 密码 */ private String password; - /** - * 是否已查询 - */ - private Boolean isQuery; public HuoMaAccountDTO(String account, String password) { this.account = account; this.password = password; - this.isQuery = false; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/xinfa/XinFaDeviceService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/xinfa/XinFaDeviceService.java index 0c3d4667b..47cad4ff1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/xinfa/XinFaDeviceService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/xinfa/XinFaDeviceService.java @@ -161,13 +161,11 @@ public class XinFaDeviceService { } for (Map.Entry entry : accountMap.entrySet()) { HuoMaAccountDTO huoMaAccountDTO = entry.getValue(); - if (!huoMaAccountDTO.getIsQuery()) { - String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword()); - List deviceDetailDetail = getStoreXinFaDeviceDetailDetail(storeNum, token); - if (CollectionUtils.isNotEmpty(deviceDetailDetail)) { - redisUtilPool.hashSet(RedisConstant.HUOMA_STORE_DEVICE_RESOURCE_KEY, storeNum, entry.getKey(), Constants.REFRESH_TOKEN_EXPIRE); - return deviceDetailDetail; - } + String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword()); + List deviceDetailDetail = getStoreXinFaDeviceDetailDetail(storeNum, token); + if (CollectionUtils.isNotEmpty(deviceDetailDetail)) { + redisUtilPool.hashSet(RedisConstant.HUOMA_STORE_DEVICE_RESOURCE_KEY, storeNum, entry.getKey(), Constants.REFRESH_TOKEN_EXPIRE); + return deviceDetailDetail; } } return Collections.emptyList(); @@ -189,7 +187,6 @@ public class XinFaDeviceService { } HuoMaAccountDTO huoMaAccountDTO = accountMap.get(source); if (Objects.nonNull(huoMaAccountDTO)){ - huoMaAccountDTO.setIsQuery(true); String token = getStoreToken(huoMaAccountDTO.getAccount(), huoMaAccountDTO.getPassword()); TagDTO tagDTO = new TagDTO("DEFAULT", 0, 30,"program"); String responseBody = null;