src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateActivyDTO.java
@@ -143,5 +143,10 @@ @Max(value = 99999999,message = "每人限领不能超过99999999") private Integer getLimit; /** * 优惠券图片 */ @ApiModelProperty(value = "优惠券图片") private String imageUrl; } src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateBO.java
@@ -133,17 +133,19 @@ */ private Integer point; /** * * 会员ID */ @ApiModelProperty(value = "会员等级") @NotEmpty(message = "会员等级不能为空") private Integer memberId; @ApiModelProperty(value = "指定的用户列表id") @NotNull(message = "指定的用户列表id不能为空") /** * 指定的用户的id */ private List<Long> pointCostomIdList; /** * 优惠券的图片 */ private String imageUrl; } src/main/java/com/mzl/flower/dto/response/coupon/CouponRecordResultVO.java
@@ -184,4 +184,7 @@ @ApiModelProperty(value = "优惠券种类名称") private String categoryName; @ApiModelProperty(value = "优惠券图片") private String imageUrl; } src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
@@ -176,4 +176,11 @@ @DateTimeFormat private LocalDateTime createTime; /** * 优惠券图片 */ @ApiModelProperty(value = "优惠券图片") private String imageUrl; } src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
@@ -136,4 +136,11 @@ private LocalDateTime effectiveEnd; /** * 优惠券图片 */ @ApiModelProperty(value = "优惠券图片") private String imageUrl; } src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
@@ -247,4 +247,7 @@ @DateTimeFormat private LocalDateTime createTime; @ApiModelProperty(value = "优惠券图片") private String imageUrl; } src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
@@ -104,4 +104,10 @@ */ private Integer memberId; /** * 优惠券图片 */ private String imageUrl; } src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java
@@ -135,8 +135,15 @@ */ private Integer point; @ApiModelProperty(value = "会员等级") /** * 会员等级 */ private Integer memberId; /** * 优惠券图片 */ private String imageUrl; } src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -144,7 +144,8 @@ couponRecordDO.setCouponDiscountType(couponTemplateDO.getCouponDiscountType()); couponRecordDO.setGetUserType(couponTemplateDO.getGetUserType()); couponRecordDO.setPoint(couponTemplateDO.getPoint()); couponRecordDO.setMemberId(couponRecordDO.getMemberId()); couponRecordDO.setMemberId(couponTemplateDO.getMemberId()); couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl()); // 根据优惠券模板来计算优惠券的生效开始时间和结束时间 @@ -276,6 +277,7 @@ couponRecordDO.setEffectiveStart(firstDayStart); couponRecordDO.setEffectiveEnd(lastDayEnd); couponRecordDO.setMemberId(couponTemplateDO.getMemberId()); couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl()); // 创建信息 couponRecordDO.create(); if(!checkCurMonVipCouponExists(couponRecordDO.getCouponId(),couponRecordDO.getCustomerId(),firstDayStart,lastDayEnd)){ src/main/java/com/mzl/flower/service/impl/coupon/CouponTemplateServiceImpl2.java
@@ -264,6 +264,7 @@ List<CouponRecordDO> couponUsageDOList = couponTemplateCustomerDOList.stream().map(pointCustomRe -> { CouponRecordDO couponRecordDO = new CouponRecordDO(); couponRecordDO.setId(IdUtil.simpleUUID()); couponRecordDO.setCouponId(pointCustomRe.getCouponId()); couponRecordDO.setCustomerId(pointCustomRe.getCustomId()); @@ -290,7 +291,8 @@ couponRecordDO.setCouponDiscountType(couponTemplateDO.getCouponDiscountType()); couponRecordDO.setGetUserType(couponTemplateDO.getGetUserType()); couponRecordDO.setPoint(couponTemplateDO.getPoint()); couponRecordDO.setMemberId(couponRecordDO.getMemberId()); couponRecordDO.setMemberId(couponTemplateDO.getMemberId()); couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl()); // 创建相关信息 couponRecordDO.create(SecurityUtils.getUserId()); src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java
@@ -11,10 +11,7 @@ import com.mzl.flower.dto.response.coupon.CouponTemplatePointVO; import com.mzl.flower.dto.response.coupon.CouponTemplateVO; import com.mzl.flower.entity.coupon.CouponTemplateDO; import com.mzl.flower.enums.CouponCategoryEnum; import com.mzl.flower.enums.CouponGetUserTypeEnum; import com.mzl.flower.enums.CouponTypeEnum; import com.mzl.flower.enums.CouponUsageTypeEnum; import com.mzl.flower.enums.*; import com.mzl.flower.service.coupon.CouponTemplateService2; import com.mzl.flower.utils.ConverterUtil; import io.swagger.annotations.Api; @@ -200,6 +197,16 @@ throw new ValidationException("领取后有效时间整数需要大于0"); } } // 用户获取的类型是首页领取的话 if(StringUtils.isNotBlank(dto.getGetType()) && dto.getGetType().equals(dto.getGetType().equals(CouponGetTypeEnum.HOME.getType())) ){ // 优惠券图片校验 if(StringUtils.isBlank(dto.getImageUrl())){ throw new ValidationException("优惠券图片不能为空"); } } } } src/main/resources/mapper/coupon/CouponRecordMapper.xml
@@ -25,6 +25,7 @@ <result column="coupon_name" property="couponName" /> <result column="point" property="point" /> <result column="image_url" property="imageUrl" /> </resultMap>
@@ -33,6 +33,7 @@ <result column="status" property="status" /> <result column="member_id" property="memberId" /> <result column="image_url" property="imageUrl" /> </resultMap>
