From 8b485f1840695b584b8b758187f83ba015f4f05d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 11 Feb 2025 15:33:07 +0800 Subject: [PATCH 01/49] =?UTF-8?q?=E5=8A=A0=E7=9B=9F=E8=B4=B9=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=9B=9E=E4=BC=A0=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/InvoicingMapper.xml | 1 + .../src/main/resources/mapper/LinePayMapper.xml | 3 ++- .../src/main/java/com/cool/store/dto/InvoicingDTO.java | 3 +++ .../src/main/java/com/cool/store/entity/InvoicingDO.java | 2 ++ .../src/main/java/com/cool/store/entity/LinePayDO.java | 3 +++ .../main/java/com/cool/store/request/LinePaySubmitRequest.java | 2 ++ .../java/com/cool/store/response/FranchiseFeeResponse.java | 3 +++ .../java/com/cool/store/service/impl/LinePayServiceImpl.java | 1 + 8 files changed, 17 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml index f69d653ae..86125530d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/InvoicingMapper.xml @@ -22,6 +22,7 @@ + diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index f2bcd9482..252d875c7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -24,11 +24,12 @@ + id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, - update_time, create_user_id, update_user_id, deleted,pay_business_type,amount + update_time, create_user_id, update_user_id, deleted,pay_business_type,amount,combined_field + select * from zl_partner_user_wechat_bind where partner_id = #{partnerId} and open_id = #{openId} + + + + + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PartnerUserWechatBindDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PartnerUserWechatBindDO.java new file mode 100644 index 000000000..f3496136a --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PartnerUserWechatBindDO.java @@ -0,0 +1,49 @@ +package com.cool.store.entity; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * C端微信用户映射表DO + *

