hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-08-18 04:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop

Browse Source
This commit is contained in:
YunaiV
2024-09-02 12:27:03 +08:00
parent eaeeb34e74 87adf15a93
commit 39f71168eb
70 changed files with 1554 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
View File

@@ -33,6 +33,9 @@ public class CouponTemplateBaseVO {
@NotNull(message = "优惠劵名不能为空")
private String name;
@Schema(description = "优惠券说明", example = "优惠券使用说明")
private String description;
@Schema(description = "发行总量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") // -1 - 则表示不限制发放数量
@NotNull(message = "发行总量不能为空")
private Integer totalCount;

6
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/template/AppCouponTemplateRespVO.java
View File

@@ -1,8 +1,5 @@
package cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.template;
import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -20,6 +17,9 @@ public class AppCouponTemplateRespVO {
@Schema(description = "优惠劵名", requiredMode = Schema.RequiredMode.REQUIRED, example = "春节送送送")
private String name;
@Schema(description = "优惠券说明", example = "优惠券使用说明")
private String description;
@Schema(description = "每人限领个数", requiredMode = Schema.RequiredMode.REQUIRED, example = "66") // -1 - 则表示不限制
private Integer takeLimitCount;

6
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/coupon/CouponTemplateDO.java
View File

@@ -40,6 +40,10 @@ public class CouponTemplateDO extends BaseDO {
* 优惠劵名
*/
private String name;
/**
* 优惠券说明
*/
private String description;
/**
* 状态
*
@@ -158,9 +162,9 @@ public class CouponTemplateDO extends BaseDO {
* 使用优惠券的次数
*/
private Integer useCount;
// ========== 统计信息 END ==========
// TODO 芋艿：领取开始时间、领取结束时间
// TODO 芋艿：要不要加描述
}