From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java
index 5a03b7f..e770a0e 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.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;
@@ -76,6 +77,8 @@
@ApiModelProperty(value = "浜ゆ槗鍗曞彿")
private String orderCode;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=娑堣垂鑰咃紱1=缁忛攢鍟嗭紱")
+ private Integer userType;
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@ExcelColumn(name="鐢ㄦ埛",index =1,width = 10)
@@ -109,4 +112,19 @@
private String strObjType;
+
+// public static Integral createIntegral(Integer memberId, Constants.INTEGRAL_TYPE integralType,Integer objId){
+// Integral integral = new Integral();
+// integral.setCreator(memberId);
+// integral.setCreateDate(new Date());
+// integral.setIsdeleted(Constants.ZERO);
+// integral.setMemberId(memberId);
+// integral.setTitle(integralType.getName());
+// integral.setObjId(objId);
+// integral.setObjType(integralType.getKey());
+// integral.setType(integralType.getType());
+//
+// return integral;
+// }
+
}
--
Gitblit v1.9.3