From 56ea98632840e11ca063302f579595c51604eba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 27 May 2024 10:33:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=96=87=E6=A1=88?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/TrainingExperienceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index b527692ba..2b8debe39 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -71,7 +71,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr LineInfoDO msgLineInfo = lineInfoMapper.getByLineId(request.getLineId()); Map 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())) { From fb08df8651ab4e0595ff0d3a0f694890a85805cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 27 May 2024 11:00:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=85=E4=BF=AE=E6=AC=BE=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/vo/desk/InterviewPendingVO.java | 2 ++ .../com/cool/store/service/impl/DecorationServiceImpl.java | 4 ++-- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java index 27dd6d358..bf80be009 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/InterviewPendingVO.java @@ -21,6 +21,8 @@ public class InterviewPendingVO extends BaseInfoVO { @ApiModelProperty("面试官名称") private String interviewer; + private Long interviewId; + public InterviewPendingVO(){}; public InterviewPendingVO(BaseInfoVO baseInfoVO) { 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 d8125db25..9f8f2a12e 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 @@ -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); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index e9c5e93cd..56babcf19 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -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); });