Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

@@ -13,4 +13,6 @@ public class OrderPriceVO {
     public BigDecimal goodsAmount;
     @ApiModelProperty(value = "实际价格")
     public BigDecimal realAmount;
+    @ApiModelProperty(value = "优惠券扣除的费用")
+    public BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

@@ -33,6 +33,4 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafePrice;
     @ApiModelProperty(value = "费用详情")
     private String costDetail;
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/TourPriceVO.java

@@ -53,8 +53,4 @@ public class TourPriceVO extends OrderPriceVO{
     //总人数
     @ApiModelProperty(value = "总人数")
     private Integer totalNumber;
-
-    //优惠券
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -169,6 +169,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         opv.setOrderAmount(orderAmount);
         opv.setGoodsAmount(goodsAmount);
         opv.setRealAmount(realAmount);
+        opv.setCouponAmount(couponAmount);
 
         return opv;
     }