From 81cf1e143db817a3ac7b9eb1f3042b766db1b14f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 06 六月 2024 16:15:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index ce6f995..3faa1ea 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -2,9 +2,6 @@
import lombok.Data;
-import lombok.ToString;
-
-import java.math.BigDecimal;
/**
* 淇敼鐢ㄦ埛璧勯噾
@@ -47,16 +44,20 @@
/**澶囨敞*/
private String remarks;
+ /**閲戦瑙勫垯*/
+ private String moneyRuleId;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
- /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
- public static final int OPERATOR_TYPE_USER = 0;
- /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
- public static final int OPERATOR_TYPE_EMPLOYEE = 1;
- /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
- public static final int OPERATOR_TYPE_ADMIN = 2;
/**鎿嶄綔浜虹被鍨�-绯荤粺*/
- public static final int OPERATOR_TYPE_SYSTEM = 3;
+ public static final int OPERATOR_TYPE_SYSTEM = 0;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static final int OPERATOR_TYPE_ADMIN = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+ public static final int OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static final int OPERATOR_TYPE_EMPLOYEE = 3;
+
/**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/
public static final int OP_TYPE_SYS = 0;
@@ -94,4 +95,10 @@
public static final String OPERATION_REASON_CHANGE = "changeGoods";
/**鎿嶄綔鏂瑰紡-鐢熸棩璧犻��*/
public static final String OPERATION_REASON_BIRTHDAY_GIFT = "birthdayGift";
+ /**鎿嶄綔鏂瑰紡-鑰佸甫鏂拌禒閫�0701*/
+ public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
+ /**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
+ public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
+ /**鎿嶄綔鏂瑰紡-钀ラ攢鍔╂墜绉垎鍏戞崲浼樻儬鍒�*/
+ public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
}
--
Gitblit v1.8.0