From 5d542ef50426fdaf5c06d09f6a7c5d13529ea4ac Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 14 六月 2024 17:07:33 +0800
Subject: [PATCH] Merge branch 'master-fwq-团购提前扣取金额' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 5 +++++
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 7 +++++--
phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyListDto.java | 15 +++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java | 11 +++++++----
phis-feign/src/main/java/com/hz/his/vo/user/UserMoneyReturnVo.java | 20 ++++++++++++++++++++
5 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 99fbe70..0d28248 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -13,6 +13,11 @@
*/
@Data
public class PayAmountDto {
+ /**鏄惁宸叉彁鍓嶆墸鍙�,渚嬪鎷煎洟璁㈠崟鍏堟墸鍙�,鍚庣画缁撹处涓嶇敤鍐嶆墸鍑�*/
+ private Boolean isPay = false;
+ /**宸叉彁鍓嶆墸鍙栫殑璁板綍鏍囪瘑*/
+ private String isPayId;
+
/**蹇呭～ 瀹為檯鏀粯閲戦*/
private BigDecimal amount;
/**蹇呭～ 鏀粯鏂瑰紡*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyListDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyListDto.java
new file mode 100644
index 0000000..5b9b53e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyListDto.java
@@ -0,0 +1,15 @@
+package com.hz.his.dto.user.money;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 淇敼鐢ㄦ埛璧勯噾-鍚屾椂鎿嶄綔澶氫釜
+ */
+@Data
+public class UserMoneyListDto {
+
+ private List<UserMoneyUpdateDto> userMoneyList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 3faa1ea..5185c39 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -33,14 +33,17 @@
/**鎿嶄綔绫诲瀷 鏄惁闇�瑕侀鍙� 榛樿0 鍙湁澧炲�奸噾 娣诲姞闇�瑕侀鍙�*/
private int opType;
- /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�)*/
+ /**鍏宠仈鏍囪瘑(娲诲姩瑙勫垯鎴栬�呭叾浠�),濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栫殑閲戦鍏宠仈鏁版嵁涔熷瓨鍦ㄨ繖*/
private String commonId;
- /**璁㈠崟id*/
+ /**璁㈠崟id,濡傛灉鏄敮浠樿鍗曟彁鍓嶆墸鍙栭噾棰濆瓨鐨勬槸鏈悓姝ヨ繃鏉ョ殑鍗曟爣璇�*/
private String orderId;
/**瀛愬崟璁㈠崟id*/
private String orderItemId;
+ /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌UserMoneyReturnVo杩斿洖璇ヤ紶鍊�*/
+ private String equId;
+
/**澶囨敞*/
private String remarks;
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 9fd2c62..709ab43 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,10 +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.UserTurnDto;
+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;
@@ -28,6 +25,12 @@
Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
/**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼-澶氭潯
+ */
+ @PostMapping(value = "/user/money/unclaimed/add/list")
+ Result userMoneyUpdateList(@RequestBody UserMoneyListDto userMoneyListDto);
+
+ /**
* 寮�鏀惧钩鍙�-鐢ㄦ埛璧勯噾淇℃伅
*/
@PostMapping(value = "/user/money/info")
diff --git a/phis-feign/src/main/java/com/hz/his/vo/user/UserMoneyReturnVo.java b/phis-feign/src/main/java/com/hz/his/vo/user/UserMoneyReturnVo.java
new file mode 100644
index 0000000..a1338e1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/user/UserMoneyReturnVo.java
@@ -0,0 +1,20 @@
+package com.hz.his.vo.user;
+
+
+import lombok.Data;
+
+/**
+ * 鎿嶄綔鐢ㄦ埛璧勯噾-杩斿洖
+ */
+@Data
+public class UserMoneyReturnVo {
+ /**鍞竴鏍囪瘑,澶氭潯鎿嶄綔璁板綍鐢ㄥ埌*/
+ private String equId;
+ /**璧勯噾璁板綍(UserMoneyUnclaimed)*/
+ private String recordId;
+ /**璧勯噾绫诲瀷*/
+ private Integer fundType;
+
+
+
+}
--
Gitblit v1.8.0