From c2af7240d43586b8e3cc295e9e97f7d24278025d Mon Sep 17 00:00:00 2001 From: cmg <527198563@qq.com> Date: 星期一, 27 五月 2024 14:37:54 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-stander --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java index d9b517b..0a6dd75 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java @@ -1,6 +1,6 @@ package com.hz.his.dto.order; -import com.hz.his.dto.order.refund.RefundPaymentMethodVo; +import com.hz.his.vo.order.refund.RefundDeductionCancelVo; import lombok.Data; import java.math.BigDecimal; @@ -28,6 +28,27 @@ /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; - /**鍒嗛厤鐨勯��娆炬柟寮忛噾棰�-鍐呴儴浼犲弬浣跨敤锛屾帴鍙f殏鏃舵棤鐢�*/ - private List<RefundPaymentMethodVo> distributionPayList; + /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/ + private List<RefundDeductionCancelVo> refundDeductionCancelList; + + /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + 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