From c05869683327b022280dd8313b50b2067733ba8d Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 06 三月 2023 11:43:46 +0800
Subject: [PATCH] Merge branch 'master-prod-new'
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 10 +++++-----
phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 7 +++++++
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java
new file mode 100644
index 0000000..64b287b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderInitVo.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+/**
+ * 璁㈠崟鍒濆鍖栧疄浣�
+ */
+@Data
+public class OrderInitVo {
+
+ /**璁㈠崟鏍囪瘑*/
+ private String orderId;
+
+}
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 57fc55e..4e5fccc 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
@@ -11,15 +11,15 @@
*/
@Data
public class PayAmountDto {
- //蹇呭～ 瀹為檯鏀粯閲戦
+ /**蹇呭～ 瀹為檯鏀粯閲戦*/
private String amount;
- //蹇呭～ 鏀粯鏂瑰紡
+ /**蹇呭～ 鏀粯鏂瑰紡*/
private String method;
- //蹇呭～ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)
+ /**蹇呭～ 鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗￠」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑)*/
private String commonId;
- //闈炲繀濉� 鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶
+ /**闈炲繀濉� 鏉冪泭绫诲瀷:鍗￠」鏀粯蹇呬紶*/
private String cardEquityId;
- //闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶
+ /**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
private String userCardId;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 86134c3..77490ef 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -157,4 +157,11 @@
*/
@PostMapping(value = "/order/whole/refund")
Result wholeRefund(@RequestBody OrderRefundDto orderRefundDto);
+
+ /**
+ * 閲嶆柊鍒濆鍖栬鍗曢噾棰�
+ * 鏍规嵁鏀粯璁板綍鍘婚噸鏂扮畻鍚勭閲戦
+ */
+ @PostMapping(value = "/order/init/order-money")
+ Result initOrderMoney(@RequestBody OrderInitVo orderInitVo);
}
\ No newline at end of file
--
Gitblit v1.8.0