From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
index c56170e..09091ee 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
@@ -1,16 +1,14 @@
package com.doumee.dao.business.model;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 浼樻儬鍒镐俊鎭〃
@@ -65,22 +63,23 @@
@ExcelColumn(name="婊￠锛堝厓锛�")
private BigDecimal limitPrice;
- @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
- @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�")
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�/鎶樻墸姣斾緥", example = "1")
+ @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�/鎶樻墸姣斾緥")
private BigDecimal price;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
-
+ @TableField(fill = FieldFill.UPDATE)
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
-
+ @TableField(fill = FieldFill.UPDATE)
private Date endDate;
@ApiModelProperty(value = "棰嗗彇鍚庢湁鏁堝ぉ鏁�", example = "1")
@ExcelColumn(name="棰嗗彇鍚庢湁鏁堝ぉ鏁�")
+ @TableField(fill = FieldFill.UPDATE)
private Integer validDays;
@ApiModelProperty(value = "棰嗗彇鏂瑰紡 0棰嗗彇 1鍏戞崲", example = "1")
@@ -97,7 +96,7 @@
@ApiModelProperty(value = "鍙戞斁鎬婚噺", example = "1")
@ExcelColumn(name="鍙戞斁鎬婚噺")
- private Integer num;
+ private Long num;
@ApiModelProperty(value = "璇存槑")
@ExcelColumn(name="璇存槑")
@@ -106,6 +105,24 @@
@ApiModelProperty(value = "浼樻儬鍒稿悕绉�")
@ExcelColumn(name="浼樻儬鍒稿悕绉�")
private String name;
+
+
+ @ApiModelProperty(value = "浣跨敤绫诲瀷锛�0=鍥哄畾鏃舵锛�1=鍥哄畾鏃堕暱锛�")
+ private Integer useType;
+
+ @ApiModelProperty(value = "浼樻儬鍒哥被鍨嬶細0=婊″噺鍒革紱1=鎶樻墸鍒革紱")
+ private Integer couponType;
+
+ @ApiModelProperty(value = "閫傜敤绫诲瀷锛�0=鍏ㄥ満;1=鍝佺被锛�2=鎸囧畾鍟嗗搧")
+ private Integer applyType;
+
+ @ApiModelProperty(value = "閫傜敤鍏宠仈瀵硅薄淇℃伅涓婚敭,澶氫釜鑻辨枃閫楀彿闅斿紑")
+ private String applyIds;
+
+ @ApiModelProperty(value = "鎶樻墸鍗锋弧鍑忎笂闄愰噾棰�")
+ private BigDecimal maxPrice;
+
+
@ApiModelProperty(value = "搴楅摵鍚嶇О")
@ExcelColumn(name="搴楅摵鍚嶇О")
@@ -127,8 +144,10 @@
@ApiModelProperty(value = "鏈娇鐢ㄦ暟閲�", example = "1")
@TableField(exist = false)
private Integer unused;
-
-
-
-
+ @ApiModelProperty(value = "閫傜敤鍏宠仈瀵硅薄淇℃伅涓婚敭,澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @TableField(exist = false)
+ private List<Integer> applyIdList;
+ @ApiModelProperty(value = "閫傜敤鍏宠仈鍝佺被淇℃伅涓婚敭,澶氫釜鑻辨枃閫楀彿闅斿紑")
+ @TableField(exist = false)
+ private List<Integer> applyCateIdList;
}
--
Gitblit v1.9.3