From 0e64826473e7074b1cd9920e573c5b0472003fa9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 十二月 2025 16:01:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 16 ++++++++++++++++
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 2 ++
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java | 22 ++++++++++++++++++++--
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index 4b0873a..b6c6489 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -15,6 +15,8 @@
public static final int ZERO = 0 ;
public static final int ONE = 1 ;
public static final int TWO = 2 ;
+ public static final int THREE = 3 ;
+ public static final int FOUR = 4 ;
/**
* mq tag
*/
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..2b6990b 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
@@ -65,8 +65,8 @@
@ExcelColumn(name="婊￠锛堝厓锛�")
private BigDecimal limitPrice;
- @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
- @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�")
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�/鎶樻墸姣斾緥", example = "1")
+ @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�/鎶樻墸姣斾緥")
private BigDecimal price;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -107,6 +107,24 @@
@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="搴楅摵鍚嶇О")
@TableField(exist = false)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index 8d851f7..c3ed94b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -118,6 +118,22 @@
@ExcelColumn(name="涓�绾у垎绫�")
private String parentCategoryId;
+ @ApiModelProperty(value = "鎶垫墸姣斾緥锛�0.1%~100%锛�", example = "1")
+ private BigDecimal deductRata;
+
+
+ @ApiModelProperty(value = "sku閲戦", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal skuPrice;
+
+ @ApiModelProperty(value = "sku鎬婚噾棰�", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal skuAmount;
+
+ @ApiModelProperty(value = "skuId", hidden = true)
+ @TableField(exist = false)
+ private Integer skuId;
+
@ApiModelProperty(value = "鍟嗗搧杞挱鍥�", example = "1")
@TableField(exist = false)
private List<Multifile> fileList;
--
Gitblit v1.9.3