From 6a3f8907a2f9d240f8a07e7283682286d2b52c75 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 16:40:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 2574514..5185c39 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;
/**
* 淇敼鐢ㄦ埛璧勯噾
@@ -36,16 +33,22 @@
/**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/
private int opType;
- /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/
+ /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�),濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栫殑閲戦鍏宠仈鏁版嵁涔熷瓨鍦ㄨ繖*/
private String commonId;
- /**璁㈠崟id*/
+ /**璁㈠崟id,濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栭噾棰濆瓨鐨勬槸鏈悓姝ヨ繃鏉ョ殑鍗曟爣璇�*/
private String orderId;
/**瀛愬崟璁㈠崟id*/
private String orderItemId;
+ /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌UserMoneyReturnVo杩斿洖璇ヤ紶鍊�*/
+ private String equId;
+
/**澶囨敞*/
private String remarks;
+
+ /**閲戦瑙勫垯*/
+ private String moneyRuleId;
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
@@ -95,6 +98,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