From be8f87087cd6ab5b80e363805f2f582acfbed7b0 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期四, 09 三月 2023 17:44:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 10 +++++-----
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 1 -
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 +++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4 +++-
7 files changed, 35 insertions(+), 9 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/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
index 993e363..6dcb6bb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java
@@ -22,7 +22,9 @@
private Integer refundNum;
/** 瀹為��閲戦 */
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
index 400e7dd..6180767 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java
@@ -21,6 +21,8 @@
private Integer refundNum;
/** 瀹為��閲戦 */
private BigDecimal refundMoney;
- /** 瀹為��鍘熷洜 */
+ /** 閫�娆惧師鍥狅紙鍛樺伐锛� */
+ private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 3f58f4a..6ce4870 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -14,8 +14,10 @@
/** 閫�娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> refundPayMethod;
- /** 澶囨敞 */
+ /** 閫�娆惧娉紙鍛樺伐锛� */
private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
/** 閫�娆句俊鎭泦鍚� */
private List<OrderItemRefundDto> refundList;
/** 璁㈠崟id */
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/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index 5f6ec34..b645b90 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -9,7 +9,6 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
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