代码优化，下单旅行社折扣

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

@@ -50,6 +50,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @NotNull(message = "支付金额不能为空")
     private BigDecimal payAmount;
 
+    @Schema(description = "折扣ID")
+    private Long dicountId;
+
     @Schema(description = "订单联系信息", example = "")
     @NotNull(message = "联系人信息不能为空")
     private OrderUser orderUser;

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

@@ -260,6 +260,9 @@ public class TradeOrderRespVO {
     @Schema(description = "门店ID")
     private Long storeId;
 
+    @Schema(description = "折扣ID")
+    private Long discountId;
+
     @Schema(description = "门店名称")
     @ExcelProperty("门店名称")
     private String storeName;

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

@@ -74,9 +74,15 @@ public class TradeOrderTotalVO {
      */
     @Schema(description = "代收服务费")
     private BigDecimal collectionServiceMoney;
+
+    @Schema(description = "折扣")
+    private Long dicountId;
     /**
      * 订单总额
      */
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
+
+    @Schema(description = "实际总额")
+    private BigDecimal realOrderMoney;
 }

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

@@ -252,6 +252,10 @@ public class TradeOrderDO extends TenantBaseDO {
      * 游轮ID
      */
     private Long shipId;
+    /**
+     * 折扣ID
+     */
+    private Long discountId;
 
 
     /**

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

@@ -729,6 +729,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setGroupNo(orderCreateReqDTO.getGroupNo());
         tradeOrderDO.setVoyageId(orderCreateReqDTO.getVoyageId());
         tradeOrderDO.setShipId(orderCreateReqDTO.getShipId());
+        tradeOrderDO.setDiscountId(orderCreateReqDTO.getShipId());
         tradeOrderDO.setCurrency(orderCreateReqDTO.getCurrency());
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {

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

@@ -2223,6 +2223,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
         shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getOrderMoney());
+        shipTradeOrderCreateReqVO.setDicountId(createVO.getSummary().getDicountId());
+        if(createVO.getSummary().getRealOrderMoney()!=null) {
+            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealOrderMoney());
+        }
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
         orderUser.setContactName(createVO.getLinkMan());
         orderUser.setMobile(createVO.getLinkMobile());