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

gongzuming

2024-09-02 a92e296c28d4c09055f53293378da001117ec979

 src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateVipController.java

@@ -10,9 +10,11 @@
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVipVO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
import com.mzl.flower.entity.menber.Member;
import com.mzl.flower.enums.CouponCategoryEnum;
import com.mzl.flower.enums.CouponTypeEnum;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.service.menber.MemberService;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,6 +39,9 @@

    @Autowired
    CouponTemplateService2 couponTemplateService;

    @Autowired
    MemberService memberService;

    @PostMapping("")
    @ApiOperation(value = "新增", notes = "新增")
@@ -121,6 +126,12 @@

    private void valid(CreateCouponTemplateVipDTO dto){

        final Member member = memberService.getById(dto.getMemberId());

        if(null==member){
            throw new ValidationException("会员等级不存在");
        }

        if (StringUtils.isNotBlank(dto.getCouponDiscountType())
                && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
                && dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0) {