From d139c6ecde59c6963b0a7f2b8c9b6d6f9094e049 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 19 七月 2022 22:23:15 +0800
Subject: [PATCH] 修改
---
phis-feign/src/main/java/com/hz/his/feign/service/SUserService.java | 11 +++--
phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java | 90 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 97 insertions(+), 4 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 89bcdf1..1f39fd0 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
@@ -8,12 +8,9 @@
import com.hz.phis.dt.user.card.UserCardUsedDt;
import com.hz.phis.dt.user.coupon.UserCanUseCouponDt;
import com.hz.phis.dt.user.coupon.UserCouponDt;
-import com.hz.phis.dt.user.money.UserConsumeDt;
+import com.hz.phis.dt.user.money.*;
import com.hz.phis.dt.user.label.UserLabelDt;
import com.hz.phis.dt.user.project.UserProjectDt;
-import com.hz.phis.dt.user.money.UserIncrementDt;
-import com.hz.phis.dt.user.money.UserIntegralDt;
-import com.hz.phis.dt.user.money.UserRechargeDt;
import com.hz.phis.dt.user.project.UserProjectUsedDt;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -192,4 +189,10 @@
@PostMapping(value = "/user/level/record/list")
Result userLevelRecord(@RequestBody UserLevelDt userLevelDt);
+ /**
+ * 鑾峰彇鐢ㄦ埛寰呴鍙栧鍊奸噾鍒楄〃
+ * */
+ @PostMapping(value = "/user/wait/increment/list")
+ Result userWaitIncList(@RequestBody UserWaitIncDt userWaitIncDt);
+
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java
new file mode 100644
index 0000000..c6485c2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/money/UserWaitIncDt.java
@@ -0,0 +1,90 @@
+package com.hz.phis.dt.user.money;
+
+import com.hz.his.dto.PageDto;
+
+/**
+ * 鐢ㄦ埛寰呴鍙栧鍊奸噾鍒楄〃
+ * @author fwq
+ * */
+public class UserWaitIncDt extends PageDto {
+ /**phis鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**璧勯噾绫诲瀷*/
+ private Integer fundType;
+ /**璧勯噾鎿嶄綔绫诲瀷,澧炴垨鑰呭噺*/
+ private Integer fundOpType;
+ /**鐘舵��0 绛夊緟澶勭悊 1 澶勭悊鎴愬姛*/
+ private Integer status;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public Integer getFundType() {
+ return fundType;
+ }
+
+ public void setFundType(Integer fundType) {
+ this.fundType = fundType;
+ }
+
+ public Integer getFundOpType() {
+ return fundOpType;
+ }
+
+ public void setFundOpType(Integer fundOpType) {
+ this.fundOpType = fundOpType;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ /**璧勯噾绫诲瀷-鍌ㄥ�奸噾*/
+ public static final int FUND_TYPE_STORED_VALUE_FUND = 0;
+ /**璧勯噾绫诲瀷-澧炲�奸噾*/
+ public static final int FUND_TYPE_VALUE_ADDED_FUND = 1;
+ /**璧勯噾绫诲瀷-绉垎*/
+ public static final int FUND_TYPE_INTEGRAL = 2;
+ /**璧勯噾绫诲瀷-棰勫畾閲�*/
+ public static final int FUND_TYPE_DEPOSIT = 3;
+
+ /**绛夊緟澶勭悊*/
+ public static final int STATUS_WAI = 0;
+ /**澶勭悊鎴愬姛*/
+ public static final int STATUS_SUCCEED = 1;
+
+ /**鎿嶄綔浜虹被鍨�-绯荤粺澶勭悊 绯荤粺澶勭悊娌℃湁鎿嶄綔浜篿d鍜屾搷浣滀汉鍚嶇О*/
+ 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 FUND_OP_TYPE_REDUCE = 0;
+ /**璧勯噾鎿嶄綔绫诲瀷-澧炲姞*/
+ public static final int FUND_OP_TYPE_INCREASE = 1;
+
+ /**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/
+ public static final int OP_TYPE_SYSTEM = 0;
+ /**鎿嶄綔绫诲瀷-鐢ㄦ埛棰嗗彇*/
+ public static final int OP_TYPE_RECEIVE = 1;
+
+ /**鍙戦�佺煭淇＄姸鎬�-澶辫触*/
+ public static Integer SMS_STATUS_FALL = -1;
+ /**鍙戦�佺煭淇＄姸鎬�-鏈彂閫�*/
+ public static Integer SMS_STATUS_UNSENT = 0;
+ /**鍙戦�佺煭淇＄姸鎬�-鎴愬姛*/
+ public static Integer SMS_STATUS_SUCCEED = 1;
+}
--
Gitblit v1.8.0