Merge remote-tracking branch 'origin/main' into main

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

@@ -62,6 +62,9 @@ public class TouristExportVisitorVO {
     @Schema(description = "入住类型（房型描述）")
     private String roomDescription;
 
+    @Schema(description = "用房数")
+    private String typeName;
+
     // ==================== 游客详情 ====================
     @Schema(description = "游客姓名")
     private String name;

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

@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
  * 游客 DO
@@ -191,4 +192,13 @@ public class TradeVisitorDO extends TenantBaseDO {
     @Schema(description = "是否具备同住关系", example = "")
     @TableField(exist = false)
     private Integer isHaveTogethers;
+
+
+    @Schema(description = "价格", example = "")
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    @Schema(description = "价格", example = "")
+    @TableField(exist = false)
+    private BigDecimal actualPrice;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/orderjzdetail/OrderJzDetailServiceImpl.java

@@ -133,7 +133,7 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
         Long id = null;
         String productId = "2034192879786524673";
         String method = "createOrder";
-        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/212/" + method;
+        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/zshl/212/" + method;
         String userId = "67fd6a5e6a2a453a98f288b08d571234";
         String userKey = "TFD9BEOK";
         String bookname = "";
@@ -212,7 +212,7 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
 
     private void paySupplierJz(String supplierOrderId, Long jzId,List<OrderJzDetailSaveReqVO> createReqVOList) throws Exception {
         String method = "payOrder";
-        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/212/" + method;
+        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/zshl/212/" + method;
         String userId = "67fd6a5e6a2a453a98f288b08d571234";
         String userKey = "TFD9BEOK";
         JSONObject rep_body = new JSONObject();
@@ -272,7 +272,7 @@ public class OrderJzDetailServiceImpl implements OrderJzDetailService {
 
     private void cancelSupplierJz(List<Long> visitorIds, Long jzId,List<OrderJzDetailSaveReqVO> createReqVOList) throws Exception {
         String method = "cancelTicket";
-        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/212/" + method;
+        String createOrderUrl = "http://10.3.10.50/app-api/travelhub-ops-trade/trade/ota/zshl/212/" + method;
         String userId = "67fd6a5e6a2a453a98f288b08d571234";
         String userKey = "TFD9BEOK";
         List<OrderJzDetailDO> jzDetailList = orderJzDetailMapper.selectList(new QueryWrapper<OrderJzDetailDO>().in("visitor_id", visitorIds));

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

@@ -1990,7 +1990,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             Long discountId = summary.getDiscountId();
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
             shipTradeOrderCreateReqVO.setPayAmount(realAmount);
-            if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) || !Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount())) {
+            if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) || shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0) {
                 shipTradeOrderCreateReqVO.setConfirmType(1);
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
                 tradeOrderBindDO.setId(IdWorker.getId());
@@ -1999,7 +1999,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderBindDO.setCustom("");
                 tradeOrderBindDO.setRemark("modify订单金额修改，订单金额：" + orderMoney + "，订单修改后实际金额：" + realAmount);
                 shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
-            } else if (createVO.getSummary().getDeposi() != null && !Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi())) {
+            } else if (createVO.getSummary().getDeposi() != null && shipTradeOrderCreateReqVO.getDeposi().compareTo(tradeOrderDO.getDeposi())!=0) {
                 shipTradeOrderCreateReqVO.setConfirmType(1);
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
                 tradeOrderBindDO.setId(IdWorker.getId());
@@ -2235,7 +2235,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 2;
                 desc = "政策优惠提交，订单进入二级审核";
             }
-            if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() == null) {
+            if (shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0 && loginUser.getDistributorId() == null) {
                 auditType = 3;
                 desc = "平台修改订单金额发生变化，订单进入三级审核";
             }
@@ -2245,11 +2245,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 3;
                 desc = "平台修改定金金额，订单进入三级审核";
             }
-            if (!Objects.equals(oldleaderAmount, leaderAmount) || !Objects.equals(oldwithAmount, withAmount) || !Objects.equals(oldotherMoney, otherMoney)) {
+            if (oldleaderAmount.compareTo(leaderAmount)!=0 || oldwithAmount.compareTo(withAmount)!=0 || oldotherMoney.compareTo(otherMoney)!=0) {
                 auditType = 4;
                 desc = "领队陪同修改，订单进入四级审核";
             }
-            if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() != null) {
+            if (shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0 && loginUser.getDistributorId() != null) {
                 auditType = 4;
                 desc = "分销商修改订单金额发生变化，订单进入四级审核";
             }
@@ -2949,6 +2949,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             String adultNum = headInfo.get("adultNum") != null ? headInfo.get("adultNum").toString() :"0";
             // 儿童数
             String childBabyNum = headInfo.get("childBabyNum") != null ? headInfo.get("childBabyNum").toString() :"0";
+            // 婴儿数
+            String babyNum = headInfo.get("babyNum") != null ? headInfo.get("babyNum").toString() :"0";
             // 陪同数
             String withNum = headInfo.get("withNum") != null ? headInfo.get("withNum").toString() :"0";
             // 领队数
@@ -2972,6 +2974,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         personNumBuilder.append(childBabyNum).append(" 儿童");
                         hasContent = true;
                     }
