fix: 修改政策相关内容

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

@@ -14,7 +14,7 @@ public class TradeOrderPolicyReqVO {
     private Long policyId;
 
     @Schema(description = "名称")
-    private String name;
+    private String policyName;
 
     @Schema(description = "折扣")
     private BigDecimal discount;

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

@@ -2,6 +2,7 @@ package com.yc.ship.module.trade.controller.admin.order.vo.order;
 
 import com.yc.ship.module.trade.dal.dataobject.order.*;
 import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
+import com.yc.ship.module.trade.dal.dataobject.orderpolicy.OrderPolicyDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -30,4 +31,7 @@ public class TradeOrderVO {
     @Schema(description = "附加产品信息")
     private List<TradeDetailRespVO> tradeDetailDOList;
 
+    @Schema(description = "优惠政策信息")
+    private List<OrderPolicyDO> policyList;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/orderpolicy/OrderPolicyDO.java

@@ -68,4 +68,19 @@ public class OrderPolicyDO extends TenantBaseDO {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<String> rooms;
 
+    /**
+     * 优惠
+     */
+    private BigDecimal discount;
+
+    /**
+     * 优惠类型
+     */
+    private Integer discountType;
+
+    /**
+     * 使用数量
+     */
+    private BigDecimal useNum;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/orderpolicy/OrderPolicyMapper.java

@@ -32,4 +32,8 @@ public interface OrderPolicyMapper extends BaseMapperX<OrderPolicyDO> {
     default void deleteByOrderId(Long orderId) {
         delete(new LambdaQueryWrapperX<OrderPolicyDO>().eq(OrderPolicyDO::getOrderId, orderId));
     }
+
+    default List<OrderPolicyDO> selectByOrderId(Long orderId) {
+        return selectList(new LambdaQueryWrapperX<OrderPolicyDO>().eq(OrderPolicyDO::getOrderId, orderId));
+    }
 }

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

@@ -1783,6 +1783,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderPolicyDO.setOrderId(orderId);
                     orderPolicyDO.setOrderNo(orderNo);
                     orderPolicyDO.setPolicyId(policy.getPolicyId());
+                    orderPolicyDO.setPolicyName(policy.getPolicyName());
+                    orderPolicyDO.setDiscount(policy.getDiscount());
+                    orderPolicyDO.setDiscountType(policy.getDiscountType());
+                    orderPolicyDO.setUseNum(policy.getUseNum());
                     if (createVO.getIsYd() != null && createVO.getIsYd() == 1) {
                         orderPolicyDO.setPreUseNum(policy.getUseNum());
                         orderPolicyDO.setRealUseNum(BigDecimal.ZERO);
@@ -2193,6 +2197,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderPolicyDO.setOrderId(orderId);
                     orderPolicyDO.setOrderNo(orderNo);
                     orderPolicyDO.setPolicyId(policy.getPolicyId());
+                    orderPolicyDO.setPolicyName(policy.getPolicyName());
+                    orderPolicyDO.setDiscount(policy.getDiscount());
+                    orderPolicyDO.setDiscountType(policy.getDiscountType());
+                    orderPolicyDO.setUseNum(policy.getUseNum());
                     if (Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus()) || Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.UNPAID.getStatus())) {
                         orderPolicyDO.setRealUseNum(policy.getUseNum());
                         orderPolicyDO.setPreUseNum(BigDecimal.ZERO);
@@ -2330,6 +2338,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         List<TradeOrderRoomModelDO> roomModelDOList = tradeOrderRoomModelMapper.selectList(TradeOrderRoomModelDO::getOrderId, tradeOrderDO.getId());
         tradeOrderVO.setRoomModelList(roomModelDOList);
+
+        // 设置优惠政策列表
+        List<OrderPolicyDO> orderPolicyDOS = orderPolicyMapper.selectByOrderId(orderId);
+        tradeOrderVO.setPolicyList(orderPolicyDOS);
+
         return CommonResult.success(tradeOrderVO);
     }