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

bug修改

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-28 17:55:04 +08:00
parent 272dca701f
commit 71a68b3a59
9 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
View File

@@ -10,6 +10,13 @@ public enum MessageEnum {
MESSAGE_1("您有一份加盟意向申请，请查收。", "##### 加盟商姓名：{0}\n##### 意向加盟区域：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_2("您有一份邀约面谈预约，请查收。", "##### 加盟商姓名：{0}\n##### 意向加盟区域：{1}\n##### 预约面谈时间：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_3("您收到一份邀约面谈预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_4("您收到一份一次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_5("您收到一份二次面审预约，请查收", "##### 加盟商姓名：{0}\n##### 预约时间：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_6("您有线索未通过面审，请查收", "##### 加盟商姓名：{0}\n##### 面审时间：{1}\n##### 面审官：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_7("您的铺位已审核通过，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_8("您有一个铺位需要审核，请查收", "##### 铺位名称：{0}\n##### 铺位地址：{1}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
MESSAGE_9("已为您分配一位加盟商，请查收", "##### 加盟商姓名：{0}\n##### 手机号码：{1}\n##### 意向加盟区域：{2}\n", "https://oss.coolcollege.cn/53c11d2f4ec94d4fa7edd7a96e40e2d6.png"),
;

1
coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java
View File

@@ -8,6 +8,7 @@ package com.cool.store.enums;
public enum SMSMsgEnum {
MODIFY_INTERVIEW_TIME("修改面审时间","", "SMS_464760909"),
SECOND_INTERVIEW_PASS("二审面试通过","", "SMS_464760909"),
;
private String title;

3
coolstore-partner-model/src/main/java/com/cool/store/entity/PointAuditRecordDO.java
View File

@@ -1,11 +1,8 @@
package com.cool.store.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.point.AuditNodeDTO;
import com.cool.store.enums.AuditStatusEnum;
import com.cool.store.enums.NodeNoEnum;
import com.cool.store.request.PointAuditRequest;
import lombok.Data;
import java.util.ArrayList;

20
coolstore-partner-model/src/main/java/com/cool/store/entity/PointDetailInfoDO.java
View File

@@ -1,8 +1,11 @@
package com.cool.store.entity;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.enums.point.*;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import sun.plugin.javascript.JSClassLoader;
import java.util.Date;
import java.util.Objects;
@@ -589,6 +592,23 @@ public class PointDetailInfoDO {
if(Objects.isNull(this.pictureObj) || StringUtils.isBlank(this.pictureObj)){
return false;
}
JSONObject jsonObject = JSONObject.parseObject(this.pictureObj);
JSONArray front = jsonObject.getJSONArray("front");
if(Objects.isNull(front) || front.isEmpty()){
return false;
}
JSONArray leftSide = jsonObject.getJSONArray("leftSide");
if(Objects.isNull(leftSide) || leftSide.isEmpty()){
return false;
}
JSONArray rightSide = jsonObject.getJSONArray("rightSide");
if(Objects.isNull(rightSide) || rightSide.isEmpty()){
return false;
}
JSONArray video = jsonObject.getJSONArray("video");
if(Objects.isNull(video) || video.isEmpty()){
return false;
}
return true;
}
}

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

@@ -75,7 +75,7 @@ public class CommonService {
return (AuditResultService) applicationContext.getBean(auditEnum.getClazz());
}
public void sendMessage(List<String> userIds, Long lineId, MessageEnum message, String... param){
public void sendMessage(List<String> userIds, MessageEnum message, String... param){
if(CollectionUtils.isEmpty(userIds)){
return;
}
@@ -83,7 +83,7 @@ public class CommonService {
if(CollectionUtils.isEmpty(userIds)){
return;
}
String mobileParam = MessageFormat.format("{0}&eid={1}&corpId={2}&appType=dingding2&lineId={3}", "", enterpriseId, dingCorpId, String.valueOf(lineId));
String mobileParam = MessageFormat.format("{0}&eid={1}&corpId={2}&appType=dingding2&lineId={3}", "", enterpriseId, dingCorpId, null);
try {
String messageUrl = coolStoreDomainUrl + "dd-noticemsg?miniAppId={0}&appId={1}&corpId={2}&appUrl=" + URLEncoder.encode("pages/common-web-view/index?routerUrl=notice&target=" + mobileParam, StandardCharsets.UTF_8.name());
SendMessageDTO messageDTO = new SendMessageDTO();
@@ -131,8 +131,10 @@ public class CommonService {
.phoneNumberJson(JSONObject.toJSONString(poneNumbers))
.signNameJson(JSONObject.toJSONString(Arrays.asList(signName)))
.templateCode(templateCode.getTemplateCode())
.templateParamJson(templateParam.toJSONString())
.build();
if(Objects.nonNull(templateParam)){
sendBatchSmsRequest.toBuilder().templateParamJson(templateParam.toJSONString());
}
CompletableFuture<SendBatchSmsResponse> response = client.sendBatchSms(sendBatchSmsRequest);
SendBatchSmsResponse resp = response.get();
log.info("短信发送response:{}", JSONObject.toJSONString(resp));

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

@@ -156,7 +156,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
}
LineInterviewDO addInterview = LineInterviewDO.convertDO(lineInfo, startTime, endTime, UUIDUtils.get8UUID(), interviewerUserId, interviewType.getCode(), eventId);
lineInterviewDAO.addInterviewInfo(addInterview);
commonService.sendMessage(Arrays.asList(interviewerUserId), lineInfo.getId(), MessageEnum.MESSAGE_2, lineInfo.getUsername(), hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId()), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, startTime));
commonService.sendMessage(Arrays.asList(interviewerUserId), MessageEnum.MESSAGE_2, lineInfo.getUsername(), hyOpenAreaInfoDAO.selectNameMapById(lineInfo.getWantShopAreaId()), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM, startTime));
return Boolean.TRUE;
}
@@ -428,6 +428,8 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
shopService.initShop(lineInfo);
//二审稽核
auditStatusService.insert(lineInfo.getId(),interviewInfo.getId(),auditId,AuditStageEnum.TWO.getCode());
//发送短信
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.SECOND_INTERVIEW_PASS, null);
}
return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0;
}

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

