From 9f53055abd60eb0fb5d8060587124012d77d8ab6 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期四, 23 三月 2023 17:08:44 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
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 e80517e..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
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -13,8 +14,10 @@
/** 閫�娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> refundPayMethod;
- /** 澶囨敞 */
+ /** 閫�娆惧娉紙鍛樺伐锛� */
private String remarks;
+ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
+ private String refundReason;
/** 閫�娆句俊鎭泦鍚� */
private List<OrderItemRefundDto> refundList;
/** 璁㈠崟id */
@@ -30,7 +33,8 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
-
+ /** 閫�娆鹃噾棰� */
+ private BigDecimal totalAmount;
/** 閫�娆句俊鎭泦鍚� 蹇呭～ */
private List<OrderCouponRefunDto> couponList;
/** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
@@ -41,6 +45,9 @@
/** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
private Integer isRefund;
+ /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */
+ private Integer refundOperationType;
+
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
--
Gitblit v1.8.0