站内信完善

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/smsSendconfig/MessageSendMapper.java

@@ -27,5 +27,10 @@ public interface MessageSendMapper extends BaseMapperX<SmsSendconfigDO> {
      */
     List<SmsSendconfigQueryRespVO> querySendList2(@Param("day") int day);
 
+    /***
+     * 已支付出航提示
+     */
+    List<SmsSendconfigQueryRespVO> querySendList3(@Param("day") int day);
+
 
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageFifthJob.java

@@ -0,0 +1,41 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.job.TenantJob;
+import com.yc.ship.module.trade.service.smsSendconfig.MessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单站内信消息任务
+ *
+ * @author qsl
+ * @date 2023/03/06
+ */
+@Component
+@Slf4j
+public class OrderMessageFifthJob implements JobHandler {
+    @Resource
+    private MessageSendService messageSendService;
+
+
+
+
+    @Override
+    @TenantJob
+    public String execute(String param) {
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 <<<<<<<<<<<<<<<<<<<<<<");
+        try {
+            messageSendService.sendMsg5();
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageForthJob.java

@@ -27,14 +27,14 @@ public class OrderMessageForthJob implements JobHandler {
     @Override
     @TenantJob
     public String execute(String param) {
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前2天00:00仍未付款 <<<<<<<<<<<<<<<<<<<<<<");
         try {
             messageSendService.sendMsg4();
         } catch (Exception e) {
-            log.error(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前2天00:00仍未付款 Error <<<<<<<<<<<<<<<<<<<<<<");
             log.error(e.getMessage(), e);
         }
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前2天00:00仍未付款 End  <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前2天00:00仍未付款 End  <<<<<<<<<<<<<<<<<<<<<<");
         return "成功";
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageJob.java

@@ -32,14 +32,14 @@ public class OrderMessageJob implements JobHandler {
     @Override
     @TenantJob
     public String execute(String param) {
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 1 天（开航前 22 天 中午12:00） <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 您的留位订单即将过期（开航前 8 天 中午12:00） <<<<<<<<<<<<<<<<<<<<<<");
         try {
             messageSendService.sendMsg1();
         } catch (Exception e) {
-            log.error(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 您的留位订单即将过期（开航前 8 天 中午12:00） Error <<<<<<<<<<<<<<<<<<<<<<");
             log.error(e.getMessage(), e);
         }
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 1 天（开航前 22 天 中午12:00）End  <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 您的留位订单即将过期（开航前 8 天 中午12:00） End  <<<<<<<<<<<<<<<<<<<<<<");
         return "成功";
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageNineJob.java

@@ -0,0 +1,41 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.job.TenantJob;
+import com.yc.ship.module.trade.service.smsSendconfig.MessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单站内信消息任务
+ *
+ * @author qsl
+ * @date 2023/03/06
+ */
+@Component
+@Slf4j
+public class OrderMessageNineJob implements JobHandler {
+    @Resource
+    private MessageSendService messageSendService;
+
+
+
+
+    @Override
+    @TenantJob
+    public String execute(String param) {
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【出发】开航前7天中午12点 <<<<<<<<<<<<<<<<<<<<<<");
+        try {
+            messageSendService.sendMsg9();
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【出发】开航前7天中午12点 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【出发】开航前7天中午12点 End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageSenvenJob.java

@@ -0,0 +1,41 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.job.TenantJob;
+import com.yc.ship.module.trade.service.smsSendconfig.MessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单站内信消息任务
+ *
+ * @author qsl
+ * @date 2023/03/06
+ */
+@Component
+@Slf4j
+public class OrderMessageSenvenJob implements JobHandler {
+    @Resource
+    private MessageSendService messageSendService;
+
+
+
+
+    @Override
+    @TenantJob
+    public String execute(String param) {
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前14天中午12：00 <<<<<<<<<<<<<<<<<<<<<<");
+        try {
+            messageSendService.sendMsg6();
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前14天中午12：00 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前14天中午12：00 End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageSixJob.java

@@ -0,0 +1,41 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.job.TenantJob;
+import com.yc.ship.module.trade.service.smsSendconfig.MessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单站内信消息任务
+ *
+ * @author qsl
+ * @date 2023/03/06
+ */
+@Component
+@Slf4j
+public class OrderMessageSixJob implements JobHandler {
+    @Resource
+    private MessageSendService messageSendService;
+
+
+
+
+    @Override
+    @TenantJob
+    public String execute(String param) {
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前22天中午12：00 <<<<<<<<<<<<<<<<<<<<<<");
+        try {
+            messageSendService.sendMsg8();
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前22天中午12：00 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【锁定】开航前22天中午12：00 End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageTenJob.java

@@ -0,0 +1,41 @@
+package com.yc.ship.module.trade.job;
+
+import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.framework.tenant.core.job.TenantJob;
+import com.yc.ship.module.trade.service.smsSendconfig.MessageSendService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 订单站内信消息任务
+ *
+ * @author qsl
+ * @date 2023/03/06
+ */
+@Component
+@Slf4j
+public class OrderMessageTenJob implements JobHandler {
+    @Resource
+    private MessageSendService messageSendService;
+
+
+
+
+    @Override
+    @TenantJob
+    public String execute(String param) {
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 出团前1天上午8点 <<<<<<<<<<<<<<<<<<<<<<");
+        try {
+            messageSendService.sendMsg10();
+        } catch (Exception e) {
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 出团前1天上午8点 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(e.getMessage(), e);
+        }
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 出团前1天上午8点 End  <<<<<<<<<<<<<<<<<<<<<<");
+        return "成功";
+    }
+
+}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageThreeJob.java

@@ -27,14 +27,14 @@ public class OrderMessageThreeJob implements JobHandler {
     @Override
     @TenantJob
     public String execute(String param) {
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前7天提醒 中午12：00 <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【留位】开航前8天提醒 中午12：00 <<<<<<<<<<<<<<<<<<<<<<");
         try {
             messageSendService.sendMsg3();
         } catch (Exception e) {
-            log.error(">>>>>>>>>>>>>>>>>>>>>> 开航前7天提醒 中午12：00 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【留位】开航前8天提醒 中午12：00 Error <<<<<<<<<<<<<<<<<<<<<<");
             log.error(e.getMessage(), e);
         }
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 开航前7天提醒 中午12：00 End  <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【留位】开航前8天提醒 中午12：00 End  <<<<<<<<<<<<<<<<<<<<<<");
         return "成功";
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderMessageTwoJob.java

@@ -27,14 +27,14 @@ public class OrderMessageTwoJob implements JobHandler {
     @Override
     @TenantJob
     public String execute(String param) {
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 1 天（开航前 21 天 10:00） <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【留位】（开航前22天中午12:00） <<<<<<<<<<<<<<<<<<<<<<");
         try {
             messageSendService.sendMsg2();
         } catch (Exception e) {
-            log.error(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 Error <<<<<<<<<<<<<<<<<<<<<<");
+            log.error(">>>>>>>>>>>>>>>>>>>>>> 【留位】（开航前22天中午12:00） Error <<<<<<<<<<<<<<<<<<<<<<");
             log.error(e.getMessage(), e);
         }
-        log.info(">>>>>>>>>>>>>>>>>>>>>> 初定即将过期前 1 天（开航前 21 天 10:00）End  <<<<<<<<<<<<<<<<<<<<<<");
+        log.info(">>>>>>>>>>>>>>>>>>>>>> 【留位】（开航前22天中午12:00） End  <<<<<<<<<<<<<<<<<<<<<<");
         return "成功";
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/smsSendconfig/MessageSendService.java

@@ -10,21 +10,47 @@ public interface MessageSendService {
 
 
     /**
-     * 初定即将过期前 1 天（开航前 22 天 中午12:00）
+     * 您的留位订单即将过期（开航前 8 天 中午12:00）
      */
     void sendMsg1();
     /**
-     * 初定即将过期前 1 天（开航前 21 天 10:00）
+     * 【留位】（开航前22天中午12:00）
      */
     void sendMsg2();
 
     /**
-     * 开航前7天提醒 中午12：00
+     * 【留位】开航前8天提醒 中午12：00
      */
     void sendMsg3();
 
     /**
-     * 开航前2天00:00仍未付款
+     * 【锁定】开航前2天00:00仍未付款
      */
     void sendMsg4();
+
+
+    /**
+     * 【锁定】开航前8天提醒中午12：00
+     */
+    void sendMsg5();
+
+    /**
+     * 【锁定】开航前14天中午12：00
+     */
+    void sendMsg6();
+
+    /**
+     * 【锁定】开航前22天中午12：00
+     */
+    void sendMsg8();
+
+    /**
+     * 【出发】开航前7天中午12点
+     */
+    void sendMsg9();
+
+    /**
+     * 出团前1天上午8点
+     */
+    void sendMsg10();
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/smsSendconfig/MessageSendServiceImpl.java

@@ -34,9 +34,14 @@ public class MessageSendServiceImpl implements MessageSendService {
     private MessageSendMapper messageSendMapper;
 
 
+    /***
+     * 【您的留位订单即将过期】
+     * 您的留位订单【{orderNo}】（{routeName}/{boatName}/{startTime}）将在今日24:00自动取消。后期如有新订单，均需录入锁位单，如因此造成相应损失，需自行承担。如需保留，请及时补全游客名单进行锁位。
+     * 提示：如在开航前7天内取消，将按退改规则扣损。如有疑问，欢迎致电：6334888。
+     */
     @Override
     public void sendMsg1() {
-        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList1(22);
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList1(8);
         smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
             try {
                 Map map = new HashMap();
@@ -56,9 +61,13 @@ public class MessageSendServiceImpl implements MessageSendService {
 
     }
 
+    /***
+     * 【留位】（开航前22天中午12:00）
+     * 您的留位订单【{orderNo}】（{routeName}/{boatName}/{startTime}）即将过期。如需保留，请及时补全游客名单进行锁位。
+     */
     @Override
     public void sendMsg2() {
-        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList1(21);
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList1(22);
         smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
             try {
                 Map map = new HashMap();
@@ -77,9 +86,15 @@ public class MessageSendServiceImpl implements MessageSendService {
         });
 
     }
+
+    /***
+     * 【留位】开航前8天提醒 中午12：00
+     * 您的留位订单【{orderNo}】（{routeName}/{boatName}/{startTime}）将在今日24:00自动取消。
+     * 后期如有新订单，均需录入锁位单，如因此造成相应损失，需自行承担。如需保留，请及时补全游客名单进
+     */
     @Override
     public void sendMsg3() {
-        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(7);
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList1(8);
         smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
             try {
                 Map map = new HashMap();
@@ -87,8 +102,8 @@ public class MessageSendServiceImpl implements MessageSendService {
                 map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
                 map.put("boatName", smsSendconfigQueryRespVO.getShipName());
                 map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
-                Date lastDate = DateUtil.offsetDay(DateUtil.parse(smsSendconfigQueryRespVO.getStartTime()), -4);
-                map.put("lastTime", DateUtil.format(lastDate, "yyyy-MM-dd"));
+//                Date lastDate = DateUtil.offsetDay(DateUtil.parse(smsSendconfigQueryRespVO.getStartTime()), -4);
+//                map.put("lastTime", DateUtil.format(lastDate, "yyyy-MM-dd"));
                 NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
                 reqDTO.setTemplateParams(map);
                 reqDTO.setTemplateCode("sendmsg_cd_4");
@@ -101,6 +116,14 @@ public class MessageSendServiceImpl implements MessageSendService {
 
     }
 
+    /***
+     * 【锁定】开航前2天00:00仍未付款
+     * 订单【{orderNo}】（{routeName}/{boatName}/{startTime}）已临近出发。
+     * 请在24小时内完成支付，逾期系统将自动取消订单，游轮舱位无法保留。
+     * 为避免影响行程，敬请尽快处理。
+     * 如有疑问，欢迎致电：6334888。
+     */
+
     @Override
     public void sendMsg4() {
         List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(2);
@@ -122,4 +145,154 @@ public class MessageSendServiceImpl implements MessageSendService {
         });
 
     }
+
+    /***
+     * 【锁定】开航前8天提醒中午12：00
+     * 订单【{orderNo}】（{routeName}/{boatName}/{startTime}）已临近出发，请及时完成以下事项：
+     * 1.付款：请尽快付款以锁定游轮舱位；
+     * 2.接站信息确认：如已预约接站，请在3日内与游客确认信息准确，如需更改请于{jzTime}中午12点前完成更改。
+     * 如因信息缺失、错误或未在规定时间内提交而影响接站安排，将无法正常提供接站服务，敬请留意。如有疑问，欢迎致电：6334888。
+     */
+    @Override
+    public void sendMsg5() {
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(8);
+        smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
+            try {
+                Map map = new HashMap();
+                map.put("orderNo", smsSendconfigQueryRespVO.getOrderNo());
+                map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
+                map.put("boatName", smsSendconfigQueryRespVO.getShipName());
+                map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
+                Date lastDate = DateUtil.offsetDay(DateUtil.parse(smsSendconfigQueryRespVO.getStartTime()), -4);
+                map.put("jzTime4", DateUtil.format(lastDate, "yyyy-MM-dd"));
+                NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
+                reqDTO.setTemplateParams(map);
+                reqDTO.setTemplateCode("sendmsg_cd_6");
+                reqDTO.setUserId(Long.parseLong(smsSendconfigQueryRespVO.getSellerId()));
+                notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+            } catch (Exception e) {
+                log.error("发送短信异常", e);
+            }
+        });
+
+    }
+
+    /***
+     * 【锁定】开航前14天中午12：00
+     * 订单【{orderNo}】（{routeName}/{boatName}/{startTime}）已临近出发，请及时完成以下事项：
+     * 1.付款：请尽快付款以锁定游轮舱位；
+     * 2.接站信息确认：如已预约接站，请及时与游客确认信息准确，并于${jzTime7}中午12点前完成登记。如因信息缺失、错误或未在规定时间内提交而影响接站安排，将无法正常提供接站服务，敬请留意。
+     * 如有疑问，欢迎致电：6334888。
+     */
+    @Override
+    public void sendMsg6() {
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(14);
+        smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
+            try {
+                Map map = new HashMap();
+                map.put("orderNo", smsSendconfigQueryRespVO.getOrderNo());
+                map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
+                map.put("boatName", smsSendconfigQueryRespVO.getShipName());
+                map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
+                Date lastDate = DateUtil.offsetDay(DateUtil.parse(smsSendconfigQueryRespVO.getStartTime()), -7);
+                map.put("jzTime7", DateUtil.format(lastDate, "yyyy-MM-dd"));
+                NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
+                reqDTO.setTemplateParams(map);
+                reqDTO.setTemplateCode("sendmsg_cd_8");
+                reqDTO.setUserId(Long.parseLong(smsSendconfigQueryRespVO.getSellerId()));
+                notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+            } catch (Exception e) {
+                log.error("发送短信异常", e);
+            }
+        });
+
+    }
+
+
+
+    /***
+     * 【锁定】开航前22天中午12：00
+     * 订单【{orderNo}】（{routeName}/{boatName}/{startTime}）已临近出发，请及时完成以下事项：
+     * 1.付款：请尽快付款以锁定游轮舱位；
+     * 2.接站信息确认：如已预约接站，请及时与游客确认信息准确，并于${jzTime7}中午12点前完成登记。如因信息缺失、错误或未在规定时间内提交而影响接站安排，将无法正常提供接站服务，敬请留意。
+     * 如有疑问，欢迎致电：6334888。
+     */
+    @Override
+    public void sendMsg8() {
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(22);
+        smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
+            try {
+                Map map = new HashMap();
+                map.put("orderNo", smsSendconfigQueryRespVO.getOrderNo());
+                map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
+                map.put("boatName", smsSendconfigQueryRespVO.getShipName());
+                map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
+                Date lastDate = DateUtil.offsetDay(DateUtil.parse(smsSendconfigQueryRespVO.getStartTime()), -7);
+                map.put("jzTime7", DateUtil.format(lastDate, "yyyy-MM-dd"));
+                NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
+                reqDTO.setTemplateParams(map);
+                reqDTO.setTemplateCode("sendmsg_cd_9");
+                reqDTO.setUserId(Long.parseLong(smsSendconfigQueryRespVO.getSellerId()));
+                notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+            } catch (Exception e) {
+                log.error("发送短信异常", e);
+            }
+        });
+
+    }
+
+    /***
+     * 【出发】开航前7天中午12点
+     * 尊敬的游客，您预订的 {boatName}（{routeName}）将于{startTime}启航。如您已预约免费接站服务，请在3日内向预订旅行社补充或确认接站信息。
+     * 如因信息缺失、错误或未在规定时间内提交而影响接站安排，将无法正常提供接站服务，敬请留意。
+     * 如需协助，请致电[400-696-0666]。祝您旅途愉快！
+     */
+    @Override
+    public void sendMsg9() {
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(7);
+        smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
+            try {
+                Map map = new HashMap();
+                map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
+                map.put("boatName", smsSendconfigQueryRespVO.getShipName());
+                map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
+                NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
+                reqDTO.setTemplateParams(map);
+                reqDTO.setTemplateCode("sendmsg_cd_10");
+                reqDTO.setUserId(Long.parseLong(smsSendconfigQueryRespVO.getSellerId()));
+                notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+            } catch (Exception e) {
+                log.error("发送短信异常", e);
+            }
+        });
+
+    }
+
+    /***
+     * 出团前1天上午8点
+     * 尊敬的游客，您预订的 {boatName}（{routeName}）将于明日启航。如您已预约免费接站服务，请再次确认您的接站信息。接站时间为登船日当天[宜昌：08:00-20:00；重庆：09:00-20:00]。工作人员届时将在出站口附近迎接，站点指引等更多信息请参阅长江行游轮小程序，工作人员将提前与您电话联系，请您注意接听。
+     * 请您务必携带预订时填写的有效身份证件。如行程临时变更，请及时致电[400-696-0666]。
+     * 祝您旅途愉快！
+     */
+    @Override
+    public void sendMsg10() {
+        List<SmsSendconfigQueryRespVO> smsSendconfigQueryRespVOS = messageSendMapper.querySendList2(1);
+        smsSendconfigQueryRespVOS.forEach(smsSendconfigQueryRespVO -> {
+            try {
+                Map map = new HashMap();
+                map.put("orderNo", smsSendconfigQueryRespVO.getOrderNo());
+                map.put("routeName", smsSendconfigQueryRespVO.getRouteName());
+                map.put("boatName", smsSendconfigQueryRespVO.getShipName());
+                map.put("startTime", smsSendconfigQueryRespVO.getStartTime());
+                NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
+                reqDTO.setTemplateParams(map);
+                reqDTO.setTemplateCode("sendmsg_cd_11");
+                reqDTO.setUserId(Long.parseLong(smsSendconfigQueryRespVO.getSellerId()));
+                notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);
+            } catch (Exception e) {
+                log.error("发送短信异常", e);
+            }
+        });
+
+    }
 }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/smsSendconfig/MessageSendMapper.xml

@@ -77,4 +77,39 @@
         t1.id
     </select>
 
+    <select id="querySendList3" resultType="com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQueryRespVO">
+        SELECT
+        t1.group_no groupNo,
+        t2.product_id,
+        t2.product_name,
+        t66.NAME voyageName,
+        t66.start_time,
+        t66.leave_time,
+        t77.NAME shipName,
+        t67.NAME routeName,
+        t1.order_no,
+        t1.seller_id,
+        t2.use_date,
+        count( DISTINCT t2.id ) num,
+        t1.source_name,
+        t1.link_man contact_name,
+        t1.link_mobile mobile,
+        t1.group_no
+        FROM
+        trade_order t1
+        INNER JOIN trade_detail t2 ON t1.id = t2.order_id
+        left JOIN trade_order_user t3 ON t3.order_id = t1.id
+        left JOIN product_voyage t66 ON t66.id = t1.voyage_id
+        left JOIN resource_route t67 ON t66.route_id = t67.id
+        left JOIN resource_ship t77 ON t77.id = t1.ship_id
+        WHERE 1=1
+        and t2.use_date = DATE_SUB(CURDATE(), INTERVAL( -#{day} ) DAY )
+        AND t1.order_status =6
+        AND t1.deleted = 0
+        AND t2.deleted = 0
+        and t2.use_date>now()
+        GROUP BY
+        t1.id
+    </select>
+
 </mapper>