From 578588fefc6f546cd589b77dfd8444708482080f Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 14 七月 2022 12:15:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java | 6 +++---
phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 50 insertions(+), 7 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
index 9249040..ae76194 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java
@@ -112,10 +112,10 @@
Result userRechargeList(@RequestBody UserRechargeDt userRechargeDt);
/**
- * 鑾峰彇鐢ㄦ埛鍌ㄥ�奸噾浣跨敤璁板綍
+ * 鑾峰彇鐢ㄦ埛璧勯噾浣跨敤璁板綍
* */
- @PostMapping(value = "/user/recharge/used")
- Result userRechargeUsed(@RequestBody UserRechargeDt userRechargeDt);
+ @PostMapping(value = "/user/money/used")
+ Result userConsumeDt(@RequestBody UserConsumeDt userConsumeDt);
/**
* 鑾峰彇鐢ㄦ埛绉垎鍒楄〃
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java
index 149f2e4..3e06a64 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserConsumeDt.java
@@ -1,11 +1,54 @@
package com.hz.phis.dt.user.money;
-import lombok.Data;
+import com.hz.his.dto.PageDto;
-/**鐢ㄦ埛鏍囩*/
-@Data
-public class UserConsumeDt {
+/**鐢ㄦ埛娑堣垂*/
+public class UserConsumeDt extends PageDto {
/**鐢ㄦ埛鏍囪瘑*/
private String userId;
+ /**閲戦绫诲瀷*/
+ private Integer type;
+ /**鎿嶄綔绫诲瀷*/
+ private Integer opType;
+
+ /**閲戦绫诲瀷-鍌ㄥ�奸噾*/
+ public static final int TYPE_STORED_VALUE_FUND = 0;
+ /**閲戦绫诲瀷-澧炲�奸噾*/
+ public static final int TYPE_VALUE_ADDED_FUND = 1;
+ /**閲戦绫诲瀷-绉垎*/
+ public static final int TYPE_INTEGRAL = 2;
+ /**閲戦绫诲瀷-棰勫畾閲�*/
+ public static final int TYPE_DEPOSIT = 3;
+
+ /**鎿嶄綔绫诲瀷-澧炲姞*/
+ public static final int OP_TYPE_INCREASE = 1;
+ /**鎿嶄綔绫诲瀷-鍑忓皯*/
+ public static final int OP_TYPE_REDUCE = 2;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getOpType() {
+ return opType;
+ }
+
+ public void setOpType(Integer opType) {
+ this.opType = opType;
+ }
+
+
}
--
Gitblit v1.8.0