From 81ab3d0067133df70bcf881bba75af08112fa90d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 31 七月 2024 19:22:19 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
index d601adf..7fdb0c3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
import com.hz.his.dto.user.money.UserMoneyDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -9,7 +10,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-money")
+@FeignClient(name="phi-platform-user",path = "/phip",contextId = "phip-money")
public interface SPhipMoneyService {
/**
@@ -31,6 +32,12 @@
Result receive(@RequestBody UserMoneyDto userMoneyDto);
/**
+ * 寮�鏀惧钩鍙�-棰嗗彇鐢ㄦ埛璧勪骇-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/receive/more")
+ Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛寰呴鍙栬褰�
*/
@PostMapping(value = "/user/money/unclaimed/cancel")
@@ -49,4 +56,16 @@
* */
@PostMapping(value = "/user/money/unclaimed/default/setting")
Result userDefaultSetting(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 鐢ㄦ埛璧勯噾浣跨敤璁板綍鍒楄〃
+ * */
+ @PostMapping(value = "/user/money/use/log/list")
+ Result useLogListData(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
+ * 閲戦閰嶇疆-棰嗗彇鏉′欢鏋氫妇鍒楄〃
+ * */
+ @PostMapping(value = "/common/list/money/rule/list/receive")
+ Result moneyRuleReceiveRuleList(@RequestBody PageDto pageDto);
}
\ No newline at end of file
--
Gitblit v1.8.0