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/Notice.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
index 5d98785..0fee836 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Notice.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -80,12 +81,12 @@
@ExcelColumn(name="瀵硅薄缂栫爜")
private Integer objId;
- @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍜栬眴璁㈠崟 銆佸晢鍩庛�佸挅鍟¤鍒掕鍗� 1娲诲姩銆佹帰搴椼�佽祫璁� 2娲诲姩鎺㈠簵璧勮璇勮", example = "1")
- @ExcelColumn(name="瀵硅薄绫诲瀷 0鍜栬眴璁㈠崟 銆佸晢鍩庛�佸挅鍟¤鍒掕鍗� 1娲诲姩銆佹帰搴椼�佽祫璁� 2娲诲姩鎺㈠簵璧勮璇勮")
+ @ApiModelProperty(value = "瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅", example = "1")
+ @ExcelColumn(name="瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅")
private Integer objType;
- @ApiModelProperty(value = "娑堟伅绫诲瀷 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞", example = "1")
- @ExcelColumn(name="娑堟伅绫诲瀷 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞")
+ @ApiModelProperty(value = "娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅", example = "1")
+ @ExcelColumn(name="娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅")
private Integer type;
@ApiModelProperty(value = "鐘舵�� 0鏈 1宸茶", example = "1")
@@ -104,4 +105,27 @@
@TableField(exist = false)
private Integer shopId;
+ @ApiModelProperty(value = "鏌ヨ绫诲瀷锛�0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅锛�", example = "1")
+ @TableField(exist = false)
+ private Integer queryType;
+
+
+
+ public Notice notice(Constants.NoticeType noticeType,Integer memberId,Integer objId){
+ Notice notice = new Notice();
+ notice.setCreateDate(new Date());
+ notice.setIsdeleted(Constants.ZERO);
+ notice.setMemberId(memberId);
+ notice.setTitle(noticeType.getTitle());
+ notice.setContent(noticeType.getContent());
+ notice.setType(noticeType.getNoticeType());
+ notice.setObjId(objId);
+ notice.setObjType(noticeType.getObjType());
+
+
+ return notice;
+ }
+
+
+
}
--
Gitblit v1.9.3