From c744b64955f5724a2112dcf8bcd7498626037fe9 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 02 十一月 2023 10:55:59 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 6 ++++++
1 files changed, 6 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 1e89f21..8297196 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
@@ -26,6 +26,8 @@
private String remarks;
/** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */
private String refundReason;
+ /** Y-鑷姩浣滃簾鍒掓墸 0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/
+ private Integer deductionCancel = 0;
/** 鎿嶄綔浜哄憳宸ユ爣璇�*/
private String operatorId;
@@ -40,8 +42,12 @@
//////绯荤粺鍙傛暟
/** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal totalAmount;
+ /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal totalIntegral;
/** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
private BigDecimal refundTotal;
+ /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍￠獙鐨勬椂鍊欒祴鍊� */
+ private BigDecimal refundIntegral;
/** 鍙��娆炬柟寮忛泦鍚� */
private List<OrderPayMethodDto> payMethodList;
/** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */
--
Gitblit v1.8.0