From 99f5cda938c41638dc963d364204716aa62e8ba1 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 09 二月 2023 15:37:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 4eaa461..3f58f4a 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;
/**
@@ -27,4 +28,31 @@
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
+ //闈炲繀濉� 閲嶅彂鏍囪瘑
+ private String resendRecordId;
+
+ /** 閫�娆鹃噾棰� */
+ private BigDecimal totalAmount;
+ /** 閫�娆句俊鎭泦鍚� 蹇呭～ */
+ private List<OrderCouponRefunDto> couponList;
+ /** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
+ private String roleId;
+ /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isApproval;
+
+ /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isRefund;
+
+ /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */
+ private Integer refundOperationType;
+
+ /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
+ private Integer platformSource;
+
+ /**his鍔╂墜*/
+ public static Integer HIS_ASSISTANT = 0;
+
+ /**his鍚庡彴*/
+ public static Integer HIS_BACKSTAGE = 1;
+
}
--
Gitblit v1.8.0