From 98fe87967986bf4ad01f19ca2f3c54ae067fa43c Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期一, 27 五月 2024 18:23:57 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-新版回访 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 14 ++++++++++++++ 1 files changed, 14 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 5d358a5..97b8d87 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; @@ -48,6 +49,16 @@ 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; /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */ @@ -68,4 +79,7 @@ //闈炲繀濉� 閲嶅彂鏍囪瘑 private String resendRecordId; + /** 閫�娆句紭鎯� */ + private RefundPreferentialDto refundPreferentialDto; + } -- Gitblit v1.8.0