From a5ad26928cfdd67e66d0d295a1b392453852a735 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 28 May 2025 10:09:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/LineInfoDAO.java | 9 +++++++++ .../cool/store/service/impl/ShopAccountServiceImpl.java | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index caeeb0799..24f3b7908 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -219,4 +219,13 @@ public class LineInfoDAO { List lineMobile = lineInfoMapper.getByLineIds(lineIds); return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getUsername, (k1, k2)-> k1)); } + + public List getListByPartnerIds(List partnerIds){ + if(CollectionUtils.isEmpty(partnerIds)){ + return Lists.newArrayList(); + } + Example example = new Example(LineInfoDAO.class); + example.createCriteria().andIn("partnerId",partnerIds); + return lineInfoMapper.selectByExample(example); + } } 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 02229716e..8cbbaf94a 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 @@ -55,6 +55,8 @@ public class ShopAccountServiceImpl implements ShopAccountService { OldShopDAO oldShopDAO; @Resource ThirdXinGuanJiaService thirdXinGuanJiaService; + @Resource + private LineInfoDAO lineInfoDAO; @Override public List getShopAccountByShopId(Long shopId) { @@ -368,6 +370,10 @@ public class ShopAccountServiceImpl implements ShopAccountService { return true; } List partnerIds = hyPartnerUserInfoDOS.stream().map(HyPartnerUserInfoDO::getPartnerId).collect(Collectors.toList()); + List lineInfoDOList = lineInfoDAO.getListByPartnerIds(partnerIds); + List lineIds = lineInfoDOList.stream().map(LineInfoDO::getId).collect(Collectors.toList()); + // shopInfoDAO.selectByLines(); + return null; } From 521041447ec7398834c4260feb47ee765b4dde17 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 28 May 2025 15:32:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/HyPartnerUserInfoDAO.java | 5 +- .../java/com/cool/store/dao/LineInfoDAO.java | 2 +- .../cool/store/dao/QualificationsInfoDAO.java | 11 ++- .../com/cool/store/dao/ShopAccountDAO.java | 17 +++++ .../java/com/cool/store/dao/ShopInfoDAO.java | 6 ++ .../store/mapper/HyPartnerUserInfoMapper.java | 2 + .../mapper/HyPartnerUserInfoMapper.xml | 5 ++ .../resources/mapper/ShopAccountMapper.xml | 1 + .../main/resources/mapper/ShopInfoMapper.xml | 8 ++- .../service/impl/ShopAccountServiceImpl.java | 70 +++++++++++++++++-- .../webb/ShopAccountController.java | 6 ++ 11 files changed, 121 insertions(+), 12 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 6897721e6..f54825b8c 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 @@ -109,8 +109,7 @@ public class HyPartnerUserInfoDAO { } public List selectPasswordIsNull(){ - Example example = new Example(HyPartnerUserInfoDO.class); - example.createCriteria().andIsNull("downstreamSystemPassword"); - return hyPartnerUserInfoMapper.selectByExample(example); + + return hyPartnerUserInfoMapper.selectPasswordIsNull(); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index 24f3b7908..9a42a109b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -224,7 +224,7 @@ public class LineInfoDAO { if(CollectionUtils.isEmpty(partnerIds)){ return Lists.newArrayList(); } - Example example = new Example(LineInfoDAO.class); + Example example = new Example(LineInfoDO.class); example.createCriteria().andIn("partnerId",partnerIds); return lineInfoMapper.selectByExample(example); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/QualificationsInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/QualificationsInfoDAO.java index 1da7d4c5e..c41e707c1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/QualificationsInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/QualificationsInfoDAO.java @@ -44,7 +44,7 @@ public class QualificationsInfoDAO { } return qualificationsInfoMapper.getByLineId(lineId); } - public List getByLineIds(@Param("lineIds") List lineIds){ + public List getByLineIds( List lineIds){ if (lineIds==null|| lineIds.isEmpty()){ return new java.util.ArrayList<>(); } @@ -52,4 +52,13 @@ public class QualificationsInfoDAO { example.createCriteria().andIn("lineId", lineIds); return qualificationsInfoMapper.selectByExample(example); } + + public List getByPartnerIds( List partnerIds){ + if (partnerIds.isEmpty()){ + return new java.util.ArrayList<>(); + } + Example example = new Example(QualificationsInfoDO.class); + example.createCriteria().andIn("partnerId", partnerIds); + return qualificationsInfoMapper.selectByExample(example); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java index 916533dae..6ed5e54ae 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java @@ -141,12 +141,29 @@ public class ShopAccountDAO { return shopAccountMapper.selectByExample(example); } + public List getPasswordIsNullByShopIds(List shopIds){ + if (CollectionUtils.isEmpty(shopIds)){ + return new ArrayList<>(); + } + Example example = new Example(ShopAccountDO.class); + List systemNameList = new ArrayList<>(); + systemNameList.add("火码POS"); + systemNameList.add("云流水"); + systemNameList.add("新掌柜"); + example.createCriteria().andIn("shopId", shopIds).andIsNull("password").andIn("systemName",systemNameList); + return shopAccountMapper.selectByExample(example); + } + + /** * @Auther: wangshuo * @Date: 2025/4/28 * @description: 数据处理专用只处理，盐值 密码 第二密码 */ public Integer dateHandle(List list){ + if (CollectionUtils.isEmpty(list)){ + return CommonConstants.ZERO; + } return shopAccountMapper.dateHandle(list); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 8eb4faa79..d6fb3e345 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -291,4 +291,10 @@ public class ShopInfoDAO { public List getShopFranchiseReportList(FranchiseReportRequest request){ return shopInfoMapper.getShopFranchiseReportList(request); } + + public List selectByPartnerIds(List partnerIds){ + Example example = new Example(ShopInfoDO.class); + example.createCriteria().andIn("partnerId", partnerIds).andEqualTo("deleted", false); + return shopInfoMapper.selectByExample(example); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java index 37df0885a..4ac2fcb53 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerUserInfoMapper.java @@ -53,4 +53,6 @@ public interface HyPartnerUserInfoMapper extends tk.mybatis.mapper.common.Mappe Integer dataHandle(@Param("list") List hyPartnerUserInfoDOList); + List selectPasswordIsNull(); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index f1a56724a..7f7b18652 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -56,6 +56,9 @@ + insert into xfsg_partner_user_info @@ -184,6 +187,8 @@ downstream_system_secondary_password = #{item.downstreamSystemSecondaryPassword}, + update_time = now() + where id = #{item.id} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index 4b6a80586..414fdb47a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -176,6 +176,7 @@ secondary_password = #{item.secondaryPassword}, + remark = #{item.remark} where id = #{item.id} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 0a9bee34d..7746ac12f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -428,9 +428,11 @@ #{item} - - #{item} - + + + #{item} + +