xiaoyong931011
2023-09-11 c992c20655a3c582ed7395b4baf41be21f4e5d9d
优惠卷
4 files modified
19 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberCouponVo.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberCouponMapper.xml 5 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
@@ -44,6 +44,9 @@
    @ApiModelProperty(value = "会员优惠卷ID")
    private Long memberCouponId;
    @ApiModelProperty(value = "业绩所属邀请码")
    private String memberInviteId;
    @ApiModelProperty(value = "商品明细")
    private List<AddOrderItemDto> items;
src/main/java/cc/mrbird/febs/mall/vo/MallMemberCouponVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "MallMemberCouponVo", description = "商城商品列表")
public class MallMemberCouponVo {
@@ -24,4 +26,10 @@
    @ApiModelProperty(value = "1:待使用 2:已使用 3:已过期")
    private Integer state;
    @ApiModelProperty(value = "满足金额")
    private BigDecimal costAmount;
    @ApiModelProperty(value = "减免金额")
    private BigDecimal realAmount;
}
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -92,4 +92,7 @@
    @ApiModelProperty(value = "足迹数量")
    private Integer childCnt;
    @ApiModelProperty(value = "是否是推销员")
    private Integer isSale;
}
src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -4,8 +4,11 @@
    <select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
        select
        a.*
        a.*,
               b.cost_amount costAmount,
               b.real_amount realAmount
        from mall_member_coupon a
        left join mall_goods_coupon b on b.id = a.coupon_id
        <where>
            a.member_id=#{record.memberId}
            <if test="record.state != null and record.state != ''">