From 648eb72de16da108373a2e74b42de25f6c3120a6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 10 五月 2024 18:04:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 16 ++++++++++++++++
1 files changed, 16 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 8297196..196d775 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
@@ -48,6 +48,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;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
@@ -56,6 +66,12 @@
/** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
private Integer platformSource;
+ /** 鏄惁绗笁鏂归��娆�(0鍚�1鏄�) */
+ private Integer isThirdPartyRefund = 1;
+
+ /**蹇呭～:閫�璐圭粺璁＄被鍨�(RefundRecord)*/
+ private String refundStatistics;
+
/**澶囩敤鍙傛暟*/
//鎬昏鍗曢寤烘爣璇�
private String hisOrderId;
--
Gitblit v1.8.0