From 212b178104262a3e613cba434789ed85a5d9f1fc Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Apr 2025 19:45:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BuildInformationServiceImpl.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java index 630c3b445..66f3310ec 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java @@ -27,12 +27,12 @@ import java.util.*; import java.util.stream.Collectors; /** -* @author EDY -* @description 针对表【xfsg_build_information(建店资料表)】的数据库操作Service实现 -* @createDate 2024-10-09 14:05:52 -*/ + * @author EDY + * @description 针对表【xfsg_build_information(建店资料表)】的数据库操作Service实现 + * @createDate 2024-10-09 14:05:52 + */ @Service -public class BuildInformationServiceImpl implements BuildInformationService{ +public class BuildInformationServiceImpl implements BuildInformationService { @Resource private BuildInformationDAO buildInformationDAO; @@ -56,6 +56,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ private OrderSysInfoDAO orderSysInfoDAO; @Resource private WarehouseInfoMapper warehouseInfoMapper; + @Override public BuildInformationResponse getBuildInformation(Long shopId) { BuildInformationResponse response = new BuildInformationResponse(); @@ -78,7 +79,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ extracted(response, informationDO); } OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(shopId); - if (Objects.nonNull(orderSysInfoDO)){ + if (Objects.nonNull(orderSysInfoDO)) { response.setAddresseeName(orderSysInfoDO.getAddresseeName()); response.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile()); response.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident()); @@ -95,7 +96,9 @@ public class BuildInformationServiceImpl implements BuildInformationService{ response.setReceivingMsBankBranch(orderSysInfoDO.getReceivingMsBankBranch()); response.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount()); WarehouseInfoDO warehouseInfoDO = warehouseInfoMapper.getByCode(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse()); - response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); + if (Objects.nonNull(warehouseInfoDO)) { + response.setDeclareGoodsLogisticsWarehouseName(warehouseInfoDO.getWarehouseName()); + } } return response; @@ -145,19 +148,19 @@ public class BuildInformationServiceImpl implements BuildInformationService{ ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfoDO.getShopName()); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfoDO.getShopName()); List logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId()); List logistics = new ArrayList<>(); - if (Objects.nonNull(logisticsList)){ + if (Objects.nonNull(logisticsList)) { logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(logistics, MessageEnum.MESSAGE_52, map); return buildInformationDAO.insertSelective(buildInformationDO); - }else { + } else { buildInformationDO.setUpdateTime(new Date()); return buildInformationDAO.updateByShopIdSelective(buildInformationDO); } From a958e715215b96c71842fe78ddcdb1970991ff80 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Apr 2025 20:01:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HomeTemplateUserMappingServiceImpl.java | 7 ++++++- .../java/com/cool/store/config/SignValidateFilter.java | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java index de678d17f..38adcaa4e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java @@ -7,10 +7,13 @@ import com.cool.store.dao.HomeTemplateUserMappingDAO; import com.cool.store.entity.HomeTemplateDO; import com.cool.store.entity.HomeTemplateUserMappingDO; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.response.HomeTemplateResponse; import com.cool.store.service.HomeTemplateService; import com.cool.store.service.HomeTemplateUserMappingService; +import com.cool.store.utils.poi.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +37,9 @@ public class HomeTemplateUserMappingServiceImpl implements HomeTemplateUserMappi private HomeTemplateDAO homeTemplateDAO; @Override public HomeTemplateResponse getHomeTemplateByUserId(String userId) { - + if (StringUtils.isBlank(userId)){ + throw new ServiceException(ErrorCodeEnum.USER_NOT_LOGIN); + } HomeTemplateUserMappingDO homeTemplateRoleMappingById = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId); if (homeTemplateRoleMappingById == null){ //使用默认模板 id =1 diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 44b826e8d..d96af4e4a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -59,8 +59,7 @@ public class SignValidateFilter implements Filter { "/zxjp/mini/program/v1/partnerManage/openArea/areaApplyQuery", "/zxjp/**/api/audit/result", "/zxjp/**/api/license", - "/zxjp/mini/line/getRegionPayPic", - "/zxjp/mini/**" + "/zxjp/mini/line/getRegionPayPic" ); From 936b7560edf555ec53c82f1e2bb5507a159d824e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 11 Apr 2025 20:04:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/HomeTemplateUserMappingDAO.java | 4 ++++ .../service/impl/HomeTemplateUserMappingServiceImpl.java | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateUserMappingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateUserMappingDAO.java index 0d6f448f9..00ff17fc2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateUserMappingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HomeTemplateUserMappingDAO.java @@ -3,6 +3,7 @@ package com.cool.store.dao; import com.cool.store.entity.HomeTemplateUserMappingDO; import com.cool.store.mapper.HomeTemplateUserMappingMapper; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import tk.mybatis.mapper.entity.Example; @@ -24,6 +25,9 @@ public class HomeTemplateUserMappingDAO { return homeTemplateUserMappingMapper.insertSelective(homeTemplateRoleMappingDO); } public HomeTemplateUserMappingDO getHomeTemplateRoleMappingByUserId(String userId) { + if (StringUtils.isBlank(userId)){ + return null; + } Example example = new Example(HomeTemplateUserMappingDO.class); example.createCriteria().andEqualTo("userId", userId); return homeTemplateUserMappingMapper.selectOneByExample(example); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java index 38adcaa4e..792f8871f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HomeTemplateUserMappingServiceImpl.java @@ -37,9 +37,7 @@ public class HomeTemplateUserMappingServiceImpl implements HomeTemplateUserMappi private HomeTemplateDAO homeTemplateDAO; @Override public HomeTemplateResponse getHomeTemplateByUserId(String userId) { - if (StringUtils.isBlank(userId)){ - throw new ServiceException(ErrorCodeEnum.USER_NOT_LOGIN); - } + HomeTemplateUserMappingDO homeTemplateRoleMappingById = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId); if (homeTemplateRoleMappingById == null){ //使用默认模板 id =1