From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 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 a2b5414..9fd2c62 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
@@ -2,7 +2,9 @@
 
 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.UserTurnDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -22,7 +24,30 @@
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼
      */
-    @PostMapping(value = "/phip/user/money/unclaimed/add")
+    @PostMapping(value = "/user/money/unclaimed/add")
     Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
+     */
+    @PostMapping(value = "/user/money/info")
+    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾鏉ユ簮淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+     */
+    @PostMapping(value = "/user/money/log/source/info")
+    Result userMoneyLogSourceInfo(@RequestBody UserMoneyDto userMoneyDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾浣跨敤淇℃伅(鏃ュ織娑堟伅鏌ヨ)
+     */
+    @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