From bdc2690c86edc484375fcdbd3330b583886776b7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 24 三月 2023 19:37:49 +0800
Subject: [PATCH] 退款重构
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 6 +++++-
phis-feign/src/main/java/com/hz/his/dto/order/refund/RefundPaymentMethodVo.java | 33 +++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 5 +++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4 +++-
5 files changed, 50 insertions(+), 2 deletions(-)
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 6dcb6bb..6057910 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
@@ -1,5 +1,6 @@
package com.hz.his.dto.order;
+import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
import lombok.Data;
import java.math.BigDecimal;
@@ -30,4 +31,7 @@
/** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */
private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos;
+ /**鍒嗛厤鐨勯��娆炬柟寮忛噾棰�-鍐呴儴浼犲弬浣跨敤锛屾帴鍙ｆ殏鏃舵棤鐢�*/
+ private List<RefundPaymentMethodVo> distributionPayList;
+
}
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 6180767..d9b517b 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
@@ -1,8 +1,10 @@
package com.hz.his.dto.order;
+import com.hz.his.dto.order.refund.RefundPaymentMethodVo;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @Author
@@ -25,4 +27,7 @@
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+
+ /**鍒嗛厤鐨勯��娆炬柟寮忛噾棰�-鍐呴儴浼犲弬浣跨敤锛屾帴鍙ｆ殏鏃舵棤鐢�*/
+ private List<RefundPaymentMethodVo> distributionPayList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
index 820864b..fc26797 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java
@@ -31,8 +31,12 @@
public OrderPayMethodDto() {
}
- public OrderPayMethodDto(String payMethodNo, BigDecimal money) {
+ public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal, String refundNumberNo, String refundNumberName, BigDecimal money) {
this.payMethodNo = payMethodNo;
+ this.payMethodName = payMethodName;
+ this.payTotal = payTotal;
+ this.refundNumberNo = refundNumberNo;
+ this.refundNumberName = refundNumberName;
this.money = money;
}
}
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 6ce4870..62eee5d 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
@@ -24,8 +24,10 @@
private String orderId;
/** 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */
private Integer refundType;
- /** 鎿嶄綔浜篿d */
+ /** 鎿嶄綔浜哄憳宸ユ爣璇�*/
private String operatorId;
+ /** 鎿嶄綔浜哄憳宸ヨ鑹叉爣璇�*/
+ private String operatorRoleId;
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/refund/RefundPaymentMethodVo.java b/phis-feign/src/main/java/com/hz/his/dto/order/refund/RefundPaymentMethodVo.java
new file mode 100644
index 0000000..2dd6354
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/refund/RefundPaymentMethodVo.java
@@ -0,0 +1,33 @@
+package com.hz.his.dto.order.refund;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.annotation.Index;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author CJH
+ * @Date 2023-03-24
+ * 鐢ㄦ潵瑁呰浇瀛愰」閫�娆炬柟寮忕殑閲戦
+ */
+@Data
+public class RefundPaymentMethodVo {
+
+ /**閫�娆炬敮浠樻柟寮忕紪鍙�*/
+ private String numberNo;
+ /**閫�娆炬敮浠樻柟寮忓悕绉�*/
+ private String name;
+ /**閫�娆鹃噾棰�*/
+ private BigDecimal refundTotal;
+
+ public RefundPaymentMethodVo() {
+ }
+
+ public RefundPaymentMethodVo(String numberNo, String name,BigDecimal refundTotal) {
+ this.numberNo = numberNo;
+ this.name = name;
+ this.refundTotal = refundTotal;
+ }
+}
--
Gitblit v1.8.0