From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |   18 ++++++++++++++----
 1 files changed, 14 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 743ccb4..e591450 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,9 +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.UserMoneyDto;
-import com.hz.his.dto.user.money.UserMoneyUpdateDto;
+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;
@@ -11,7 +9,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-user-money")
+@FeignClient(name="phi-platform-user",path = "/phip",contextId = "phip-user-money")
 public interface SPhipUserMoneyService {
 
     /**
@@ -25,6 +23,12 @@
      */
     @PostMapping(value = "/user/money/unclaimed/add")
     Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
+
+    /**
+     * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼-澶氭潯
+     */
+    @PostMapping(value = "/user/money/unclaimed/add/list")
+    Result userMoneyUpdateList(@RequestBody UserMoneyListDto userMoneyListDto);
 
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
@@ -43,4 +47,10 @@
      */
     @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