From ad91082e15faeb1a4086e2dcdbc7c659a59c9511 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期三, 24 四月 2024 10:52:18 +0800 Subject: [PATCH] 1.修改dto字段 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 3 +++ phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 2 ++ phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 10 ++++++++++ 3 files changed, 15 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 0fc384b..1de3651 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 @@ -23,6 +23,9 @@ private Integer refundNum; /** 瀹為��閲戦 锛堝鎴峰~鍐欙級*/ private BigDecimal refundMoney; + /** 瀹為��鎶垫墸鍊�(绉垎锛屽墠绔牴鎹~鍐欑殑瀹為��閲戦(鎶垫墸閲戦)濉啓鎹㈢畻) */ + private BigDecimal refundDeductTotal; + /** 閫�娆惧師鍥狅紙鍛樺伐锛� */ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java index cca17dc..7dbb7a3 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java @@ -33,6 +33,8 @@ private String refundNumberName; /** 杞崲瀹為��閲戦 锛堝疄闄呴��娆鹃噾棰濓級*/ private BigDecimal money; + /** 杞崲瀹為��鎶垫墸鍊� 锛堝疄闄呴��娆剧Н鍒嗭級*/ + private BigDecimal deductionTotal; /** 澶囨敞 */ private String remarks; 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..196d775 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 @@ -48,6 +48,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; /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */ -- Gitblit v1.8.0