@@ -81,6 +81,8 @@ public class PointServiceImpl implements PointService {
private ShopAuditInfoDAO shopAuditInfoDAO;
@Resource
private SysRoleService sysRoleService;
@Resource
private CommonService commonService;
@Value("${mybatis.configuration.variables.enterpriseId}")
private String enterpriseId;
@@ -351,6 +353,7 @@ public class PointServiceImpl implements PointService {
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){
shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20));
}
commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_7, pointInfo.getPointName(), pointInfo.getAddress());
}
return pointInfoDAO.updatePointInfo(updatePoint);
}
@@ -400,6 +403,8 @@ public class PointServiceImpl implements PointService {
if(Objects.nonNull(nextAuditRecord)){
//更新下一阶段任务的收到任务时间
pointAuditRecordDAO.updatePointAuditRecord(PointAuditRecordDO.convert(nextAuditRecord.getId(), new Date()));
List<String> sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class);
commonService.sendMessage(sendMessageUserIds, MessageEnum.MESSAGE_8, pointInfo.getPointName(), pointInfo.getAddress());
//审批通过的情况下 生成下一个节点的待办数据
return pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord));
}
@@ -408,8 +413,8 @@ public class PointServiceImpl implements PointService {
pointInfoUpdate.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode());
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){
shopStageInfoDAO.batchUpdateShopStageStatus(pointInfo.getShopId(), Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20));
}
commonService.sendMessage(Arrays.asList(pointInfo.getDevelopmentManager()), MessageEnum.MESSAGE_7, pointInfo.getPointName(), pointInfo.getAddress());
return pointInfoDAO.updatePointInfo(pointInfoUpdate);
}

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -35,7 +35,7 @@ public class PCTestController {
@GetMapping("/sendMessage")
public ResponseResult<Boolean> sendMessage(){
commonService.sendMessage(Arrays.asList("123836131931284423"), 1L, MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
commonService.sendMessage(Arrays.asList("123836131931284423"), MessageEnum.MESSAGE_1, "张三", "浙江-杭州");
return ResponseResult.success(Boolean.FALSE);
}

1
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java
View File

@@ -2,7 +2,6 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PointService;