From 7c23b9962d35e38ec6c4e0dd32d75027e69bf189 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 03 四月 2024 18:50:10 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-CRM预约

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 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 2bfa5f1..9e0b355 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,11 +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.UserUnionDto;
-import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.PageDto;
 import com.hz.his.dto.user.money.UserMoneyDto;
-import com.hz.his.dto.user.project.UserProjectDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -13,7 +10,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="phi-platfrom-service",path = "/phip",contextId = "phip-money")
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-money")
 public interface SPhipMoneyService {
 
     /**
@@ -41,9 +38,28 @@
     Result unclaimedCancel(@RequestBody UserMoneyDto userMoneyDto);
 
 
+    /**
+     * 鑾峰彇鐢ㄦ埛璧勯噾淇℃伅
+     * */
+    @PostMapping(value = "/user/money/info")
+    Result userMoneyInfo(@RequestBody UserMoneyDto userMoneyDto);
 
 
+    /**
+     * 璁剧疆澧炲�奸噾鏄惁闇�瑕佺敤鎴烽鍙栫姸鎬�
+     * */
+    @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