src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java
@@ -1,6 +1,5 @@ package com.mzl.flower.dto.request.menber; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -56,4 +55,8 @@ @NotNull private String pictures; @ApiModelProperty(value = "会员成长值获取规则") @NotNull private String growthValueDesc; } src/main/java/com/mzl/flower/dto/request/menber/TargetMemberDTO.java
@@ -29,5 +29,8 @@ @ApiModelProperty("会员折扣百分比") private BigDecimal targetDiscountRatio; @ApiModelProperty("折扣类型Str") private String targetGrowthValueDesc; } src/main/java/com/mzl/flower/dto/request/menber/UserGrowthRecordDTO.java
@@ -26,6 +26,9 @@ @ApiModelProperty("会员折扣百分比") private BigDecimal currentDiscountRatio; @ApiModelProperty("会员成长值获取规则") private String currentGrowthValueDesc; List<TargetMemberDTO> targetMemberInfos; } src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -57,4 +56,7 @@ @ApiModelProperty("图片") private String pictures; @ApiModelProperty(value = "会员成长值获取规则") private String growthValueDesc; } src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -1,12 +1,10 @@ package com.mzl.flower.entity.menber; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.mzl.flower.base.BaseAutoEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; /** @@ -52,4 +50,8 @@ @ApiModelProperty("图片") private String pictures; @ApiModelProperty(value = "会员成长值获取规则") private String growthValueDesc; } src/main/java/com/mzl/flower/service/menber/impl/MemberGrowthRecordServiceImpl.java
@@ -160,6 +160,7 @@ } userGrowthRecordDTO.setCurrentDiscountRatio(StringUtils.isEmpty(member.getDiscountRatio()) ? BigDecimal.valueOf(100) : member.getDiscountRatio()); userGrowthRecordDTO.setCurrentDiscountAmount(StringUtils.isEmpty(member.getDiscountAmount()) ? BigDecimal.ZERO : member.getDiscountAmount()); userGrowthRecordDTO.setCurrentGrowthValueDesc(member.getGrowthValueDesc()); //查询比当前等级高的会员等级信息 List<Member> memberList = memberMapper.getgtMembersByGrowthValue(sumGrowth); if (!CollectionUtils.isEmpty(memberList)) { @@ -179,6 +180,7 @@ break; } targetMemberDTO.setTargetDiscountRatio(StringUtils.isEmpty(m.getDiscountRatio()) ? BigDecimal.valueOf(100) : m.getDiscountRatio()); targetMemberDTO.setTargetGrowthValueDesc(m.getGrowthValueDesc()); targetMemberDTOList.add(targetMemberDTO); }); }