From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 ca4ec62..a76d5a6 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,9 @@
 package com.hz.his.feign.service.platform;
 
 import com.hx.resultTool.Result;
-import com.hz.his.dto.user.UserParamDto;
+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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,8 +18,18 @@
      * 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
      */
     @PostMapping(value = "/user/money/op")
-    Result addUser(@RequestBody UserParamDto userParamDto);
+    Result upUserMoney(@RequestBody PhisUserMoneyDto userMoneyDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼
+     */
+    @PostMapping(value = "/user/money/unclaimed/add")
+    Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
 
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
+     */
+    @PostMapping(value = "/user/money/info")
+    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0