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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-27 11:18:25 +08:00
parent 0ca86e66e9 fb08df8651
commit 12b091f79f
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java
View File

@@ -21,6 +21,8 @@ public class InterviewPendingVO extends BaseInfoVO {
@ApiModelProperty("面试官名称")
private String interviewer;
private Long interviewId;
public InterviewPendingVO(){};
public InterviewPendingVO(BaseInfoVO baseInfoVO) {

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

@@ -61,6 +61,8 @@ import java.util.stream.Collectors;
public class DecorationServiceImpl implements DecorationService {
private static final Logger log = LoggerFactory.getLogger(DecorationServiceImpl.class);
private static final String payPic = "https://store-inspections-server.oss-cn-hangzhou.aliyuncs.com/coolstore/%E8%A3%85%E4%BF%AE%E6%AC%BE.png";
@Resource
private AssessmentDataDAO assessmentDataDAO;
@Resource
@@ -177,8 +179,6 @@ public class DecorationServiceImpl implements DecorationService {
if (proposedBookBudget == null) {return null;}
BigDecimal vzHj = proposedBookBudget.getVzHj();
//支付二维码url
Long regionId = shopInfoDAO.getRegionIdByid(shopId);
String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId);
DecorationModelDTO decorationModelDTO = new DecorationModelDTO();
decorationModelDTO.setPayUrl(payPic);
decorationModelDTO.setTotalAmount(vzHj);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -134,6 +134,7 @@ public class DeskServiceImpl implements DeskService {
interviewPendingVO.setStartTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START,lineInterviewDO.getStartTime()));
interviewPendingVO.setEndTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END,lineInterviewDO.getEndTime()));
interviewPendingVO.setInterviewer(userInfoMap.getOrDefault(x.getFirstInterviewer(),new EnterpriseUserDO()).getName());
interviewPendingVO.setInterviewId(lineInterviewDO.getId());
}
list.add(interviewPendingVO);
});
@@ -167,6 +168,7 @@ public class DeskServiceImpl implements DeskService {
interviewPendingVO.setStartTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START,lineInterviewDO.getStartTime()));
interviewPendingVO.setEndTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_END,lineInterviewDO.getEndTime()));
interviewPendingVO.setInterviewer(userInfoMap.getOrDefault(x.getSecondInterviewer(),new EnterpriseUserDO()).getName());
interviewPendingVO.setInterviewId(lineInterviewDO.getId());
}
list.add(interviewPendingVO);
});

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -71,7 +71,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
LineInfoDO msgLineInfo = lineInfoMapper.getByLineId(request.getLineId());
Map<String, String> templateParam = new HashMap<>();
templateParam.put("shopName", request.getStoreName());
templateParam.put("experienceTime", String.format("%s%s", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, request.getExperienceStartTime()),
templateParam.put("experienceTime", String.format("%s 到 %s", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, request.getExperienceStartTime()),
DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, request.getExperienceEndTime())));
commonService.sendSms(msgLineInfo.getMobile(), SMSMsgEnum.SHOP_EXPERIENCE,templateParam);
} else if (currentDate.after(request.getExperienceStartTime()) || currentDate.before(request.getExperienceEndTime())) {