From 18dcbf0a7fb4cb3d674d21225a05952a228563c4 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期三, 26 四月 2023 10:23:28 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 eaf294e..3b66134 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,8 @@
 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.UserMoneyUpdateDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,15 +10,19 @@
 /**
  * 杩欓噷杩欎釜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 {
 
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
      */
     @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);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0