Merge branch 'main' of http://117.174.100.38:3000/lishiqiang/ship-ota-server into main1

 Conflicts:

	ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/MiniTradeOrderCreateReqVO.java

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

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

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -581,10 +581,6 @@ public class OtcTradeOrderController {
     @PlatTenantEnv
     public void exportOrderExcel(@Valid TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(10000);
-//        if (pageReqVO.getVoyageId() == null) {
-//            ExcelUtils.exportError(response, "游客列表.xls");
-//            return;
-//        }
         List<TradeOrderRespExcelVO> list = tradeOrderService.getExportVisitorList(pageReqVO);
         ExcelUtils.write(response, "游客列表.xls", "数据", TradeOrderRespExcelVO.class, list);
     }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/OtcTradeChangeOrderReqVO.java

@@ -1,31 +0,0 @@
-package com.yc.ship.module.trade.controller.admin.order.vo.order;
-
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Schema(description = "旅行社交易改签 Request VO")
-@Data
-public class OtcTradeChangeOrderReqVO{
-
-    @Schema(description = "主订单ID，通过此订单再新增订单（增加产品/数量,改签时传递）", example = "")
-    @NotNull(message = "主订单ID不能为空")
-    private Long mainOrderId;
-
-    @Schema(description = "新订单ID", example = "")
-    @NotNull(message = "新订单ID不能为空")
-    private Long orderId;
-
-    @Schema(description = "实际支付或退款金额")
-    @NotNull(message = "实际支付或退款金额不能为空")
-    private BigDecimal realPayAmount;
-
-    @Schema(description = "0原路退回，1线下退款 ", example = "")
-    private Integer refundBackType;
-
-    @Schema(description = "如需支付时的支付参数 ", example = "")
-    private PayOrderReqVO payOrderParams;
-}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/OtcTradeOrderChangeReqVO.java

@@ -1,12 +0,0 @@
-package com.yc.ship.module.trade.controller.admin.order.vo.order;
-
-import com.yc.ship.module.trade.api.dto.TradeOrderChangeReqDTO;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-
-@Schema(description = "旅行社改签 Request VO")
-@Data
-public class OtcTradeOrderChangeReqVO extends TradeOrderChangeReqDTO {
-
-}

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeDetailMapper.java

@@ -1,18 +1,15 @@
 package com.yc.ship.module.trade.dal.mysql.order;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.product.api.dto.*;
-import com.yc.ship.module.trade.api.dto.*;
 import com.yc.ship.module.trade.api.sms.dto.SmsSendLogDTO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtaTradeLogPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtaTradeLogRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderDetailCountRespVO;
 import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.rule.*;
+import com.yc.ship.module.trade.controller.admin.order.vo.rule.GateCheckDetailRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.rule.MarketingPageReqVO;
 import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQueryRespVO;
 import com.yc.ship.module.trade.dal.dataobject.order.CategoryRespVO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;