From 666a942f5f2b59209cf422bb202f6548fbbe212e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 15:58:32 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 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..91b9fc5 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
@@ -31,7 +31,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿" ,index = 8,width = 10)
+ @ExcelColumn(name="浜ゆ槗鏃堕棿" ,index =1,width = 10)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -54,7 +54,7 @@
private String title;
@ApiModelProperty(value = "鍐呭")
- @ExcelColumn(name="鏀舵敮璇存槑",index =7,width = 10)
+ @ExcelColumn(name="浜ゆ槗璇存槑",index =7,width = 10)
private String content;
@ApiModelProperty(value = "瀵硅薄缂栫爜 0骞冲彴娉ㄥ唽 1绛惧埌 2鍒嗕韩閭�璇� 3閭�璇锋柊鐢ㄦ埛 4鍏戞崲鍟嗗搧", example = "1")
@@ -64,22 +64,25 @@
private Integer objType;
@ApiModelProperty(value = "鏀舵敮绫诲瀷 0鏀跺叆 1鏀嚭", example = "1")
+ @ExcelColumn(name="鏀舵敮绫诲瀷",index =2,width = 10,valueMapping = "0=鏀跺叆;1=鏀嚭;")
private Integer type;
@ApiModelProperty(value = "鏁伴噺", example = "1")
- @ExcelColumn(name="鏀舵敮閲戦",index =4,width = 10)
+ @ExcelColumn(name="鏀舵敮閲戦(鍏�)",index =3,width = 10)
private BigDecimal num;
@ApiModelProperty(value = "褰撳墠浣欓", example = "1")
- @ExcelColumn(name="褰撳墠浣欓",index =5,width = 10)
+ @ExcelColumn(name="褰撳墠浣欓(鍏�)",index =4,width = 10)
private BigDecimal totalNum;
@ApiModelProperty(value = "浜ゆ槗鍗曞彿")
+ @ExcelColumn(name="鍏宠仈璁㈠崟鍙�",index =6,width = 10)
private String orderCode;
+ @ApiModelProperty(value = "鐢ㄦ埛鏁版嵁绫诲瀷锛�0=娑堣垂鑰呯Н鍒嗭紱1=缁忛攢鍟嗙Н鍒嗭紱2=缁忛攢鍟嗙粨绠楅噾棰濓紱")
+ private Integer userType;
@ApiModelProperty(value = "鐢ㄦ埛鏄电О")
- @ExcelColumn(name="鐢ㄦ埛",index =1,width = 10)
@TableField(exist = false)
private String nickName;
@@ -89,13 +92,7 @@
@ApiModelProperty(value = "鐢ㄦ埛鎵嬫満鍙�")
@TableField(exist = false)
- @ExcelColumn(name="鎵嬫満鍙�",index =2,width = 10)
private String phone;
-
- @TableField(exist = false)
- @ExcelColumn(name="鏀舵敮绫诲瀷",index =3,width = 10)
- private String strType;
-
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
@@ -106,23 +103,23 @@
private Date endtime;
@TableField(exist = false)
- @ExcelColumn(name="绫诲瀷",index =6,width = 10)
+ @ExcelColumn(name="浜ゆ槗绫诲瀷",index =5,width = 10)
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;
- }
+// 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