Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -546,7 +546,7 @@ public class VoyageApiImpl implements VoyageApi{
             List<VoyageStockDetailDO> stockDetailList = voyageStockDetailMapper.selectListByVoyageId(voyageId);
             Map<String, BigDecimal> realNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getRealNum);
             Map<String, BigDecimal> VirtualNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getVirtualNum);
-            Map<String, BigDecimal> shareNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getShareNum);
+//            Map<String, BigDecimal> shareNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getShareNum);
             Map<String, BigDecimal> totalNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getRealNum().add(item.getVirtualNum()));
 
             stockDetailList.stream().forEach(item -> {

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/controller/admin/order/vo/order/TradeVistorReqVO.java

@@ -15,6 +15,9 @@ public class TradeVistorReqVO {
     @Schema(description = "游客姓名")
     private String name;
 
+    @Schema(description = "国籍")
+    private String nationality;
+
     @Schema(description = "性别")
     private Integer sex;
 

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/dal/dataobject/order/TradeVisitorDO.java

@@ -54,6 +54,12 @@ public class TradeVisitorDO extends TenantBaseDO {
      */
     @Schema(description = "证件号")
     private String credentialNo;
+
+    /**
+     * 国籍
+     */
+    @Schema(description = "国籍")
+    private String nationality;
     /**
      * 证件类型
      * 关联 {@link CredentialTypeEnum}

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) {
@@ -920,6 +923,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeVisitorDO.setCredentialType(visitor.getCredentialType());
                 tradeVisitorDO.setCredentialNo(visitor.getCredentialNo());
                 tradeVisitorDO.setDeleted(false);
+                tradeVisitorDO.setNationality(visitor.getNationality());
                 tradeVisitorDO.setRoomId(visitor.getRoomId());
                 tradeVisitorDO.setCreateTime(LocalDateTime.now());
                 tradeVisitorDOList.add(tradeVisitorDO);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/MeiTuanServiceImpl.java

@@ -373,7 +373,7 @@ public class MeiTuanServiceImpl implements MeiTuanService, OtaService {
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {
@@ -436,7 +436,7 @@ public class MeiTuanServiceImpl implements MeiTuanService, OtaService {
                 payOrderReqVO.setOrderId(tradeOrderDO.getId());
                 payOrderReqVO.setPayAmount(tradeOrderDO.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/OtaInnerServiceImpl.java

@@ -480,7 +480,7 @@ public class OtaInnerServiceImpl implements OtaInnerService {
             payOrderReqVO.setCanChangePayType(NO);
         }else {
             //预付款>授信
-            String[] payTypes = otaDistributeDTO.getPayType().split(",");
+            Object[] payTypes = otaDistributeDTO.getPayType().split(",");
             if(CollectionUtils.containsAny("1",payTypes)){
                 payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
             }else if(CollectionUtils.containsAny("2",payTypes)){

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/QuNaErServiceImpl.java

@@ -557,7 +557,7 @@ public class QuNaErServiceImpl implements QuNaErService {
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {
@@ -632,7 +632,7 @@ public class QuNaErServiceImpl implements QuNaErService {
                 payOrderReqVO.setOrderId(order.getId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/TiktokCalendarServiceImpl.java

@@ -1414,7 +1414,7 @@ public class TiktokCalendarServiceImpl implements TiktokCalendarService, OtaServ
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {
@@ -1554,7 +1554,7 @@ public class TiktokCalendarServiceImpl implements TiktokCalendarService, OtaServ
                 payOrderReqVO.setOrderId(order.getId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/TiktokLifeServiceImpl.java

@@ -549,7 +549,7 @@ public class TiktokLifeServiceImpl implements TiktokLifeService, OtaService {
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(tradeOrderCreateReqDTO.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/TongChengServiceImpl.java

@@ -398,7 +398,7 @@ public class TongChengServiceImpl implements TongChengService, OtaService {
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
+                Object[] payTypes = distributor.getPayType().split(",");
                 if (CollectionUtils.containsAny("1", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/XieChengServiceImpl.java

@@ -362,8 +362,8 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                 payOrderReqVO.setOrderId(tradeOrderRespDTO.getOrderId());
                 payOrderReqVO.setPayAmount(order.getPayAmount());
                 //预付款>授信
-                String[] payTypes = distributor.getPayType().split(",");
-                if (CollectionUtils.containsAny("1", payTypes)) {
+                Object[] payTypes = distributor.getPayType().split(",");
+                if (CollectionUtils.containsAny("1",  payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                 } else if (CollectionUtils.containsAny("2", payTypes)) {
                     payOrderReqVO.setPayType(PayTypeEnum.CREDIT_GRANTING.getType());

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/ZshlServiceImpl.java

@@ -721,7 +721,7 @@ public class ZshlServiceImpl implements ZshlService, OtaService {
                     payOrderReqVO.setOrderId(order.getId());
                     payOrderReqVO.setPayAmount(order.getPayAmount());
                     //预付款>授信
-                    String[] payTypes = distributor.getPayType().split(",");
+                    Object[] payTypes = distributor.getPayType().split(",");
                     if (CollectionUtils.containsAny("1", payTypes)) {
                         payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
                     } else if (CollectionUtils.containsAny("2", payTypes)) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otawindow/impl/OtaOrderServiceImpl.java

@@ -115,7 +115,7 @@ public class OtaOrderServiceImpl implements OtaOrderService {
         payOrderReqVO.setAccountType(PayAccountTypeEnum.OTA.getType());
         payOrderReqVO.setAccountName(distributorDO.getName());
         //预付款>授信
-        String[] payTypes = distributorDO.getPayType().split(",");
+        Object[] payTypes = distributorDO.getPayType().split(",");
         if(CollectionUtils.containsAny("1",payTypes)){
             payOrderReqVO.setPayType(PayTypeEnum.ADVANCE_PAYMENT.getType());
         }else if(CollectionUtils.containsAny("2",payTypes)){

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

@@ -2258,6 +2258,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setYczz(tradeVistorReqVO.getYichang());
             visitor.setCqzz(tradeVistorReqVO.getChongqing());
             visitor.setRoomId(tradeVistorReqVO.getRoomId());
+            visitor.setNationality(tradeVistorReqVO.getNationality());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);
@@ -2470,6 +2471,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setYczz(tradeVistorReqVO.getYichang());
             visitor.setCqzz(tradeVistorReqVO.getChongqing());
             visitor.setRoomId(tradeVistorReqVO.getRoomId());
+            visitor.setNationality(tradeVistorReqVO.getNationality());
             visitorList.add(visitor);
         }
         orderDetail.setVisitorList(visitorList);
@@ -2479,7 +2481,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
             ShipTradeOrderCreateReqVO.OrderDetail orderDetail1 = new ShipTradeOrderCreateReqVO.OrderDetail();
             //0 游船产品 1 附加产品 2：赠票
-            if(tradeSpuReqVO.getProductId()!=null && !tradeSpuReqVO.getVistorList().isEmpty()) {
+            if(tradeSpuReqVO.getProductId()!=null && tradeSpuReqVO.getVistorList()!=null && !tradeSpuReqVO.getVistorList().isEmpty()) {
                 orderDetail1.setProductType(1);
             }else if(tradeSpuReqVO.getProductId() != null) {
                 orderDetail1.setProductType(2);

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

@@ -250,7 +250,7 @@
         left join product_spu p on p.id = td.product_id
         left join product_category pc on pc.id = p.category_id
         inner JOIN trade_visitor tv on td.id = tv.detail_id
-        where 1= 1
+        where 1= 1 and td.deleted = 0 and tv.deleted=0
         <if test="orderId != null and orderId != ''">
             AND td.order_id = #{orderId}
         </if>

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>