bug修改

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

@@ -49,6 +49,15 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @NotNull(message = "订单金额不能为空")
     private BigDecimal amount;
 
+    @Schema(description = "订单联系人")
+    private String linkMan;
+
+    @Schema(description = "联系人手机")
+    private String linkMobile;
+
+    @Schema(description = "联系人邮箱")
+    private String linkEmail;
+
     @Schema(description = "订单附加产品金额（元）", example = "100")
     @NotNull(message = "订单附加产品金额不能为空")
     private BigDecimal spuAmount;

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

@@ -181,6 +181,12 @@ public class TradeOrderPageReqVO extends PageParam {
     @Schema(description = "分销商分组ID", example = "张三")
     private String otaCateId;
 
+    @Schema(description = "航次ID")
+    private Long voyageId;
+
+    @Schema(description = "船ID")
+    private Long shipId;
+
     @Schema(description = "分销商ID", example = "张三")
     private String otaId;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -6,6 +6,7 @@ import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.enums.SellMethodEnum;
 import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -113,6 +114,12 @@ public class TradeOrderDO extends TenantBaseDO {
      */
     private String remark;
 
+    private String linkMan;
+
+    private String linkMobile;
+
+    private String linkEmail;
+
     /**
      * 携程需要的
      */

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

@@ -767,6 +767,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setShipId(orderCreateReqDTO.getShipId());
         tradeOrderDO.setDiscountId(orderCreateReqDTO.getDicountId());
         tradeOrderDO.setCurrency(orderCreateReqDTO.getCurrency());
+        tradeOrderDO.setLinkMan(orderCreateReqDTO.getLinkMan());
+        tradeOrderDO.setLinkMobile(orderCreateReqDTO.getLinkMobile());
+        tradeOrderDO.setLinkEmail(orderCreateReqDTO.getLinkEmail());
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {
             if (tradeOrderDO.getSellMethod() == 7) {

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

@@ -225,6 +225,12 @@
         <if test="vo.memberId != null and vo.memberId != ''">
             AND td.member_id = #{vo.memberId}
         </if>
+        <if test="vo.voyageId != null and vo.voyageId != ''">
+            AND td.voyage_id = #{vo.voyageId}
+        </if>
+        <if test="vo.shipId != null and vo.shipId != ''">
+            AND td.ship_id = #{vo.shipId}
+        </if>
         <if test="vo.dispatchStatus != null">
             AND td.dispatch_status = #{vo.dispatchStatus}
         </if>