suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉短信

Browse Source
This commit is contained in:
苏竹红
2024-06-26 17:56:22 +08:00
parent 96cb604198
commit 3ef3665909
5 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -26,9 +26,9 @@
</sql> </sql>
<insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id"> <insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
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
<foreach collection="shopInfoList" item="shop" separator=","> <foreach collection="shopInfoList" item="shop" separator=",">
(#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.shopCode}) (#{shop.regionId}, #{shop.lineId}, #{shop.partnerId}, #{shop.shopName}, #{shop.shopNum},#{shop.supervisorUserId})
</foreach> </foreach>
</insert> </insert>

75
coolstore-partner-service/src/main/java/com/cool/store/service/impl/CommonService.java
View File

@@ -132,43 +132,44 @@ public class CommonService {
public void sendSms(List<String> poneNumbers, SMSMsgEnum templateCode, Map<String, String> templateParamMap){ public void sendSms(List<String> poneNumbers, SMSMsgEnum templateCode, Map<String, String> templateParamMap){
log.info("templateCode:{}, request:{}, poneNumbers:{}", templateCode.getTitle(), JSONObject.toJSONString(templateParamMap), JSONObject.toJSONString(poneNumbers)); log.info("templateCode:{}, request:{}, poneNumbers:{}", templateCode.getTitle(), JSONObject.toJSONString(templateParamMap), JSONObject.toJSONString(poneNumbers));
if(CollectionUtils.isEmpty(poneNumbers)){ // if(CollectionUtils.isEmpty(poneNumbers)){
return; // return;
} // }
List<String> signNameList = new ArrayList<>(); // List<String> signNameList = new ArrayList<>();
signNameList.add("酷店掌"); // signNameList.add("酷店掌");
AsyncClient client = null; // AsyncClient client = null;
try { // try {
StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder() // StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
.accessKeyId(smsAccessKeyId) // .accessKeyId(smsAccessKeyId)
.accessKeySecret(smsAccessKeySecret) // .accessKeySecret(smsAccessKeySecret)
.build()); // .build());
client = AsyncClient.builder() // client = AsyncClient.builder()
.region("cn-hangzhou") // .region("cn-hangzhou")
.credentialsProvider(provider) // .credentialsProvider(provider)
.overrideConfiguration( // .overrideConfiguration(
ClientOverrideConfiguration.create() // ClientOverrideConfiguration.create()
.setEndpointOverride("dysmsapi.aliyuncs.com") // .setEndpointOverride("dysmsapi.aliyuncs.com")
) // )
.build(); // .build();
SendBatchSmsRequest sendBatchSmsRequest = SendBatchSmsRequest.builder() // SendBatchSmsRequest sendBatchSmsRequest = SendBatchSmsRequest.builder()
.phoneNumberJson(JSONObject.toJSONString(poneNumbers)) // .phoneNumberJson(JSONObject.toJSONString(poneNumbers))
.signNameJson(JSONObject.toJSONString(signNameList)) // .signNameJson(JSONObject.toJSONString(signNameList))
.templateCode(templateCode.getTemplateCode()) // .templateCode(templateCode.getTemplateCode())
.templateParamJson("[" + JSONObject.toJSONString(templateParamMap) + "]") // .templateParamJson("[" + JSONObject.toJSONString(templateParamMap) + "]")
.build(); // .build();
CompletableFuture<SendBatchSmsResponse> response = client.sendBatchSms(sendBatchSmsRequest); // CompletableFuture<SendBatchSmsResponse> response = client.sendBatchSms(sendBatchSmsRequest);
SendBatchSmsResponse resp = response.get(); // SendBatchSmsResponse resp = response.get();
log.info("短信发送templateCode:{}, response:{}", templateCode.getTemplateCode(), JSONObject.toJSONString(resp)); // log.info("短信发送templateCode:{}, response:{}", templateCode.getTemplateCode(), JSONObject.toJSONString(resp));
} catch (InterruptedException e) { // } catch (InterruptedException e) {
e.printStackTrace(); // e.printStackTrace();
} catch (ExecutionException e) { // } catch (ExecutionException e) {
e.printStackTrace(); // e.printStackTrace();
} finally { // } finally {
if(Objects.isNull(client)){ // if(Objects.isNull(client)){
client.close(); // client.close();
} // }
} // }
log.info("短信发送成功（已过滤）");
} }
public static String splitMethod(String kdzBusinessId) { public static String splitMethod(String kdzBusinessId) {

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -594,6 +594,13 @@ public class DecorationServiceImpl implements DecorationService {
throw new ServiceException(ErrorCodeEnum.DESIGN_NO_COMPLETE); throw new ServiceException(ErrorCodeEnum.DESIGN_NO_COMPLETE);
} }
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120)); 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; return Boolean.TRUE;
} }

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -122,13 +122,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
}else { }else {
collect = allUserByRoleEnumAndRegionId.stream() collect = allUserByRoleEnumAndRegionId.stream()
.filter(user -> user.getName() != null) .filter(user -> user.getName() != null)
.map(user -> user.getName() + "_" + user.getJobnumber()) .map(user -> user.getName())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
if (Objects.nonNull(openingOperationPlanDO)) { if (Objects.nonNull(openingOperationPlanDO)) {
openingOperationPlanVO = new OpeningOperationPlanVO(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(","))); openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(",")));
String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds();
List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList());

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -5,11 +5,13 @@ import com.cool.store.entity.*;
import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.MessageEnum; import com.cool.store.enums.MessageEnum;
import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.SMSMsgEnum;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.enums.point.*; import com.cool.store.enums.point.*;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.request.AddShopRequest; import com.cool.store.request.AddShopRequest;
import com.cool.store.request.DeleteShopRequest; import com.cool.store.request.DeleteShopRequest;
import com.cool.store.service.ShopService; import com.cool.store.service.ShopService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.NumberConverter; import com.cool.store.utils.NumberConverter;
import com.cool.store.utils.RandomEightCharCodeUtils; import com.cool.store.utils.RandomEightCharCodeUtils;
import com.cool.store.vo.shop.MiniShopPageVO; import com.cool.store.vo.shop.MiniShopPageVO;
@@ -45,6 +47,8 @@ public class ShopServiceImpl implements ShopService {
private PointRecommendDAO pointRecommendDAO; private PointRecommendDAO pointRecommendDAO;
@Resource @Resource
private CommonService commonService; private CommonService commonService;
@Resource
UserAuthMappingService userAuthMappingService;
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@@ -64,9 +68,10 @@ public class ShopServiceImpl implements ShopService {
shopInfo.setRegionId(lineInfo.getRegionId()); shopInfo.setRegionId(lineInfo.getRegionId());
shopInfo.setLineId(lineInfo.getId()); shopInfo.setLineId(lineInfo.getId());
shopInfo.setPartnerId(lineInfo.getPartnerId()); 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)); shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1));
addShopList.add(shopInfo); addShopList.add(shopInfo);
} }