From 2c1415e6c7bf6837cb24768770b10821853a6341 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 14 一月 2026 17:14:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 6044b72..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
@@ -77,6 +77,8 @@
@ApiModelProperty(value = "浜ゆ槗鍗曞彿")
private String orderCode;
+ @ApiModelProperty(value = "鐢ㄦ埛绫诲瀷锛�0=娑堣垂鑰咃紱1=缁忛攢鍟嗭紱")
+ private Integer userType;
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
@ExcelColumn(name="鐢ㄦ埛",index =1,width = 10)
@@ -111,18 +113,18 @@
- 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;
- }
+// 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