diff --git a/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java b/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java index 9ac3fe5..6b21927 100644 --- a/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java +++ b/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java @@ -55,7 +55,7 @@ public class TianYiYunSmsUtil { // https://crm.gdjsl.com/jsl-visit-external-user/#/visit-item-check-qrcode?id=c9c94e134f7325dfda78f2ab57165442 DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH时mm分"); String visitDateFormat = visitDate.format(df); - String msg = "【嘉士利】预约成功通知:您的预约已被确认,请您于"+visitDateFormat +"访问:"+accessUser+ + String msg = "【嘉士利】预约成功通知:您的预约已被确认,请您于"+visitDateFormat +"访问:"+accessUser+ ",您的访问信息如下:"+url+",点击链接展示来访二维码,门卫扫码即可完成登记。期待您的到访。"; send(mobile,msg); } diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java index f92f342..0a33cc2 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainInnerController.java @@ -86,9 +86,9 @@ public class VisitMainInnerController { // 判断是否超过2小时 LocalDateTime nowTime = LocalDateTime.now(); VisitTheme visitTheme = visitThemeService.getById(visitMain.getThemeId()); - if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ - return R.error("登记时间未开始"); - } +// if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ +// return R.error("登记时间未开始"); +// } if(visitTheme.getVisitEndDate()!=null&&nowTime.isAfter(visitTheme.getVisitEndDate())){ return R.error("已结束登记"); } diff --git a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java index 5de98cd..adf247c 100644 --- a/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java +++ b/src/main/java/com/qs/serve/modules/visit/api/VisitMainOuterApi.java @@ -187,9 +187,9 @@ public class VisitMainOuterApi { return R.error("主题已停用"); } LocalDateTime nowTime = LocalDateTime.now(); - if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ - return R.error("登记时间未开始"); - } +// if(visitTheme.getVisitStartDate()!=null&&nowTime.isBefore(visitTheme.getVisitStartDate())){ +// return R.error("登记时间未开始"); +// } if(visitTheme.getVisitEndDate()!=null&&nowTime.isAfter(visitTheme.getVisitEndDate())){ return R.error("已结束登记"); }