From 47761c24159e804b3deab9f7cbd311c1a31b80fe Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期五, 10 十一月 2023 19:16:59 +0800 Subject: [PATCH] 打板优惠券优化 --- phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 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 4eaa461..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 @@ -2,6 +2,7 @@ import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -11,20 +12,54 @@ @Data public class OrderRefundDto { - /** 閫�娆炬柟寮忛泦鍚� */ - private List<OrderPayMethodDto> refundPayMethod; - /** 澶囨敞 */ - private String remarks; - /** 閫�娆句俊鎭泦鍚� */ - private List<OrderItemRefundDto> refundList; /** 璁㈠崟id */ private String orderId; - /** 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */ - private Integer refundType; - /** 鎿嶄綔浜篿d */ - private String operatorId; + /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */ + private Integer refundOperationType; + /** 閫�娆句俊鎭泦鍚� */ + private List<OrderItemRefundDto> refundList; + /** 閫�娆炬柟寮忛泦鍚� */ + private List<OrderPayMethodDto> refundPayMethod; + /** 閫�娆句紭鎯犲埜淇℃伅闆嗗悎 蹇呭~ */ + private List<OrderCouponRefunDto> couponList; + /** 閫�娆惧娉紙鍛樺伐锛� */ + private String remarks; + /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ + private String refundReason; + /** Y-鑷姩浣滃簾鍒掓墸 0鍚�1鏄紙鏁村崟閫�鐨勬椂鍊欑敤鍒帮級*/ + private Integer deductionCancel = 0; + /** 鎿嶄綔浜哄憳宸ユ爣璇�*/ + private String operatorId; + /** 鎿嶄綔浜哄憳宸ヨ鑹叉爣璇�-蹇呭~*/ + private String roleId; + + /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭~*/ + private Integer isApproval; + /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭~*/ + private Integer isRefund; + + //////绯荤粺鍙傛暟 + /** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal totalAmount; + /** 鍙��娆炬�荤Н鍒嗭紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal totalIntegral; + /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal refundTotal; + /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal refundIntegral; + /** 鍙��娆炬柟寮忛泦鍚� */ + private List<OrderPayMethodDto> payMethodList; + /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */ + private List<OrderCouponRefunDto> payCouponList; + + /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭~*/ + private Integer platformSource; + + /**澶囩敤鍙傛暟*/ //鎬昏鍗曢寤烘爣璇� private String hisOrderId; + //闈炲繀濉� 閲嶅彂鏍囪瘑 + private String resendRecordId; } -- Gitblit v1.8.0