From 6c7294b43bbb8e4f64b262281be6264a50ecc381 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 15 四月 2024 16:49:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 5ca97ca..381af78 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;
@@ -35,15 +32,40 @@
Result receive(@RequestBody UserMoneyDto userMoneyDto);
/**
+ * 寮�鏀惧钩鍙�-棰嗗彇鐢ㄦ埛璧勪骇-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/receive/more")
+ Result receiveMore(@RequestBody UserMoneyDto userMoneyDto);
+
+ /**
* 寮�鏀惧钩鍙�-浣滃簾鐢ㄦ埛寰呴鍙栬褰�
*/
@PostMapping(value = "/user/money/unclaimed/cancel")
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