From d621324bcf6c5a26f058b24e0f4d2930f41840f4 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 05 八月 2024 18:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-base' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 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 634f9a8..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,7 +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.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +18,39 @@
     @PostMapping(value = "/user/money/op")
     Result upUserMoney(@RequestBody PhisUserMoneyDto userMoneyDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼
+     */
+    @PostMapping(value = "/user/money/unclaimed/add")
+    Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼-澶氭潯
+     */
+    @PostMapping(value = "/user/money/unclaimed/add/list")
+    Result userMoneyUpdateList(@RequestBody UserMoneyListDto userMoneyListDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
+     */
+    @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