From eb2eda98462880cd6b58b7e4c78d97d992fe0c64 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期二, 23 四月 2024 16:10:00 +0800 Subject: [PATCH] 1.修改dto --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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 993e363..0fc384b 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 @@ -1,5 +1,6 @@ package com.hz.his.dto.order; +import com.hz.his.vo.order.refund.RefundDeductionCancelVo; import lombok.Data; import java.math.BigDecimal; @@ -18,14 +19,29 @@ private String type; /** 鍟嗗搧鍚嶇О */ private String goodsName; - /** 瀹為��鏁� */ + /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */ private Integer refundNum; - /** 瀹為��閲戦 */ + /** 瀹為��閲戦 锛堝鎴峰~鍐欙級*/ private BigDecimal refundMoney; - /** 瀹為��鍘熷洜 */ + /** 閫�娆惧師鍥狅紙鍛樺伐锛� */ + private String remarks; + /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */ private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos; + /** 闇�瑕佷綔搴熺殑鍒掓墸璁板綍*/ + private List<RefundDeductionCancelVo> refundDeductionCancelList; + + + /** 鍙��鎬婚噾棰濓紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + /** 鍙��鎬荤Н鍒嗭紙鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻锛�*/ + private BigDecimal approveRefundIntegral = BigDecimal.ZERO; + /**鍒嗛厤鍙��閲戦*/ + private List<OrderPayMethodDto> refundPayMethodList; + + /** 骞虫憡绉垎锛堢敤浜庣郴缁熻繑鍥炲弬鏁拌绠楋級*/ + private BigDecimal averageIntegral = BigDecimal.ZERO; } -- Gitblit v1.8.0