From dcbd4887da027b5b4afb53c5b270c86361e684e7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 10 四月 2024 17:05:31 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
index cbe32d9..0ff5a5a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyDto.java
@@ -4,6 +4,8 @@
import lombok.Data;
import lombok.ToString;
+import java.util.List;
+
/**
* 鐢ㄦ埛璧勯噾
*
@@ -123,6 +125,9 @@
/**鏌ヨ涓嶅彲棰嗗彇鍘熷洜*/
private Integer isSelectNotUse = 0;
+ /**寰呴鍙栬褰曟爣璇嗛泦鍚�*/
+ private List<String> receiveIdList;
+
/*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
/**
* 搴旂敤绫诲瀷-绗笁鏂瑰钩鍙�
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index 9e0b355..381af78 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -32,6 +32,12 @@
Result receive(@RequestBody UserMoneyDto userMoneyDto);
/**
+ * 寮�鏀惧钩鍙�-棰嗗彇鐢ㄦ埛璧勪骇-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/receive/more")
+ Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛寰呴鍙栬褰�
*/
@PostMapping(value = "/user/money/unclaimed/cancel")
--
Gitblit v1.8.0