初定和确定单短信发送

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/handler/MoblieMessageAliyunUtil.java

@@ -3,6 +3,8 @@ package com.yc.ship.module.trade.service.order.handler;
 import cn.hutool.json.JSONUtil;
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
+import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsRequest;
+import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
@@ -13,6 +15,7 @@ import com.aliyuncs.profile.IClientProfile;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
+
 /**
  * 三峡短信模块
  * @author lishiqiang
@@ -90,7 +93,6 @@ public class MoblieMessageAliyunUtil {
         return sendSmsResponse;
     }
 
-
     public static void main(String[] args) throws Exception{
         //您预定的${useDate}“长江游轮”即将开启.请您于${startTime}起前往 ${startAddr}登船,身份证即为船票,出行时请携带所有出行人的身份证原件,${endTime}将停止检票.请勿携带宠物、管制刀具等违禁物品登船,祝您旅途愉快!
         String ss = "{\"boatName\":\"长江游轮\",\"orderNo\":\"SP202691203132\",\"routeName\":\"宜昌-重庆\",\"startTime\":\"2026-4-20\",\"jzTime\":\"登船日期前7天\"}";

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -1127,7 +1127,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     private void afterOrderCreate(TradeOrderBO tradeOrderBO) {
         //执行下单后处理器
         tradeOrderHandlers.forEach(handler -> handler.afterOrderCreate(tradeOrderBO));
-        tradePublishUtils.publishOrderCreateSuccessMsg(tradeOrderBO.getTradeOrderDO().getId().toString());
+//        tradePublishUtils.publishOrderCreateSuccessMsg(tradeOrderBO.getTradeOrderDO().getId().toString());
         //支付倒计时--不超时，有预订单
         Map<String, Object> append = TradeOrderLogUtils.append("result", "成功");
         append.put("content", "");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -1684,6 +1684,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderRoomModelMapper.deleteByOrderId(orderId);
                 tradeOrderRoomModelMapper.insertBatch(tradeOrderRoomDOList);
             }
+            tradePublishUtils.publishOrderCreateSuccessMsg(orderId + "");
             OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
             return CommonResult.success(respVO);
         } finally {

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -352,10 +352,10 @@
         <if test="vo.travelStatus != null">
             AND td.travel_status = #{vo.travelStatus}
         </if>
-        <if test="vo.roomModelId != null">
+        <if test="vo.roomModelId != null and vo.roomModelId != ''">
             AND torm.room_model_id = #{vo.roomModelId}
         </if>
-        <if test="vo.floor != null">
+        <if test="vo.floor != null and vo.floor != ''">
             AND torm.floor = #{vo.floor}
         </if>
         <if test="vo.orderRefundDateStart != null and vo.orderRefundDateEnd != ''">