From e74dade001072c3a0e93cd6d698df4df2262f5a3 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 01 八月 2024 22:30:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index 743ccb4..709ab43 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -1,9 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.user.money.PhisUserMoneyDto;
-import com.hz.his.dto.user.money.UserMoneyDto;
-import com.hz.his.dto.user.money.UserMoneyUpdateDto;
+import com.hz.his.dto.user.money.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +25,12 @@
Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
/**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/add/list")
+ Result userMoneyUpdateList(@RequestBody UserMoneyListDto userMoneyListDto);
+
+ /**
* 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
*/
@PostMapping(value = "/user/money/info")
@@ -43,4 +47,10 @@
*/
@PostMapping(value = "/user/money/log/use/info")
Result userMoneyLogUseInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾杞禒
+ */
+ @PostMapping(value = "/user/money/turn")
+ Result userMoneyTurn(@RequestBody UserTurnDto userTurnDto);
}
\ No newline at end of file
--
Gitblit v1.8.0