+ * + * @author ZhangHua + * @since 2024/08/19 + */ +@Data +public class PartnerUserWechatBindDO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 主键id + */ + private Long id; + + /** + * 平台内用户标识 + */ + private String openId; + + /** + * 绑定时间 + */ + private Date bindTime; + + /** + * zl_partner_user_info.partner_id + */ + private String partnerId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java index ce220417d..fa329957e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WechatMiniAppService.java @@ -17,6 +17,8 @@ public interface WechatMiniAppService { PartnerUserInfoVO getUserInfoByJsCode(String jsCode); + Boolean cancellation(String openId); + String getUserPhoneNumber(String mobileCode); String updateUserPhoneNumber(MobileUpdateRequest request, PartnerUserInfoVO userInfoVO); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 5b512f134..428dbd928 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -49,6 +49,8 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { private LineInfoDAO lineInfoDAO; @Resource HyOpenAreaInfoDAO hyOpenAreaInfoDAO; + @Resource + PartnerUserWechatBindDAO partnerUserWechatBindDAO; @Value("${weixin.appId}") private String wxAppId; @Value("${weixin.appSecret}") @@ -72,78 +74,51 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } CodeSessionDTO codeSession = wechatRest.miniProgramJsCodeSession(wxAppId, wxAppSecret, jsCode); String openid = codeSession.getOpenid(); - String sessionCacheKey = MessageFormat.format(CommonConstants.MINI_PROGRAM_SESSION_KEY, wxAppId, openid); - redisUtilPool.setString(sessionCacheKey, codeSession.getSessionKey(), CommonConstants.THREE_DAY_SECONDS); String unionId = codeSession.getUnionId(); log.info("小程序登录:{}", unionId); log.info("sessionKey {}", codeSession.getSessionKey()); - /* String decryptUser = AesUtil.decryptWechat(codeSession.getSessionKey(), param.getEncryptedData(), param.getIvStr()); - log.info("解密用户信息：{}", decryptUser); - MiniProgramUserVO miniProgramUser = JSON.parseObject(decryptUser, MiniProgramUserVO.class); - if (Objects.isNull(miniProgramUser)) { - throw new ServiceException(ErrorCodeEnum.GET_WECHAT_USER_INFO_FAIL); - }*/ // 获取小程序token String accessToken = wechatRest.getAccessToken(wxAppId, wxAppSecret); // 获取手机号码 PhoneInfoDTO phoneInfoDTO = wechatRest.getUserPhoneNumber(param.getMobileCode(), accessToken); - if(phoneInfoDTO != null && phoneInfoDTO.getPhoneInfo() != null && StringUtils.isNotBlank(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByOpenid(openid); - if( hyPartnerUserInfoDO != null && !hyPartnerUserInfoDO.getMobile().equals(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){ - throw new ServiceException(ErrorCodeEnum.WECHAT_BIND_OTHER_MOBILE); - } - // 微信未授权过 - if(hyPartnerUserInfoDO == null){ - hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - if(hyPartnerUserInfoDO != null && StringUtils.isNotBlank(hyPartnerUserInfoDO.getOpenid()) && !openid.equals(hyPartnerUserInfoDO.getOpenid())){ - throw new ServiceException(ErrorCodeEnum.MOBILE_WECHAT_EXIST); - } - if(hyPartnerUserInfoDO == null){ - hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); - hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); - hyPartnerUserInfoDO.setOpenid(openid); - hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); - Integer channelId = null; - String userChannel = param.getUserChannelEnum(); - if(StringUtils.isNotEmpty(userChannel)){ - if(UserChannelEnum.EXHIBITION.getCode().equals(userChannel)){ - channelId = exhibition; - }else if(UserChannelEnum.RECOMMENDED.getCode().equals(userChannel)){ - channelId = recommended; - }else { - if (StringUtils.isNumeric(userChannel)) { - channelId = Integer.valueOf(userChannel); - HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelId(Long.valueOf(channelId)); - if (Objects.isNull(hyPartnerUserChannelDO)|| hyPartnerUserChannelDO.getChannelId() == null ) { - //用户渠道不存在 - throw new ServiceException(ErrorCodeEnum.USER_CHANNEL_NOT_EXISTS); - } - - } - } - } - hyPartnerUserInfoDO.setUserChannelId(channelId); - hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); - //授权的时候 新增线索 放到公海 - LineInfoDO lineInfoDO = new LineInfoDO(); - lineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); - lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode()); - lineInfoDO.setMobile(hyPartnerUserInfoDO.getMobile()); - lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); - lineInfoDO.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode())); - lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode()); - lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); - lineInfoDAO.insertOrUpdate(lineInfoDO); - }else { - hyPartnerUserInfoDO.setOpenid(openid); - hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO); - } - } - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId()); + if (Objects.isNull(phoneInfoDTO) || Objects.isNull(phoneInfoDTO.getPhoneInfo())){ + throw new ServiceException(ErrorCodeEnum.LOGIN_ERROR_MOBILE_ERROR); } - userInfoVO.setOpenid(openid); - userInfoVO.setUnionId(unionId); + //通过手机号查询用户信 + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + if (hyPartnerUserInfoDO == null) { + //系统中没有改手机号 需要先注册该手机号 + hyPartnerUserInfoDO = new HyPartnerUserInfoDO(); + hyPartnerUserInfoDO.setMobile(phoneInfoDTO.getPhoneInfo().getPhoneNumber()); + hyPartnerUserInfoDO.setOpenid(openid); + hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID()); + hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO); + LineInfoDO lineInfoDO = new LineInfoDO(); + lineInfoDO.setLineStatus(LineStatusEnum.PUBLIC_SEAS.getCode()); + lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode()); + lineInfoDO.setMobile(hyPartnerUserInfoDO.getMobile()); + lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + lineInfoDO.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode())); + lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode()); + lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); + lineInfoDAO.insertOrUpdate(lineInfoDO); + } + //判断绑定表种是否绑定了手机号与微信openid + PartnerUserWechatBindDO zlPartnerUserBindDO = partnerUserWechatBindDAO.getByOpenIdAndPartnerId(hyPartnerUserInfoDO.getPartnerId(), openid); + if (zlPartnerUserBindDO == null) { + //绑定手机号与微信openid + PartnerUserWechatBindDO bindDO = new PartnerUserWechatBindDO(); + bindDO.setBindTime(new Date()); + bindDO.setOpenId(openid); + bindDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); + bindDO.setCreateTime(new Date()); + partnerUserWechatBindDAO.insertSelective(bindDO); + } + BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); + fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId()); + //将数据存储到redis中 + String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openid); + redisUtilPool.setString(key,JSONObject.toJSONString(userInfoVO),CommonConstants.SEVEN_DAY_SECONDS); return userInfoVO; } @@ -157,17 +132,28 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } CodeSessionDTO codeSession = wechatRest.miniProgramJsCodeSession(wxAppId, wxAppSecret, jsCode); String openid = codeSession.getOpenid(); - String sessionCacheKey = MessageFormat.format(CommonConstants.MINI_PROGRAM_SESSION_KEY, wxAppId, openid); - redisUtilPool.setString(sessionCacheKey, codeSession.getSessionKey(), CommonConstants.THREE_DAY_SECONDS); - HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByOpenid(openid); - if(hyPartnerUserInfoDO != null){ - userInfoVO = new PartnerUserInfoVO(); - BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); - fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId()); + String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openid); + String value = redisUtilPool.getString(key); + if (StringUtils.isNotEmpty(value)){ + //设置有效期 + Long expire = redisUtilPool.getExpire(key); + if (expire < CommonConstants.THREE_DAY_SECONDS){ + //重置时间为7天 + redisUtilPool.expire(key,CommonConstants.SEVEN_DAY_SECONDS); + } + userInfoVO = JSONObject.parseObject(value,PartnerUserInfoVO.class); } return userInfoVO; } + @Override + public Boolean cancellation(String openId) { + //删除登录态缓存 + String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openId); + redisUtilPool.delKey(key); + return Boolean.TRUE; + } + @Override public String getUserPhoneNumber(String mobileCode) { From 5e00fac82a59b2652fdd1de9ba96875983adb350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Feb 2025 16:02:35 +0800 Subject: [PATCH 18/49] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/constants/CommonConstants.java | 2 +- .../com/cool/store/service/impl/WechatMiniAppServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 4d58c1dc1..b4dc5b308 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -50,7 +50,7 @@ public class CommonConstants { public static final String WX_APP_SECRET_KEY = "wx_app_secret_key:{0}"; public static final String MINI_PROGRAM_SESSION_KEY = "mini_program_session_key:{0}:{1}"; - public static final String MINI_PROGRAM_LOGIN_FLAG = "mini_program_login_flag:{0}"; + public static final String ZXJP_MINI_PROGRAM_LOGIN_FLAG = "mini_program_login_flag:{0}"; public static final String ROOT_DEPT_ID_STR = "1"; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 428dbd928..8750d99af 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -117,7 +117,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO); fillLineInfo(userInfoVO, hyPartnerUserInfoDO.getPartnerId()); //将数据存储到redis中 - String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openid); + String key = MessageFormat.format(CommonConstants.ZXJP_MINI_PROGRAM_LOGIN_FLAG, openid); redisUtilPool.setString(key,JSONObject.toJSONString(userInfoVO),CommonConstants.SEVEN_DAY_SECONDS); return userInfoVO; } @@ -132,7 +132,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { } CodeSessionDTO codeSession = wechatRest.miniProgramJsCodeSession(wxAppId, wxAppSecret, jsCode); String openid = codeSession.getOpenid(); - String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openid); + String key = MessageFormat.format(CommonConstants.ZXJP_MINI_PROGRAM_LOGIN_FLAG, openid); String value = redisUtilPool.getString(key); if (StringUtils.isNotEmpty(value)){ //设置有效期 From 72d1f5fb88ce6fedb3cc6c04ac258b4342335b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Feb 2025 16:04:37 +0800 Subject: [PATCH 19/49] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/WechatMiniAppServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java index 8750d99af..82bae9802 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java @@ -149,7 +149,7 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService { @Override public Boolean cancellation(String openId) { //删除登录态缓存 - String key = MessageFormat.format(CommonConstants.MINI_PROGRAM_LOGIN_FLAG, openId); + String key = MessageFormat.format(CommonConstants.ZXJP_MINI_PROGRAM_LOGIN_FLAG, openId); redisUtilPool.delKey(key); return Boolean.TRUE; } From bf0d0a80d3327143c2d357962152e759a310927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Feb 2025 16:06:21 +0800 Subject: [PATCH 20/49] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/constants/CommonConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index b4dc5b308..db0a618dd 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -50,7 +50,7 @@ public class CommonConstants { public static final String WX_APP_SECRET_KEY = "wx_app_secret_key:{0}"; public static final String MINI_PROGRAM_SESSION_KEY = "mini_program_session_key:{0}:{1}"; - public static final String ZXJP_MINI_PROGRAM_LOGIN_FLAG = "mini_program_login_flag:{0}"; + public static final String ZXJP_MINI_PROGRAM_LOGIN_FLAG = "zxjp_mini_program_login_flag:{0}"; public static final String ROOT_DEPT_ID_STR = "1"; From 88767d05a8fbfa887723cbace3e638bb115e168a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 19 Feb 2025 16:12:10 +0800 Subject: [PATCH 21/49] =?UTF-8?q?fix=20=E7=9F=AD=E4=BF=A1=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=89=BE=E4=BA=BA=E5=87=BA=E7=8E=B0null=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BuildInformationServiceImpl.java | 20 ++++- .../store/service/impl/CommonService.java | 2 + .../service/impl/DecorationServiceImpl.java | 73 ++++++++++--------- .../service/impl/FranchiseFeeServiceImpl.java | 8 +- .../impl/IntentAgreementServiceImpl.java | 13 ++-- .../service/impl/LinePayServiceImpl.java | 8 +- .../impl/OpeningOperationPlanImpl.java | 9 ++- .../impl/PlatformBuildServiceImpl.java | 35 +++++++-- .../store/service/impl/ShopServiceImpl.java | 16 ++-- .../impl/SignFranchiseServiceImpl.java | 5 +- 10 files changed, 116 insertions(+), 73 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 9f19a387a..f13a950dc 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 @@ -113,22 +113,34 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId()); - List itUsers = itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List itUsers = new ArrayList<>(); + if (!itList.isEmpty()){ + itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(itUsers, MessageEnum.MESSAGE_39, map); List posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId()); - List posUsers = posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List posUsers = new ArrayList<>(); + if (!posList.isEmpty()){ + posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(posUsers, MessageEnum.MESSAGE_38, map); List xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId()); - List xfUsers = xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List xfUsers = new ArrayList<>(); + if(!xfList.isEmpty()){ + xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(xfUsers, MessageEnum.MESSAGE_40, map); List zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId()); - List zxtUsers = xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List zxtUsers = new ArrayList<>(); + if(!zxtList.isEmpty()){ + zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(zxtUsers, MessageEnum.MESSAGE_41, map); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java index 3968708d3..ae440df5e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java @@ -188,10 +188,12 @@ public class CommonService { public void sendQWMessage(List userIds, MessageEnum message, Map requestMap){ log.info("message:{}, request:{}, userIds:{}", message.getTitle(), JSONObject.toJSONString(requestMap), JSONObject.toJSONString(userIds)); if(CollectionUtils.isEmpty(userIds)){ + log.info("消息接收人列表为空"); return; } userIds = userIds.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList()); if(CollectionUtils.isEmpty(userIds)){ + log.info("消息接收人列表为空"); return; } try { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index ea0f2098d..1f7e29f30 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -134,7 +134,9 @@ public class DecorationServiceImpl implements DecorationService { } //预算 BudgetDTO proposedBookBudget = getBudgetDTOS(decoration); - if (proposedBookBudget == null) {return null;} + if (proposedBookBudget == null) { + return null; + } BigDecimal vzHj = proposedBookBudget.getVzHj(); //支付二维码url DecorationModelDTO decorationModelDTO = new DecorationModelDTO(); @@ -364,11 +366,14 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(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 userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfoDO.getRegionId()); - List userIds = userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List userIds = new ArrayList<>(); + if (!userDOList.isEmpty()) { + userIds.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(userIds, MessageEnum.MESSAGE_37, map); @@ -390,7 +395,7 @@ public class DecorationServiceImpl implements DecorationService { List fitmentCheckVOList = new ArrayList<>(); //shopId,lineid,regionid,shopname,storenum, - List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(),request.getSubStageStatus(),null); + List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null); PageInfo pageInfo = new PageInfo<>(shopInfoDOS); if (shopInfoDOS.isEmpty()) { log.info("该工程部监理下门店为空"); @@ -461,7 +466,7 @@ public class DecorationServiceImpl implements DecorationService { } } if (Objects.nonNull(ShopStageInfoDOMap.get(shopId))) { - fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.getOrDefault(shopId,new ShopStageInfoDO()).getShopSubStageStatus()); + fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.getOrDefault(shopId, new ShopStageInfoDO()).getShopSubStageStatus()); } fitmentCheckVOList.add(fitmentCheckVO); } @@ -528,25 +533,25 @@ public class DecorationServiceImpl implements DecorationService { //重复提交校验 3秒内不能重复提交 String lockKey = "submitDecorationDesign:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } //校验参数 - if (Objects.isNull(request)||request.getShopId()==null){ + if (Objects.isNull(request) || request.getShopId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //必须是待提交状态才能提交 ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); - if (shopStageInfo!=null&&!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { + if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); - if (Objects.nonNull(decoration)){ + if (Objects.nonNull(decoration)) { decorationDesignInfoDO.setId(decoration.getId()); decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO); - }else { + } else { decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO); } //更新装修设计状态 @@ -555,17 +560,17 @@ public class DecorationServiceImpl implements DecorationService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); Map templateParam = new HashMap<>(); templateParam.put("shopName", shopInfo.getShopName()); - commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.DESIGN_STAGE,templateParam); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam); return Boolean.TRUE; } @Override public DecorationDesignVO getDecorationDesign(Long shopId) { - if (shopId==null){ + if (shopId == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); - if (!Objects.isNull(decoration)){ + if (!Objects.isNull(decoration)) { DecorationDesignVO decorationDesignVO = new DecorationDesignVO(); decorationDesignVO.setDesignUrl(decoration.getDesignUrl()); decorationDesignVO.setRemark(decoration.getRemark()); @@ -581,17 +586,17 @@ public class DecorationServiceImpl implements DecorationService { public Boolean submitConstructionData(ConstructionRequest request, LoginUserInfo user) { String lockKey = "submitConstructionData:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } //校验参数 - if (Objects.isNull(request)||request.getShopId()==null){ + if (Objects.isNull(request) || request.getShopId() == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } //必须是待提交状态才能提交 ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); - if (shopStageInfo!=null&&!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { + if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT); } DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); @@ -611,16 +616,16 @@ public class DecorationServiceImpl implements DecorationService { public ConstructionDataVO getConstructionData(Long shopId) { ConstructionDataVO constructionDataVO = new ConstructionDataVO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(shopId); - if (Objects.isNull(decoration)){ + if (Objects.isNull(decoration)) { return constructionDataVO; } constructionDataVO.setConstructionAnnex(decoration.getConstructionAnnex()); constructionDataVO.setConstructionRemark(decoration.getConstructionRemark()); - constructionDataVO.setConstructionPlanStartTime(decoration.getConstructionPlanStartTime()!=null?decoration.getConstructionPlanStartTime().getTime():null); - constructionDataVO.setConstructionPlanEndTime(decoration.getConstructionPlanEndTime()!=null?decoration.getConstructionPlanEndTime().getTime():null); - constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime()!=null?decoration.getConstructionCreateTime().getTime():null); + constructionDataVO.setConstructionPlanStartTime(decoration.getConstructionPlanStartTime() != null ? decoration.getConstructionPlanStartTime().getTime() : null); + constructionDataVO.setConstructionPlanEndTime(decoration.getConstructionPlanEndTime() != null ? decoration.getConstructionPlanEndTime().getTime() : null); + constructionDataVO.setConstructionCreateTime(decoration.getConstructionCreateTime() != null ? decoration.getConstructionCreateTime().getTime() : null); constructionDataVO.setConstructionCreateUser(decoration.getConstructionCreateUser()); - if (StringUtils.isNotEmpty(decoration.getConstructionCreateUser())){ + if (StringUtils.isNotEmpty(decoration.getConstructionCreateUser())) { EnterpriseUserDO user = enterpriseUserDAO.getUserInfoById(decoration.getConstructionCreateUser()); constructionDataVO.setConstructionCreateUserName(user.getName()); } @@ -633,13 +638,13 @@ public class DecorationServiceImpl implements DecorationService { //重复提交校验 3秒内不能重复提交 String lockKey = "confirmDesign:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); - boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE*CommonConstants.ONE_SECONDS); - if (!acquired){ + boolean acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.THREE * CommonConstants.ONE_SECONDS); + if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO(); DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId()); - if (Objects.nonNull(decoration)){ + if (Objects.nonNull(decoration)) { decorationDesignInfoDO.setId(decoration.getId()); decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO); } @@ -648,9 +653,9 @@ public class DecorationServiceImpl implements DecorationService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfo.getLineId()); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfo.getShopName()); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfo.getShopName()); commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), MessageEnum.MESSAGE_36, map); @@ -662,11 +667,11 @@ public class DecorationServiceImpl implements DecorationService { public Boolean confirmComplete(Long shopId, LoginUserInfo user) { //判断施工阶段是否时施工中 施工中才能施工完成 ShopStageInfoDO shopStageInfoDO = shopStageInfoDAO.getByShopIdAndSubStage(shopId, ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); - if (shopStageInfoDO!=null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())){ + if (shopStageInfoDO != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_111.getShopSubStageStatus().equals(shopStageInfoDO.getShopSubStageStatus())) { throw new ServiceException(ErrorCodeEnum.DESIGN_NO_COMPLETE); } AcceptanceInfoDO acceptance = acceptanceInfoDAO.selectByShopId(shopId); - if(Objects.isNull(acceptance)) { + if (Objects.isNull(acceptance)) { AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); acceptanceInfoDO.setShopId(shopId); acceptanceInfoDO.setCreateTime(new Date()); @@ -677,7 +682,7 @@ public class DecorationServiceImpl implements DecorationService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId()); Map templateParam = new HashMap<>(); templateParam.put("shopName", shopInfo.getShopName()); - commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.CONSTRUCTION_STAGE,templateParam); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.CONSTRUCTION_STAGE, templateParam); return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index ea7628441..c574bcbc3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -129,13 +129,13 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); Set franchiseContractUser = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, shopInfoDO.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); franchiseContractUser.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); franchiseContractUser.addAll(regionUserIds); } HashMap map = new HashMap<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index d50666081..4514b1d9d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -163,17 +163,16 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten SetpublishFranchiseFeeUsers = new HashSet<>(); for (Long regionId : regionIds){ List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, regionId); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()){ + if (!joinUser.isEmpty()){ + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, regionId); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()){ - publishFranchiseFeeUsers.addAll(regionUserIds); - } + if (!regionUser.isEmpty()){ + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); + publishFranchiseFeeUsers.addAll(regionUserIds); + } } - HashMap map = new HashMap<>(); map.put("partnerUsername", lineInfo.getUsername()); map.put("partnerMobile", lineInfo.getMobile()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 0a3e9f6af..ab4e61080 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -157,13 +157,13 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId()); Set auditFranchiseFeeUsers = new HashSet<>(); List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId()); - Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!branchUserIds.isEmpty()) { + if (!branchUser.isEmpty()) { + Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(branchUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(regionUserIds); } HashMap map = new HashMap<>(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 09c2e1b9e..d8763cfc8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -107,15 +107,16 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); Set planAuditUser = new HashSet<>(); List regionManagerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfoDO.getRegionId()); - Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionManagerUserIds.isEmpty()) { + if (!regionManagerUser.isEmpty()){ + Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionManagerUserIds); } List regionalManager = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGIONAL_MANAGER, shopInfoDO.getRegionId()); - Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionalManagerUserIds.isEmpty()) { + if (!regionalManager.isEmpty()){ + Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionalManagerUserIds); } + HashMap map = new HashMap<>(); map.put("partnerUsername",lineInfoDO.getUsername()); map.put("partnerMobile",lineInfoDO.getMobile()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 093fbda1b..72e962aeb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -111,7 +111,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); - List dyCustomerUserIds = dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List dyCustomerUserIds =new ArrayList<>(); + if(!dyCustomerUser.isEmpty()){ + dyCustomerUserIds.addAll(dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(dyCustomerUserIds, MessageEnum.MESSAGE_43, map); @@ -132,7 +135,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); - List ksUserIds = ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List ksUserIds =new ArrayList<>(); + if(!ksUser.isEmpty()){ + ksUserIds.addAll(ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(ksUserIds, MessageEnum.MESSAGE_47, map); @@ -153,7 +159,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); - List mtbcUserIds = mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtbcUserIds =new ArrayList<>(); + if(!mtbcUser.isEmpty()){ + mtbcUserIds.addAll(mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtbcUserIds, MessageEnum.MESSAGE_45, map); @@ -174,7 +183,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); - List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List elmUserIds =new ArrayList<>(); + if(!elmUser.isEmpty()){ + elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(elmUserIds, MessageEnum.MESSAGE_46, map); @@ -195,7 +207,10 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); - List mtocUserIds = mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtocUserIds =new ArrayList<>(); + if(!mtocUser.isEmpty()){ + mtocUserIds.addAll(mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtocUserIds, MessageEnum.MESSAGE_44, map); @@ -402,7 +417,10 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List elmUserIds = elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List elmUserIds = new ArrayList<>(); + if(!elmUser.isEmpty()){ + elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), elmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); commonService.sendQWMessage(elmUserIds, @@ -421,7 +439,10 @@ public Integer firstAudit(PlatformBuildAuditRequest request) { doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_191, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List mtwmUserIds = mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List mtwmUserIds = new ArrayList<>(); + if (!mtwmUser.isEmpty()){ + mtwmUserIds.addAll( mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } commonService.sendQWMessage(mtwmUserIds, MessageEnum.MESSAGE_49, map); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index c9870ea3f..f7b3a0869 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -120,13 +120,13 @@ public class ShopServiceImpl implements ShopService { Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } HashMap map = new HashMap<>(); @@ -301,13 +301,13 @@ public class ShopServiceImpl implements ShopService { map.put("partnerMobile", lineInfo.getMobile()); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, request.getRegionId()); - Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!joinUserIds.isEmpty()) { + if (!joinUser.isEmpty()) { + Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, request.getRegionId()); - Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); - if (!regionUserIds.isEmpty()) { + if (!regionUser.isEmpty()) { + Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } commonService.sendQWMessage(Collections.singletonList(request.getInvestmentManagerUserId()), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 384e1efa1..e8c57010c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -181,7 +181,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu map.put("partnerMobile",lineInfoDO.getMobile()); map.put("storeName",shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId()); - List finances = userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); + List finances = new ArrayList<>(); + if (!userDOList.isEmpty()){ + finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())) ; + } commonService.sendQWMessage(finances, MessageEnum.MESSAGE_34, map); From 35444f6cb9634114ab73a74f50fc61ca368b224a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 19 Feb 2025 16:22:34 +0800 Subject: [PATCH 22/49] =?UTF-8?q?add=20=E8=BF=90=E8=90=A5=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E5=AE=A1=E6=A0=B8=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 1 + .../impl/AuditOpeningOperationPlanImpl.java | 27 ++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 57e6a91f1..22381b0b6 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -75,6 +75,7 @@ public enum MessageEnum { MESSAGE_47("您有一个门店已提交快手建店资料，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_48("您有一个门店饿了么初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_49("您有一个门店美团外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_50("您有一个门店开业运营方案审核未通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java index 747251303..2f7468e96 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java @@ -5,13 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.*; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.OpeningOperationPlanDO; -import com.cool.store.entity.ShopAuditInfoDO; -import com.cool.store.enums.AuditResultTypeEnum; -import com.cool.store.enums.AuditTypeEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.OpeningOperationPlanResultTypeEnum; +import com.cool.store.entity.*; +import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OpeningOperationPlanAuditRequest; @@ -21,6 +16,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.Objects; /** @@ -42,6 +40,12 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS private PreparationService preparationService; @Resource private ShopAuditInfoDAO shopAuditInfoDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Resource + private ShopInfoDAO shopInfoDAO; + @Resource + private CommonService commonService; @Override @Transactional(rollbackFor = Exception.class) @@ -67,7 +71,16 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; flag = Boolean.TRUE; }else { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142; + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfoDO.getUsername()); + map.put("partnerMobile",lineInfoDO.getMobile()); + map.put("storeName",shopInfo.getShopName()); + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_50, + map); } shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), shopSubStageStatusEnum, auditId); From 44861fed6618cb0130877e436c5691b9a7dd89bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Feb 2025 16:26:22 +0800 Subject: [PATCH 23/49] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/PartnerUserWechatBindDAO.java | 2 +- .../mapper/PartnerUserWechatBindMapper.java | 9 ++++++++- .../mapper/PartnerUserWechatBindMapper.xml | 16 +++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PartnerUserWechatBindDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PartnerUserWechatBindDAO.java index 1c0fefb0f..4fa7404de 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PartnerUserWechatBindDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PartnerUserWechatBindDAO.java @@ -28,7 +28,7 @@ public class PartnerUserWechatBindDAO { if (partnerUserWechatBindDO == null) { return 0; } - return partnerUserWechatBindMapper.insertSelective(partnerUserWechatBindDO); + return partnerUserWechatBindMapper.insert(partnerUserWechatBindDO); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PartnerUserWechatBindMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PartnerUserWechatBindMapper.java index 98bc27032..a94d56629 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PartnerUserWechatBindMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PartnerUserWechatBindMapper.java @@ -8,9 +8,16 @@ import tk.mybatis.mapper.common.Mapper; * @Date 2025/2/19 15:07 * @Version 1.0 */ -public interface PartnerUserWechatBindMapper extends Mapper { +public interface PartnerUserWechatBindMapper { + /** + * 新增数据 + * @param partnerUserWechatBindDO + * @return + */ + Integer insert(PartnerUserWechatBindDO partnerUserWechatBindDO); + /** * 根据partnerId与openId查询 * @param partnerId diff --git a/coolstore-partner-dao/src/main/resources/mapper/PartnerUserWechatBindMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PartnerUserWechatBindMapper.xml index da11064c6..c638c9338 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PartnerUserWechatBindMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PartnerUserWechatBindMapper.xml @@ -12,8 +12,22 @@ + + INSERT INTO xfsg_partner_user_wechat_bind ( + open_id, + bind_time, + partner_id, + create_time + ) VALUES ( + #{openId, jdbcType=VARCHAR}, + #{bindTime, jdbcType=TIMESTAMP}, + #{partnerId, jdbcType=VARCHAR}, + #{createTime, jdbcType=TIMESTAMP} + ) + + From 00ab8198ebe9750ab4b098f0a5d88bda1657b181 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 19 Feb 2025 18:11:46 +0800 Subject: [PATCH 24/49] fix bug null --- .../impl/PlatformBuildServiceImpl.java | 295 +++++++++--------- 1 file changed, 149 insertions(+), 146 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 72e962aeb..92a708fa8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -80,6 +80,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { private RegionMapper regionMapper; @Resource private CommonService commonService; + @Override public String juridicalIdCard(Long shopId) { BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId); @@ -100,9 +101,9 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { Long regionId = shopInfo.getRegionId(); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfo.getShopName()); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfo.getShopName()); //抖音 if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_18); @@ -111,8 +112,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); - List dyCustomerUserIds =new ArrayList<>(); - if(!dyCustomerUser.isEmpty()){ + List dyCustomerUserIds = new ArrayList<>(); + if (!dyCustomerUser.isEmpty()) { dyCustomerUserIds.addAll(dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(dyCustomerUserIds, @@ -135,8 +136,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); - List ksUserIds =new ArrayList<>(); - if(!ksUser.isEmpty()){ + List ksUserIds = new ArrayList<>(); + if (!ksUser.isEmpty()) { ksUserIds.addAll(ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(ksUserIds, @@ -159,8 +160,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); - List mtbcUserIds =new ArrayList<>(); - if(!mtbcUser.isEmpty()){ + List mtbcUserIds = new ArrayList<>(); + if (!mtbcUser.isEmpty()) { mtbcUserIds.addAll(mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtbcUserIds, @@ -183,8 +184,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); - List elmUserIds =new ArrayList<>(); - if(!elmUser.isEmpty()){ + List elmUserIds = new ArrayList<>(); + if (!elmUser.isEmpty()) { elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(elmUserIds, @@ -207,8 +208,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); - List mtocUserIds =new ArrayList<>(); - if(!mtocUser.isEmpty()){ + List mtocUserIds = new ArrayList<>(); + if (!mtocUser.isEmpty()) { mtocUserIds.addAll(mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtocUserIds, @@ -254,10 +255,12 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { platformBuildInfoVO.setShopName(shopInfo.getShopName()); platformBuildInfoVO.setShopCode(shopInfo.getShopCode()); platformBuildInfoVO.setRegionName(regionNameMap.get(shopInfo.getRegionId())); - platformBuildInfoVO.setProvince(pointInfoDO.getProvince()); - platformBuildInfoVO.setCity(pointInfoDO.getCity()); - platformBuildInfoVO.setDistrict(pointInfoDO.getDistrict()); - platformBuildInfoVO.setAddress(pointInfoDO.getAddress()); + if (Objects.nonNull(pointInfoDO)) { + platformBuildInfoVO.setProvince(pointInfoDO.getProvince()); + platformBuildInfoVO.setCity(pointInfoDO.getCity()); + platformBuildInfoVO.setDistrict(pointInfoDO.getDistrict()); + platformBuildInfoVO.setAddress(pointInfoDO.getAddress()); + } if (CollectionUtils.isNotEmpty(shopContractActualCompletionTime)) { ScheduleDTO scheduleDTO = shopContractActualCompletionTime.get(CommonConstants.ZERO); platformBuildInfoVO.setCompletionColumn(scheduleDTO.getCompletionColumn()); @@ -334,20 +337,20 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId()); doSomething(platformBuildResponse, trial, auditInfo); - } else{ - ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId()); - if (Objects.nonNull(auditInfo)) { - if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { - platformBuildResponse.setReason(auditInfo.getPassReason()); - } else { - platformBuildResponse.setReason(auditInfo.getRejectReason()); + } else { + ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId()); + if (Objects.nonNull(auditInfo)) { + if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + platformBuildResponse.setReason(auditInfo.getPassReason()); + } else { + platformBuildResponse.setReason(auditInfo.getRejectReason()); + } } } - } return platformBuildResponse; -} + } - private void doSomething(PlatformBuildResponse platformBuildResponse, OperationLogDO trial, ShopAuditInfoDO auditInfo ) { + private void doSomething(PlatformBuildResponse platformBuildResponse, OperationLogDO trial, ShopAuditInfoDO auditInfo) { if (Objects.nonNull(trial)) { ShopAuditInfoDO atrialAuditInfo = shopAuditInfoDAO.getAuditInfo(trial.getAuditResultId()); if (Objects.nonNull(atrialAuditInfo)) { @@ -359,144 +362,144 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } } if (Objects.nonNull(auditInfo)) { - if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { - platformBuildResponse.setNewReason(auditInfo.getPassReason()); - } else { - platformBuildResponse.setNewReason(auditInfo.getRejectReason()); - } + if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + platformBuildResponse.setNewReason(auditInfo.getPassReason()); + } else { + platformBuildResponse.setNewReason(auditInfo.getRejectReason()); + } } } @Override -@Transactional(rollbackFor = Exception.class) -public Integer firstAudit(PlatformBuildAuditRequest request) { - Integer type = request.getType(); - Long shopId = request.getShopId(); - PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + @Transactional(rollbackFor = Exception.class) + public Integer firstAudit(PlatformBuildAuditRequest request) { + Integer type = request.getType(); + Long shopId = request.getShopId(); + PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); Long regionId = shopInfo.getRegionId(); HashMap map = new HashMap<>(); - map.put("partnerUsername",lineInfoDO.getUsername()); - map.put("partnerMobile",lineInfoDO.getMobile()); - map.put("storeName",shopInfo.getShopName()); - if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_18); - if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.DOU_YIN); - return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_183, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_182); - } - - if (type.equals(PlatformBuildEnum.KUAI_SHOU.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_22); - if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.KUAI_SHOU); - return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_223, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_222); - - } - if (type.equals(PlatformBuildEnum.MEI_TUAN_TUAN_GOU.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_20); - if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_TUAN_GOU); - return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_203, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_202); - - } - if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_21); - if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.E_LE_ME); - doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); - if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { - List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List elmUserIds = new ArrayList<>(); - if(!elmUser.isEmpty()){ - elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + map.put("partnerUsername", lineInfoDO.getUsername()); + map.put("partnerMobile", lineInfoDO.getMobile()); + map.put("storeName", shopInfo.getShopName()); + if (type.equals(PlatformBuildEnum.DOU_YIN.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_18); + if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } - operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), - elmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); - commonService.sendQWMessage(elmUserIds, - MessageEnum.MESSAGE_48, - map); + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.DOU_YIN); + return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_181, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_183, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_182); } - return CommonConstants.ONE; - } - if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_19); - if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_WAI_MAI); - doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_191, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); - if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { - List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); - List mtwmUserIds = new ArrayList<>(); - if (!mtwmUser.isEmpty()){ - mtwmUserIds.addAll( mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + if (type.equals(PlatformBuildEnum.KUAI_SHOU.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_22); + if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } - commonService.sendQWMessage(mtwmUserIds, - MessageEnum.MESSAGE_49, - map); - operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_193, request.getOperateUserId(), - mtwmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.KUAI_SHOU); + return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_223, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_222); + } - return CommonConstants.ONE; - } - return 0; -} + if (type.equals(PlatformBuildEnum.MEI_TUAN_TUAN_GOU.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_20); + if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_TUAN_GOU); + return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_203, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_202); -@Override -public Integer secondAudit(PlatformBuildAuditRequest request) { - Integer type = request.getType(); - Long shopId = request.getShopId(); - PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type); - if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_21); - if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.E_LE_ME); - return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_215, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); - } - - if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) { - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_19); - if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_21); + if (!shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.E_LE_ME); + doThing(platformBuildDO, request, shopAuditInfoDO, shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_211, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); + if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); + List elmUserIds = new ArrayList<>(); + if (!elmUser.isEmpty()) { + elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } + operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), + elmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + commonService.sendQWMessage(elmUserIds, + MessageEnum.MESSAGE_48, + map); + } + return CommonConstants.ONE; } - ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_WAI_MAI); - return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_195, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); + + if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_19); + if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_WAI_MAI); + doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_191, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); + if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); + List mtwmUserIds = new ArrayList<>(); + if (!mtwmUser.isEmpty()) { + mtwmUserIds.addAll(mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); + } + commonService.sendQWMessage(mtwmUserIds, + MessageEnum.MESSAGE_49, + map); + operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_193, request.getOperateUserId(), + mtwmUser, OperationTypeEnum.OPERATION_TYPE_1, null, OperationStatusEnum.NOT_PROCESSED); + } + return CommonConstants.ONE; + } + return 0; } - return 0; -} -private Integer doThing(PlatformBuildDO platformBuildDO, PlatformBuildAuditRequest request, ShopAuditInfoDO shopAuditInfoDO, Long shopId, ShopSubStageStatusEnum nowStatus, ShopSubStageStatusEnum passStatus, ShopSubStageStatusEnum rejectStatus) { - Long auditId = shopAuditInfoDAO.addAuditInfo(shopAuditInfoDO); - if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { - shopStageInfoDAO.updateShopStageInfo(shopId, passStatus); - } else { - shopStageInfoDAO.updateShopStageInfo(shopId, rejectStatus); + @Override + public Integer secondAudit(PlatformBuildAuditRequest request) { + Integer type = request.getType(); + Long shopId = request.getShopId(); + PlatformBuildDO platformBuildDO = platformBuildDAO.selectOneByShopId(shopId, type); + if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_21); + if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.E_LE_ME); + return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_213, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_215, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_214); + } + + if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_19); + if (!shopSubStageInfo.getShopSubStageStatus().equals(SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + ShopAuditInfoDO shopAuditInfoDO = PlatformBuildAuditRequest.convert(request, AuditTypeEnum.MEI_TUAN_WAI_MAI); + return doThing(platformBuildDO, request, shopAuditInfoDO, shopId, SHOP_SUB_STAGE_STATUS_193, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_195, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_194); + } + return 0; + } + + private Integer doThing(PlatformBuildDO platformBuildDO, PlatformBuildAuditRequest request, ShopAuditInfoDO shopAuditInfoDO, Long shopId, ShopSubStageStatusEnum nowStatus, ShopSubStageStatusEnum passStatus, ShopSubStageStatusEnum rejectStatus) { + Long auditId = shopAuditInfoDAO.addAuditInfo(shopAuditInfoDO); + if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { + shopStageInfoDAO.updateShopStageInfo(shopId, passStatus); + } else { + shopStageInfoDAO.updateShopStageInfo(shopId, rejectStatus); + } + List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, nowStatus, OperationTypeEnum.OPERATION_TYPE_1.getCode()); + operationLogService.batchUpdateProcessed(operationLogs, auditId, request.getOperateUserId(), request.getReason()); + platformBuildDO.setAuditId(auditId); + platformBuildDO.setAccount(request.getAccount()); + platformBuildDO.setPassword(request.getPassword()); + platformBuildDO.setUpdateTime(new Date()); + platformBuildDO.setUpdateUser(request.getOperateUserId()); + platformBuildDO.setPoi(request.getPoi()); + platformBuildDO.setStoreId(request.getStoreId()); + return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuildDO); } - List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, nowStatus, OperationTypeEnum.OPERATION_TYPE_1.getCode()); - operationLogService.batchUpdateProcessed(operationLogs, auditId, request.getOperateUserId(), request.getReason()); - platformBuildDO.setAuditId(auditId); - platformBuildDO.setAccount(request.getAccount()); - platformBuildDO.setPassword(request.getPassword()); - platformBuildDO.setUpdateTime(new Date()); - platformBuildDO.setUpdateUser(request.getOperateUserId()); - platformBuildDO.setPoi(request.getPoi()); - platformBuildDO.setStoreId(request.getStoreId()); - return platformBuildDAO.updateByShopIdAndTypeSelective(platformBuildDO); -} } From 9777d8ecf5f7b1c25091fc03718f8e89ec500ad3 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 20 Feb 2025 10:25:01 +0800 Subject: [PATCH 25/49] =?UTF-8?q?add=20=E9=93=BA=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E5=9D=80=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 3 +- .../store/service/impl/PointServiceImpl.java | 29 ++++++++++++++----- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 22381b0b6..c7c545e0c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -34,7 +34,7 @@ public enum MessageEnum { MESSAGE_10_1("您的线索已预约二次面审，请关注", "##### 加盟商姓名：${partnerUsername}\n面审官：${interviewUsername}\n##### 预约时间：${appointmentTime}\n"), MESSAGE_11("您的一个铺位已审核通过，请查收", "##### 铺位名称：${pointName}\n##### 铺位地址：${pointAddress}\n"), MESSAGE_12("您的一个铺位审核未通过，请查收", "##### 铺位名称：${pointName}\n##### 铺位地址：${pointAddress}\n##### 未通过原因：${reason}\n"), - MESSAGE_13("您有一个铺位需要审核，请查收", "##### 铺位名称：${pointName}\n##### 铺位地址：${pointAddress}\n"), + MESSAGE_13("您有一个铺位需要审核，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}"), MESSAGE_14("已为您分配一位加盟商，待推送铺位，请查收", "加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", " 加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), MESSAGE_16("您有一家门店待提交系统建店申请，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"), @@ -76,6 +76,7 @@ public enum MessageEnum { MESSAGE_48("您有一个门店饿了么初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_49("您有一个门店美团外卖初审已通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), MESSAGE_50("您有一个门店开业运营方案审核未通过，请查收","门店名称：${storeName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), + MESSAGE_51("您有一个加盟商提交了铺位，请查收","铺位名称：${pointName}\n加盟商姓名：${partnerUsername}\n加盟商手机号码：${partnerMobile}\n"), ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 5b9275ae2..04b613c5b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -344,11 +344,10 @@ public class PointServiceImpl implements PointService { //审批通过的情况下 生成下一个节点的待办数据 pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord)); List sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); - Map messageMap = new HashMap<>(); - messageMap.put("pointId", String.valueOf(pointInfo.getId())); - messageMap.put("pointName", pointInfo.getPointName()); - messageMap.put("pointAddress", pointInfo.getAddress()); - commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, messageMap); + HashMap map = new HashMap<>(); + map.put("pointName",pointInfo.getPointName()) ; + map.put("pointAddress",pointInfo.getAddress()) ; + commonService.sendQWMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, map); }else{ PointInfoDO updatePoint = new PointInfoDO(); updatePoint.setId(pointInfo.getId()); @@ -362,7 +361,7 @@ public class PointServiceImpl implements PointService { messageMap.put("pointId", String.valueOf(pointInfo.getId())); messageMap.put("pointName", pointInfo.getPointName()); messageMap.put("pointAddress", pointInfo.getAddress()); - commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, messageMap); + commonService.sendQWMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_11, messageMap); result = pointInfoDAO.updatePointInfo(updatePoint); } return result; @@ -387,7 +386,7 @@ public class PointServiceImpl implements PointService { messageMap.put("pointName", pointInfo.getPointName()); messageMap.put("pointAddress", pointInfo.getAddress()); messageMap.put("reason", reason); - commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, messageMap); + commonService.sendQWMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_12, messageMap); return pointInfoDAO.updatePointInfo(pointInfoUpdate); } @@ -795,6 +794,15 @@ public class PointServiceImpl implements PointService { } updateStatusList.add(selectStatus); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, updateStatusList); + if (selectStatus.equals( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11)){ + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); + HashMap map = new HashMap<>(); + map.put("pointName",pointInfo.getPointName()) ; + map.put("pointAddress",pointInfo.getAddress()); + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_13, + map); + } return pointRecommendDAO.updateStatusByPointIdAndLineId(pointId, shopId); } catch (ServiceException e) { throw e; @@ -853,6 +861,13 @@ public class PointServiceImpl implements PointService { updatePoint.setId(pointId); updatePoint.setShopId(shopInfo.getId()); pointInfoDAO.updatePointInfo(updatePoint); + HashMap map = new HashMap<>(); + map.put("partnerUsername",lineInfo.getUsername()); + map.put("partnerMobile",lineInfo.getMobile()); + map.put("pointName",pointInfo.getPointName()) ; + commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), + MessageEnum.MESSAGE_51, + map); return pointId; } From 6afefe46437409f2f278c60484d97104d0a9c63f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 20 Feb 2025 10:30:14 +0800 Subject: [PATCH 26/49] =?UTF-8?q?add=20=E9=93=BA=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E5=9D=80=E7=9B=B8=E5=85=B3=E7=9A=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/MessageEnum.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index c7c545e0c..869901930 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -32,8 +32,8 @@ public enum MessageEnum { MESSAGE_9("您有一位加盟商已放弃门店体验，请查收", "##### 加盟商姓名：${partnerUsername}\n##### 手机号码：${partnerMobile}\n"), MESSAGE_10("您收到一份二次面审预约，请查收", "##### 加盟商姓名：${partnerUsername}\n##### 预约时间：${appointmentTime}\n"), MESSAGE_10_1("您的线索已预约二次面审，请关注", "##### 加盟商姓名：${partnerUsername}\n面审官：${interviewUsername}\n##### 预约时间：${appointmentTime}\n"), - MESSAGE_11("您的一个铺位已审核通过，请查收", "##### 铺位名称：${pointName}\n##### 铺位地址：${pointAddress}\n"), - MESSAGE_12("您的一个铺位审核未通过，请查收", "##### 铺位名称：${pointName}\n##### 铺位地址：${pointAddress}\n##### 未通过原因：${reason}\n"), + MESSAGE_11("您的一个铺位已审核通过，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}\n"), + MESSAGE_12("您的一个铺位审核未通过，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}\n未通过原因：${reason}\n"), MESSAGE_13("您有一个铺位需要审核，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}"), MESSAGE_14("已为您分配一位加盟商，待推送铺位，请查收", "加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", " 加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), From 8a43300599cfefccd9a5032a7c238ae3037023ee Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 20 Feb 2025 10:38:45 +0800 Subject: [PATCH 27/49] fix --- .../src/main/java/com/cool/store/enums/MessageEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 869901930..6f173ec07 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -36,7 +36,7 @@ public enum MessageEnum { MESSAGE_12("您的一个铺位审核未通过，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}\n未通过原因：${reason}\n"), MESSAGE_13("您有一个铺位需要审核，请查收", "铺位名称：${pointName}\n铺位地址：${pointAddress}"), MESSAGE_14("已为您分配一位加盟商，待推送铺位，请查收", "加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), - MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", " 加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), + MESSAGE_15("您有一份加盟商上传的租赁合同待审核，请查收", "加盟商姓名：${partnerUsername}\n手机号码：${partnerMobile}\n"), MESSAGE_16("您有一家门店待提交系统建店申请，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"), MESSAGE_16_1("您有一家门店待提交系统建店申请，请查收", "##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"), MESSAGE_17("您收到一份证照信息审核申请，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerUsername}\n##### 加盟商手机号码：${partnerMobile}\n"), From 7e14e1569cdcd058514527d9cf2ae22aab82f266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 20 Feb 2025 16:22:59 +0800 Subject: [PATCH 28/49] =?UTF-8?q?fix:=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/controller/webc/MiniProgramAppController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java index 2bcb6fb7f..fa6c0f6f4 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniProgramAppController.java @@ -40,6 +40,12 @@ public class MiniProgramAppController { return ResponseResult.success(userInfoVO); } + @ApiOperation("小程序用户注销(下线)") + @GetMapping("/cancellation") + public ResponseResult cancellation(@RequestParam(value = "openId",required = true)String openId) { + return ResponseResult.success(wechatMiniAppService.cancellation(openId)); + } + @ApiOperation("获取手机号") @GetMapping("/getUserPhoneNumber") public ResponseResult getUserPhoneNumber(@RequestParam(value = "mobileCode",required = true)String mobileCode) { From d10a04180b9af18b94887620d2b7158b0abd1c89 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 21 Feb 2025 10:25:35 +0800 Subject: [PATCH 29/49] =?UTF-8?q?fix=20=E7=9F=AD=E4=BF=A1=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=80=9A=E7=9F=A5=E6=89=BE=E4=B8=8D=E5=88=B0=E4=BA=BA?= =?UTF-8?q?=20null=20=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildInformationServiceImpl.java | 8 ++++---- .../store/service/impl/DecorationServiceImpl.java | 2 +- .../service/impl/IntentAgreementServiceImpl.java | 4 ++-- .../store/service/impl/LinePayServiceImpl.java | 4 ++-- .../service/impl/OpeningOperationPlanImpl.java | 4 ++-- .../service/impl/PlatformBuildServiceImpl.java | 14 +++++++------- .../cool/store/service/impl/ShopServiceImpl.java | 8 ++++---- .../service/impl/SignFranchiseServiceImpl.java | 2 +- 8 files changed, 23 insertions(+), 23 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 f13a950dc..fa5ff27e8 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 @@ -114,7 +114,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map.put("storeName",shopInfoDO.getShopName()); List itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId()); List itUsers = new ArrayList<>(); - if (!itList.isEmpty()){ + if (Objects.nonNull(itList)){ itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(itUsers, @@ -122,7 +122,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List posList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.HUO_MA_EMPLOYEE, shopInfoDO.getRegionId()); List posUsers = new ArrayList<>(); - if (!posList.isEmpty()){ + if (Objects.nonNull(posList)){ posUsers.addAll( posList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(posUsers, @@ -130,7 +130,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List xfList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.XIN_FA_SYS_CUSTOMER, shopInfoDO.getRegionId()); List xfUsers = new ArrayList<>(); - if(!xfList.isEmpty()){ + if(Objects.nonNull(xfList)){ xfUsers.addAll(xfList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(xfUsers, @@ -138,7 +138,7 @@ public class BuildInformationServiceImpl implements BuildInformationService{ map); List zxtList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.TENT_PASS_CUSTOMER, shopInfoDO.getRegionId()); List zxtUsers = new ArrayList<>(); - if(!zxtList.isEmpty()){ + if(Objects.nonNull(zxtList)){ zxtUsers.addAll(zxtList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(zxtUsers, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 1f7e29f30..f76cd6c61 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -371,7 +371,7 @@ public class DecorationServiceImpl implements DecorationService { map.put("storeName", shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfoDO.getRegionId()); List userIds = new ArrayList<>(); - if (!userDOList.isEmpty()) { + if (Objects.nonNull(userDOList)) { userIds.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(userIds, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 4514b1d9d..30022e612 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -163,12 +163,12 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten SetpublishFranchiseFeeUsers = new HashSet<>(); for (Long regionId : regionIds){ List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, regionId); - if (!joinUser.isEmpty()){ + if (Objects.nonNull(joinUser)){ Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, regionId); - if (!regionUser.isEmpty()){ + if (Objects.nonNull(regionUser)){ Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index ab4e61080..eaba2246b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -157,12 +157,12 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(franchiseFeeDO.getShopId()); Set auditFranchiseFeeUsers = new HashSet<>(); List branchUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.BRANCH_OFFICE, shopInfoDO.getRegionId()); - if (!branchUser.isEmpty()) { + if (Objects.nonNull(branchUser)) { Set branchUserIds = branchUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(branchUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, shopInfoDO.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); auditFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index d8763cfc8..1a6525540 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -107,12 +107,12 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); Set planAuditUser = new HashSet<>(); List regionManagerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfoDO.getRegionId()); - if (!regionManagerUser.isEmpty()){ + if (Objects.nonNull(regionManagerUser)){ Set regionManagerUserIds = regionManagerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionManagerUserIds); } List regionalManager = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGIONAL_MANAGER, shopInfoDO.getRegionId()); - if (!regionalManager.isEmpty()){ + if (Objects.nonNull(regionalManager)){ Set regionalManagerUserIds = regionalManager.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); planAuditUser.addAll(regionalManagerUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 92a708fa8..3b67bb090 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -113,7 +113,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List dyCustomerUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.DOU_YIN_CUSTOMER, regionId); List dyCustomerUserIds = new ArrayList<>(); - if (!dyCustomerUser.isEmpty()) { + if (Objects.nonNull(dyCustomerUser)) { dyCustomerUserIds.addAll(dyCustomerUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(dyCustomerUserIds, @@ -137,7 +137,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List ksUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.KUAI_SHOU_CUSTOMER, regionId); List ksUserIds = new ArrayList<>(); - if (!ksUser.isEmpty()) { + if (Objects.nonNull(ksUser)) { ksUserIds.addAll(ksUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(ksUserIds, @@ -161,7 +161,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List mtbcUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, regionId); List mtbcUserIds = new ArrayList<>(); - if (!mtbcUser.isEmpty()) { + if (Objects.nonNull(mtbcUser)) { mtbcUserIds.addAll(mtbcUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtbcUserIds, @@ -185,7 +185,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, regionId); List elmUserIds = new ArrayList<>(); - if (!elmUser.isEmpty()) { + if (Objects.nonNull(elmUser)) { elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(elmUserIds, @@ -209,7 +209,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { } List mtocUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, regionId); List mtocUserIds = new ArrayList<>(); - if (!mtocUser.isEmpty()) { + if (Objects.nonNull(mtocUser)) { mtocUserIds.addAll(mtocUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtocUserIds, @@ -421,7 +421,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List elmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, regionId); List elmUserIds = new ArrayList<>(); - if (!elmUser.isEmpty()) { + if (Objects.nonNull(elmUser)) { elmUserIds.addAll(elmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } operationLogService.addOperationLog(shopId, SHOP_SUB_STAGE_STATUS_213, request.getOperateUserId(), @@ -443,7 +443,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { if (request.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) { List mtwmUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, regionId); List mtwmUserIds = new ArrayList<>(); - if (!mtwmUser.isEmpty()) { + if (Objects.nonNull(mtwmUser)) { mtwmUserIds.addAll(mtwmUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())); } commonService.sendQWMessage(mtwmUserIds, diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index f7b3a0869..8b9017a51 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -120,12 +120,12 @@ public class ShopServiceImpl implements ShopService { Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, lineInfo.getRegionId()); - if (!joinUser.isEmpty()) { + if (Objects.nonNull(joinUser)) { Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, lineInfo.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } @@ -301,12 +301,12 @@ public class ShopServiceImpl implements ShopService { map.put("partnerMobile", lineInfo.getMobile()); Set publishFranchiseFeeUsers = new HashSet<>(); List joinUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.JOIN_OFFICE, request.getRegionId()); - if (!joinUser.isEmpty()) { + if (Objects.nonNull(joinUser)) { Set joinUserIds = joinUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(joinUserIds); } List regionUser = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_OFFICE, request.getRegionId()); - if (!regionUser.isEmpty()) { + if (Objects.nonNull(regionUser)) { Set regionUserIds = regionUser.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toSet()); publishFranchiseFeeUsers.addAll(regionUserIds); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index e8c57010c..1a3a3c2ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -182,7 +182,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu map.put("storeName",shopInfoDO.getShopName()); List userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.FINANCE, shopInfoDO.getRegionId()); List finances = new ArrayList<>(); - if (!userDOList.isEmpty()){ + if (Objects.nonNull(userDOList)){ finances.addAll(userDOList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList())) ; } commonService.sendQWMessage(finances, From ae8183423b195840008b38fb041fab08a24552bc Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 21 Feb 2025 14:42:57 +0800 Subject: [PATCH 30/49] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=97=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/FranchiseFeeMapper.xml | 2 + .../com/cool/store/dto/FranchiseFeeDTO.java | 18 ++++-- .../impl/ExportRealizeServiceImpl.java | 60 +++++++++++++++++-- 3 files changed, 69 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index e7f4d8cef..81e26ec33 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -17,7 +17,9 @@