From 921447d6722728921e42da2549d8f738719f46b7 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 29 Apr 2025 20:13:43 +0800 Subject: [PATCH] fix --- .../cool/store/dao/HyPartnerUserInfoDAO.java | 3 +++ .../mapper/HyPartnerUserInfoMapper.xml | 6 +++--- .../main/resources/mapper/ShopAccountMapper.xml | 6 +++--- .../com/cool/store/entity/ShopAccountDO.java | 2 +- .../service/impl/ShopAccountServiceImpl.java | 17 +++++++++++++---- .../controller/webb/ShopAccountController.java | 6 ++++++ 6 files changed, 29 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java index df04af895..e62ca3e09 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerUserInfoDAO.java @@ -101,6 +101,9 @@ public class HyPartnerUserInfoDAO { * @description: 数据处理专用只处理，盐值 密码 第二密码 */ public Integer dataHandle(List hyPartnerUserInfoDOList){ + if (CollectionUtils.isEmpty(hyPartnerUserInfoDOList)){ + return 0; + } return hyPartnerUserInfoMapper.dataHandle(hyPartnerUserInfoDOList); } } diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index 47cd5e76a..f1a56724a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -175,13 +175,13 @@ update xfsg_partner_user_info - + downstream_system_salting = #{item.downstreamSystemSalting}, - + downstream_system_password = #{item.downstreamSystemPassword}, - + downstream_system_secondary_password = #{item.downstreamSystemSecondaryPassword}, diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index 6b12fb46f..152020c2e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -162,13 +162,13 @@ update xfsg_shop_account - + password_salt = #{item.passwordSalt}, - + password = #{item.password}, - + secondary_password = #{item.secondaryPassword}, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java index c216b81eb..80b6b5829 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.Date; import javax.persistence.*; -@Table(name = "xfsg_shop_accounts") +@Table(name = "xfsg_shop_account") @Data public class ShopAccountDO { /** 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 1e890b9b4..07244c50e 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 @@ -268,12 +268,16 @@ public class ShopAccountServiceImpl implements ShopAccountService { @Transactional(rollbackFor = Exception.class) public Boolean handleOldData() { List shopList = shopInfoDAO.getListByTime(); + if (CollectionUtils.isEmpty(shopList)) { + return false; + } Map> shopMap = shopList.stream().collect(Collectors.groupingBy(ShopInfoDO::getPartnerId)); Set partnerIds = shopList.stream().map(ShopInfoDO::getPartnerId).collect(Collectors.toSet()); Set lineIdSet = shopList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toSet()); List hyPartnerUserInfoDOS = hyPartnerUserInfoDAO.selectByPartnerIds(new ArrayList<>(partnerIds)); List qualificationsInfoDOList = qualificationsInfoDAO.getByLineIds(new ArrayList<>(lineIdSet)); Map qualificationsInfoDOMap = qualificationsInfoDOList.stream().collect(Collectors.toMap(QualificationsInfoDO::getPartnerId, Function.identity())); + List updateList = new ArrayList<>(); for (HyPartnerUserInfoDO hyPartnerUserInfoDO : hyPartnerUserInfoDOS) { QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDOMap.get(hyPartnerUserInfoDO.getPartnerId()); List shopInfos = shopMap.get(hyPartnerUserInfoDO.getPartnerId()); @@ -293,12 +297,17 @@ public class ShopAccountServiceImpl implements ShopAccountService { hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(downstreamSystemSecondaryPassword); //循环修改 门店账户表 for (ShopAccountDO shopAccountDO : accountDOList) { - hyPartnerUserInfoDO.setDownstreamSystemPassword(shopAccountDO.getPassword()); - hyPartnerUserInfoDO.setDownstreamSystemSalting(shopAccountDO.getPasswordSalt()); - hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(shopAccountDO.getSecondaryPassword()); + if (shopAccountDO.getSystemName().equals(ShopAccountEnum.YLS.getSystemName()) + || shopAccountDO.getSystemName().equals(ShopAccountEnum.XZG.getSystemName()) + || shopAccountDO.getSystemName().equals(ShopAccountEnum.HUOMA.getSystemName())) { + shopAccountDO.setPassword(password); + shopAccountDO.setPasswordSalt(salt); + shopAccountDO.setSecondaryPassword(downstreamSystemSecondaryPassword); + updateList.add(shopAccountDO); + } } - shopAccountDAO.dateHandle(accountDOList); } + shopAccountDAO.dateHandle(updateList); hyPartnerUserInfoDAO.dataHandle(hyPartnerUserInfoDOS); return true; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java index ca617d3ff..59e080abd 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java @@ -73,6 +73,12 @@ public class ShopAccountController { return ResponseResult.success(accountService.accountEntryStatusChange(dto)); } + @ApiOperation("密码数据处理") + @GetMapping("/handleOldData") + public ResponseResult handleOldData() { + return ResponseResult.success(accountService.handleOldData()); + } + }