From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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..4ac4119 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
@@ -36,27 +36,42 @@
/**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/
private int opType;
- /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/
+ /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�),濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栫殑閲戦鍏宠仈鏁版嵁涔熷瓨鍦ㄨ繖*/
private String commonId;
- /**璁㈠崟id*/
+ /**N-鏉ユ簮绫诲瀷-涓嶅～榛樿璁㈠崟*/
+ private String orderType = ORDER_TYPE_ORDER;
+ /**璁㈠崟id,濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栭噾棰濆瓨鐨勬槸鏈悓姝ヨ繃鏉ョ殑鍗曟爣璇�*/
private String orderId;
+ /**璁㈠崟缂栧彿*/
+ private String orderNo;
/**瀛愬崟璁㈠崟id*/
private String orderItemId;
+
+ /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌UserMoneyReturnVo杩斿洖璇ヤ紶鍊�*/
+ private String equId;
/**澶囨敞*/
private String remarks;
+ /** 鎵ｉ櫎鏂瑰紡(0鎵ｅ噺涓嶈冻鎶ラ敊锛�1鎵ｅ噺涓嶈冻鎵ｅ噺鍓╀綑鐨勶紝2鎵ｅ噺涓嶈冻鎵ｅ噺鍒拌礋鏁�) */
+ private Integer deductWay = 0;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠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;
+
+ /**鏉ユ簮绫诲瀷-璁㈠崟(OrdersTotal)*/
+ public static final String ORDER_TYPE_ORDER = "order";
+ /**鏉ユ簮绫诲瀷-鍚屾HIS鍒ゆ柇浣跨敤*/
+ public static final String ORDER_TYPE_TOTAL = "total";
/**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/
public static final int OP_TYPE_SYS = 0;
@@ -71,6 +86,13 @@
public static final int FUND_TYPE_INTEGRAL = 2;
/**璧勯噾绫诲瀷-棰勫畾閲�*/
public static final int FUND_TYPE_DEPOSIT = 3;
+
+ /** 鎵ｉ櫎鏂瑰紡 - 鎵ｅ噺涓嶈冻鎶ラ敊 */
+ public static final Integer DEDUCTION_WAY_NONE = 0;
+ /** 鎵ｉ櫎鏂瑰紡 - 鎵ｅ噺涓嶈冻鎵ｅ噺鍓╀綑鐨� */
+ public static final Integer DEDUCTION_WAY_RESIDUE = 1;
+ /** 鎵ｉ櫎鏂瑰紡 - 鎵ｅ噺涓嶈冻鎵ｅ噺鍒拌礋鏁� */
+ public static final Integer DEDUCTION_WAY_NEGATIVE = 2;
/**鎿嶄綔鏂瑰紡-绯荤粺鎿嶄綔*/
public static final String OPERATION_REASON_SYS = "systemOperation";
@@ -94,4 +116,12 @@
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";
+ /**鎿嶄綔鏂瑰紡-娑堣垂璧犻��*/
+ public static final String OP_CONSUME_GIVE = "consume_give";
}
--
Gitblit v1.8.0