下单新增其它费用

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

@@ -81,6 +81,12 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Length(max = 120,message = "备注不能超过120个字符")
     private String remark;
 
+    @Schema(description = "其它费用", example = "1")
+    private BigDecimal otherAmount;
+
+    @Schema(description = "其它费用备注", example = "xx游客岁数较大")
+    private String otherRemark;
+
     @Schema(description = "携程需要参数，其他情况忽略", example = "")
     private String itemId;
 

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

@@ -67,6 +67,13 @@ public class TradeOrderOtcCreateVO {
 
     @Schema(description = "订单总额-前端修改")
     private BigDecimal realAmount;
+
+    @Schema(description = "其它费用")
+    private BigDecimal otherAmount;
+
+    @Schema(description = "其它费用说明")
+    private String otherRemark;
+
     @Schema(description = "国籍数据")
     List<TradeOrderCountryReqVO> countryData;
 

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

@@ -83,6 +83,15 @@ public class TradeOrderTotalVO {
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
 
+    @Schema(description = "订单总额")
+    private BigDecimal realMoney;
+
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;
+
+    @Schema(description = "订单总额")
+    private BigDecimal otherMoney;
+
+    @Schema(description = "订单总额")
+    private String otherRemark;
 }

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

@@ -1,6 +1,7 @@
 package com.yc.ship.module.trade.dal.dataobject.order;
 
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -81,4 +82,10 @@ public class TradeOrderTotalDO extends TenantBaseDO {
      */
     private BigDecimal orderMoney;
 
+    private BigDecimal realMoney;
+
+    private BigDecimal otherMoney;
+
+    private String otherRemark;
+
 }

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

@@ -2231,6 +2231,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
         Long orderId = result.getCheckedData().getOrderId();
         tradeOrderTotalDO.setOrderId(orderId);
+        tradeOrderTotalDO.setOtherRemark(createVO.getOtherRemark());
+        tradeOrderTotalDO.setRealMoney(createVO.getRealAmount());
+        tradeOrderTotalDO.setOtherMoney(createVO.getOtherAmount());
         tradeOrderTotalMapper.insert(tradeOrderTotalDO);
 
         //创建订单国籍数据
@@ -2452,6 +2455,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
 //        Long orderId  = result.getCheckedData().getOrderId();
         tradeOrderTotalDO.setOrderId(orderId);
+        tradeOrderTotalDO.setOtherRemark(createVO.getOtherRemark());
+        tradeOrderTotalDO.setRealMoney(createVO.getRealAmount());
+        tradeOrderTotalDO.setOtherMoney(createVO.getOtherAmount());
         tradeOrderTotalMapper.insertOrUpdate(tradeOrderTotalDO);
 
         //创建订单房型数据