Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-19 a768dc3daa04d35fedfbe75c0a59b9b2545b85c4

 src/main/java/com/mzl/flower/dto/response/payment/OrderDTO.java

@@ -139,4 +139,29 @@

    @ApiModelProperty(value = "积分商品列表")
    private List<OrderPointGoodsListDTO> pointGoodsList;

    @ApiModelProperty(value = "优惠券编码")
    private String memberCouponCode;

    @ApiModelProperty(value = "优惠券名称")
    private String memberCouponName;

    @ApiModelProperty(value = "优惠券金额")
    private BigDecimal memberCouponAmount;

    @ApiModelProperty(value = "会员等级名称")
    private String memberName;

    @ApiModelProperty(value = "折扣类型（discount_type）")
    @DictTrans(target = "memberDiscountTypeStr", codeType = "DISCOUNT_TYPE")
    private String memberDiscountType;
    private String memberDiscountTypeStr;

    @ApiModelProperty(value = "会员折扣")
    private BigDecimal memberDiscountRatio;

    @ApiModelProperty(value = "优惠金额（每扎）")
    private BigDecimal memberDiscountAmount;

    private List<OrderItemListDTO> items;
}