+                    if (StringUtils.isNotEmpty(babyNum)) {
+                        if (hasContent) {
+                            personNumBuilder.append("/");
+                        }
+                        personNumBuilder.append(babyNum).append(" 婴儿");
+                        hasContent = true;
+                    }
                     if (StringUtils.isNotEmpty(leaderNum)) {
                         if (hasContent) {
                             personNumBuilder.append("/");
@@ -3243,7 +3252,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             if (sb.length() > 0) {
                 sb.append("/");
             }
-            sb.append(entry.getValue()).append("个").append(getPersonTypeDes1(entry.getKey()));
+            long count = roomVisitors.stream().filter(e -> "成人拼房".equals(e.getTypeName())).count();
+            if(count > 0) {
+                sb.append("成人拼房");
+            } else {
+                sb.append(entry.getValue()).append("个").append(getPersonTypeDes1(entry.getKey()));
+            }
+
         }
 
         return sb.toString();

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

@@ -228,6 +228,8 @@
         <result property="floor" column="floor"/>
         <result property="area" column="area"/>
         <result property="vid" column="vid"/>
+        <result property="price" column="vprice"/>
+        <result property="actualPrice" column="vactualPrice"/>
 
     </resultMap>
 
@@ -265,7 +267,7 @@
 
     <select id="getOrderIdDetail" resultMap="MiddleWareDtoResultMap">
         SELECT td.*,tv.detail_id,tv.name,tv.id visitorId,tv.gender,tv.credential_no,tv.age,tv.birthday,tv.nationality,tv.cohabitation,tv.room_id,tv.in_date,tv.out_date,tv.remark,tv.init_room_id,tv.final_room_id,tv.type,
-        tv.credential_type, tv.mobile,tv.ota_detail_id,tv.is_insure,tv.room_index_id,tv.room_model_id,tv.floor,tv.vid,pc.full_path_name,p.product_tag,p.product_tag2, a.name nationalityName
+        tv.credential_type, tv.mobile,tv.ota_detail_id,td.actual_price vactualPrice,td.price vprice,tv.is_insure,tv.room_index_id,tv.room_model_id,tv.floor,tv.vid,pc.full_path_name,p.product_tag,p.product_tag2, a.name nationalityName
         FROM trade_detail td
         left join product_spu p on p.id = td.product_id
         left join product_category pc on pc.id = p.category_id

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

@@ -195,6 +195,7 @@
             SUM(a.num2) AS childBabyNum,
             SUM(a.num3) AS withNum,
             SUM(a.num4) AS leaderNum,
+            SUM(a.num5) AS babyNum,
             SUM(a.payAmount) AS totalPayAmount,
             SUM(a.actual_amount) AS totalActualAmount,
             SUM(a.deposi) as deposi,
@@ -265,11 +266,12 @@
         FROM (
             SELECT
             COUNT(1) AS num,
-            SUM(CASE WHEN tv.type IN ('adultPlus', 'adultTake') THEN 1 ELSE 0 END) AS num1,
-            SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake','childTake','childPlus','childNonTake') THEN 1 ELSE 0 END) AS num2,
+            SUM(CASE WHEN tv.type IN ('adultPlus', 'adultTake') or tv.type IS NULL or tv.type = '' THEN 1 ELSE 0 END) AS num1,
+            SUM(CASE WHEN tv.type IN ('childTake','childPlus','childNonTake') THEN 1 ELSE 0 END) AS num2,
             SUM(CASE WHEN tv.type = 'with' THEN 1 ELSE 0 END) AS num3,
             SUM(CASE WHEN tv.type = 'leader' THEN 1 ELSE 0 END) AS num4,
-            td.pay_amount AS payAmount,
+        SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake') THEN 1 ELSE 0 END) AS num5,
+        td.pay_amount AS payAmount,
             td.deposi,
             IFNULL(topay.actual_amount, 0) AS actual_amount
             FROM trade_order td

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

@@ -266,6 +266,7 @@
             tor.deposi,
             tv.room_index_id AS roomIndexId,
             torm.room_model_name AS roomType,
+            pprmt.type_name  AS typeName ,
             tv.name,
             tv.gender,
             tv.birthday,
@@ -290,6 +291,7 @@
         left JOIN product_spu ps on ps.id = td.product_id
         left join trade_order_pay top ON top.order_id = tor.id and top.deleted = 0 and top.pay_status = 1
         left Join trade_order_jz tjz on tjz.order_id = tor.id
+        left Join product_price_room_model_type pprmt on torm.room_model_type_id = pprmt.id
 
         WHERE tv.deleted = 0