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 |   27 +++++++++++++++++++++++++++
 1 files changed, 27 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 e05dee0..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,5 +1,6 @@
 package com.hz.his.dto.order;
 
+import com.hz.his.dto.refund.RefundPreferentialDto;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -26,6 +27,8 @@
     private String remarks;
     /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
     private String refundReason;
+    /** Y-鑷姩浣滃簾鍒掓墸  0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/
+    private Integer deductionCancel = 0;
 
     /** 鎿嶄綔浜哄憳宸ユ爣璇�*/
     private String operatorId;
@@ -44,6 +47,18 @@
     private BigDecimal totalIntegral;
     /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
     private BigDecimal refundTotal;
+    /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal refundIntegral;
+
+    /** 鍙��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal totalDeductAmount;
+    /** 鍙��娆炬姷鎵g幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal totalDeductIntegral;
+    /** 濉啓鐨勯��娆捐绉垎鎶垫墸鐨勭幇閲戞暟閲�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal refundDeductAmount;
+    /** 濉啓鐨勯��娆炬姷鎵g幇閲戠殑绉垎鏁伴噺,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊�  */
+    private BigDecimal refundDeductIntegral;
+
     /** 鍙��娆炬柟寮忛泦鍚� */
     private List<OrderPayMethodDto> payMethodList;
     /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
@@ -52,10 +67,22 @@
     /** 骞冲彴鏉ユ簮  鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟  蹇呭~*/
     private Integer platformSource;
 
+    /** 鏄惁绗笁鏂归��娆�(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