From 3ef3665909f73f362477da911f5a442b723caec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 26 Jun 2024 17:56:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ShopInfoMapper.xml | 4 +- .../store/service/impl/CommonService.java | 75 ++++++++++--------- .../service/impl/DecorationServiceImpl.java | 7 ++ .../impl/OpeningOperationPlanImpl.java | 4 +- .../store/service/impl/ShopServiceImpl.java | 9 ++- 5 files changed, 56 insertions(+), 43 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 1156afa5f..6b5070e6e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -26,9 +26,9 @@ - insert into xfsg_shop_info(region_id, line_id, partner_id, shop_name, shop_code) values + insert into xfsg_shop_info(region_id, line_id, partner_id, shop_name, shop_num,supervisor_user_id,) values - (#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.shopCode}) + (#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.shopNum},#{shop.supervisorUserId}) 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 ea9aef6f9..b08a6e43d 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 @@ -132,43 +132,44 @@ public class CommonService { public void sendSms(List poneNumbers, SMSMsgEnum templateCode, Map templateParamMap){ log.info("templateCode:{}, request:{}, poneNumbers:{}", templateCode.getTitle(), JSONObject.toJSONString(templateParamMap), JSONObject.toJSONString(poneNumbers)); - if(CollectionUtils.isEmpty(poneNumbers)){ - return; - } - List signNameList = new ArrayList<>(); - signNameList.add("酷店掌"); - AsyncClient client = null; - try { - StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder() - .accessKeyId(smsAccessKeyId) - .accessKeySecret(smsAccessKeySecret) - .build()); - client = AsyncClient.builder() - .region("cn-hangzhou") - .credentialsProvider(provider) - .overrideConfiguration( - ClientOverrideConfiguration.create() - .setEndpointOverride("dysmsapi.aliyuncs.com") - ) - .build(); - SendBatchSmsRequest sendBatchSmsRequest = SendBatchSmsRequest.builder() - .phoneNumberJson(JSONObject.toJSONString(poneNumbers)) - .signNameJson(JSONObject.toJSONString(signNameList)) - .templateCode(templateCode.getTemplateCode()) - .templateParamJson("[" + JSONObject.toJSONString(templateParamMap) + "]") - .build(); - CompletableFuture response = client.sendBatchSms(sendBatchSmsRequest); - SendBatchSmsResponse resp = response.get(); - log.info("短信发送templateCode:{}, response:{}", templateCode.getTemplateCode(), JSONObject.toJSONString(resp)); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (ExecutionException e) { - e.printStackTrace(); - } finally { - if(Objects.isNull(client)){ - client.close(); - } - } +// if(CollectionUtils.isEmpty(poneNumbers)){ +// return; +// } +// List signNameList = new ArrayList<>(); +// signNameList.add("酷店掌"); +// AsyncClient client = null; +// try { +// StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder() +// .accessKeyId(smsAccessKeyId) +// .accessKeySecret(smsAccessKeySecret) +// .build()); +// client = AsyncClient.builder() +// .region("cn-hangzhou") +// .credentialsProvider(provider) +// .overrideConfiguration( +// ClientOverrideConfiguration.create() +// .setEndpointOverride("dysmsapi.aliyuncs.com") +// ) +// .build(); +// SendBatchSmsRequest sendBatchSmsRequest = SendBatchSmsRequest.builder() +// .phoneNumberJson(JSONObject.toJSONString(poneNumbers)) +// .signNameJson(JSONObject.toJSONString(signNameList)) +// .templateCode(templateCode.getTemplateCode()) +// .templateParamJson("[" + JSONObject.toJSONString(templateParamMap) + "]") +// .build(); +// CompletableFuture response = client.sendBatchSms(sendBatchSmsRequest); +// SendBatchSmsResponse resp = response.get(); +// log.info("短信发送templateCode:{}, response:{}", templateCode.getTemplateCode(), JSONObject.toJSONString(resp)); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } catch (ExecutionException e) { +// e.printStackTrace(); +// } finally { +// if(Objects.isNull(client)){ +// client.close(); +// } +// } + log.info("短信发送成功（已过滤）"); } public static String splitMethod(String kdzBusinessId) { 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 99cb2fc81..79feb983d 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 @@ -594,6 +594,13 @@ public class DecorationServiceImpl implements DecorationService { throw new ServiceException(ErrorCodeEnum.DESIGN_NO_COMPLETE); } shopStageInfoDAO.batchUpdateShopStageStatus(shopId, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120)); + AcceptanceInfoDO acceptance = acceptanceInfoDAO.selectByShopId(shopId); + AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); + acceptanceInfoDO.setShopId(shopId); + acceptanceInfoDO.setCreateTime(new Date()); + if(Objects.isNull(acceptance)) { + acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO); + } return Boolean.TRUE; } 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 9610cdc47..965a18980 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 @@ -122,13 +122,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { }else { collect = allUserByRoleEnumAndRegionId.stream() .filter(user -> user.getName() != null) - .map(user -> user.getName() + "_" + user.getJobnumber()) + .map(user -> user.getName()) .collect(Collectors.toList()); } if (Objects.nonNull(openingOperationPlanDO)) { openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); - openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); 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 582a815e1..7b0a2a7d7 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 @@ -5,11 +5,13 @@ import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; import com.cool.store.request.AddShopRequest; import com.cool.store.request.DeleteShopRequest; import com.cool.store.service.ShopService; +import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.NumberConverter; import com.cool.store.utils.RandomEightCharCodeUtils; import com.cool.store.vo.shop.MiniShopPageVO; @@ -45,6 +47,8 @@ public class ShopServiceImpl implements ShopService { private PointRecommendDAO pointRecommendDAO; @Resource private CommonService commonService; + @Resource + UserAuthMappingService userAuthMappingService; @Override @Transactional(rollbackFor = Exception.class) @@ -64,9 +68,10 @@ public class ShopServiceImpl implements ShopService { shopInfo.setRegionId(lineInfo.getRegionId()); shopInfo.setLineId(lineInfo.getId()); shopInfo.setPartnerId(lineInfo.getPartnerId()); - shopInfo.setSupervisorUserId(lineInfo.getInvestmentManager()); //初始化 - shopInfo.setShopCode(RandomEightCharCodeUtils.getCode()); + shopInfo.setStoreNum(RandomEightCharCodeUtils.getCode()); + EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfo.getRegionId()); + shopInfo.setSupervisorUserId((Objects.isNull(supervisor)||supervisor.getUserId()==null)?lineInfo.getInvestmentManager():supervisor.getUserId()); shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1)); addShopList.add(shopInfo); }