From 32e2c1f5097f36fe37ea2969f6337d24f55576f4 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期六, 24 六月 2023 18:24:41 +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 |   14 +++++++++++++-
 1 files changed, 13 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 2531f89..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
@@ -2,6 +2,8 @@
 
 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 org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,7 +11,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-user-money")
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-money")
 public interface SPhipUserMoneyService {
 
     /**
@@ -18,6 +20,16 @@
     @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/info")
+    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0