From 1b6aaa7d6c379ccdb0870a36f848c1f811577bf0 Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 24 四月 2024 17:24:20 +0800 Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java index 1de3651..d74177a 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java @@ -41,10 +41,21 @@ private BigDecimal approveRefundTotal = BigDecimal.ZERO; /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ private BigDecimal approveRefundIntegral = BigDecimal.ZERO; + /** 鍙��鎬绘姷鎵g幇閲戦噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal approveRefundDeductTotal = BigDecimal.ZERO; + /** 鍙��鎬绘姷鎵gН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal approveRefundDeductIntegral = BigDecimal.ZERO; + + + /**鍒嗛厤鍙��閲戦*/ private List<OrderPayMethodDto> refundPayMethodList; /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/ private BigDecimal averageIntegral = BigDecimal.ZERO; + /** 骞虫憡鐨勬姷鎵g幇閲戯紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal averageDeductAmount = BigDecimal.ZERO; + /** 骞虫憡鐨勬姷鎵gН鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal averageDeductIntegral = BigDecimal.ZERO; } -- Gitblit v1.8.0