From 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 30 九月 2024 18:47:53 +0800
Subject: [PATCH] Merge branch 'master-stander' into master-jiayan
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 801c4a6..48e7c8b 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
@@ -1,7 +1,6 @@
package com.hz.his.dto.order;
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import com.hz.his.dto.refund.RefundPreferentialDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -50,6 +49,16 @@
private BigDecimal refundTotal;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundIntegral;
+
+ /** 鍙��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalDeductAmount;
+ /** 鍙��娆炬姷鎵ｇ幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalDeductIntegral;
+ /** 濉啓鐨勯��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundDeductAmount;
+ /** 濉啓鐨勯��娆炬姷鎵ｇ幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundDeductIntegral;
+
/** 鍙��娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> payMethodList;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
@@ -61,10 +70,19 @@
/** 鏄惁绗笁鏂归��娆�(0鍚�1鏄�) */
private Integer isThirdPartyRefund = 1;
+ /**蹇呭～:閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
+
+ /**鏄惁褰掕繕鍟嗗搧 0=鍚� 1=鏄�*/
+ private Integer isReturnBack;
+
/**澶囩敤鍙傛暟*/
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
+ /** 閫�娆句紭鎯� */
+ private RefundPreferentialDto refundPreferentialDto;
+
}
--
Gitblit v1.8.0