From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMoneyService.java | 22 ++++++++++++++++------
1 files changed, 16 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 5ca97ca..2453e21 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.alibaba.fastjson.JSONObject;
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.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;
@@ -41,9 +38,22 @@
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);
}
\ No newline at end of file
--
Gitblit v1.8.0