From 2b81b714613810f99578b1cbc0796dc4f747512d Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期三, 29 三月 2023 16:27:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemRefundDto.java | 8 +++- phis-feign/src/main/java/com/hz/his/dto/order/OrderPayMethodDto.java | 18 ++++++-- phis-feign/src/main/java/com/hz/his/dto/PageDto.java | 5 ++ phis-feign/src/main/java/com/hz/his/dto/order/OrderItemSourceRefundDto.java | 5 ++ phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 53 +++++++++++++------------- 5 files changed, 55 insertions(+), 34 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java index 178bccd..adb4238 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/PageDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/PageDto.java @@ -1,10 +1,15 @@ package com.hz.his.dto; +import lombok.Data; + /** * @author ChenJiaHe * 鍒嗛〉鎵╁睍绫�*/ +@Data public class PageDto { + /**鏍囪瘑*/ + private String id; /**褰撳墠椤垫暟*/ private Integer pageNum; /**褰撳墠椤垫樉绀烘潯鏁�*/ 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 6dcb6bb..d1ffe6b 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 @@ -18,15 +18,19 @@ private String type; /** 鍟嗗搧鍚嶇О */ private String goodsName; - /** 瀹為��鏁� */ + /** 瀹為��鏁帮紙瀹㈡埛濉啓锛� */ private Integer refundNum; - /** 瀹為��閲戦 */ + /** 瀹為��閲戦 锛堝鎴峰~鍐欙級*/ private BigDecimal refundMoney; /** 閫�娆惧師鍥狅紙鍛樺伐锛� */ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; + /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻 + /** 鍙��鎬婚噾棰�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + /** 閫�娆句簩绾у瓙璁㈠崟淇℃伅闆嗗悎 */ private List<OrderItemSourceRefundDto> orderItemSourceRefundDtos; 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 6180767..bb27487 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 @@ -25,4 +25,9 @@ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; + + /////鐢ㄤ簬绯荤粺杩斿洖鍙傛暟璁$畻 + /** 鍙��鎬婚噾棰�*/ + private BigDecimal approveRefundTotal = BigDecimal.ZERO; + } 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 820864b..a03f7ad 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 @@ -11,12 +11,17 @@ @Data public class OrderPayMethodDto { - /** 鏀粯鏂瑰紡缂栫爜 */ + /** 鍙��鏀粯鏂瑰紡缂栫爜 */ private String payMethodNo; - /** 鏀粯鏂瑰紡鍚嶇О */ + /** 鍙��鏀粯鏂瑰紡鍚嶇О */ private String payMethodName; - /** 鏀粯閲戦 */ + /** 鍙��鏀粯閲戦 */ private BigDecimal payTotal; + /**鏄惁鐜伴噾鏀粯 0鍚�1鏄�*/ + private Integer isMoneyPay; + /**鏄惁鍒掓墸璁$畻锛�0鍚�1鏄�*/ + private Integer isExecute; + /** 杞崲鏂瑰紡缂栫爜 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級 */ private String refundNumberNo; /** 杞崲鏂瑰紡鍚嶇О 锛堝疄闄呴��娆炬柟寮忕紪鐮侊級*/ @@ -31,8 +36,11 @@ public OrderPayMethodDto() { } - public OrderPayMethodDto(String payMethodNo, BigDecimal money) { + public OrderPayMethodDto(String payMethodNo, String payMethodName, BigDecimal payTotal,Integer isMoneyPay,Integer isExecute) { this.payMethodNo = payMethodNo; - this.money = money; + this.payMethodName = payMethodName; + this.payTotal = payTotal; + this.isMoneyPay = isMoneyPay; + this.isExecute = isExecute; } } 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 6ce4870..1e89f21 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 @@ -12,49 +12,48 @@ @Data public class OrderRefundDto { + /** 璁㈠崟id */ + private String orderId; + /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */ + private Integer refundOperationType; + /** 閫�娆句俊鎭泦鍚� */ + private List<OrderItemRefundDto> refundList; /** 閫�娆炬柟寮忛泦鍚� */ private List<OrderPayMethodDto> refundPayMethod; + /** 閫�娆句紭鎯犲埜淇℃伅闆嗗悎 蹇呭~ */ + private List<OrderCouponRefunDto> couponList; /** 閫�娆惧娉紙鍛樺伐锛� */ private String remarks; /** 閫�娆惧師鍥狅紙鐢ㄦ埛锛� */ private String refundReason; - /** 閫�娆句俊鎭泦鍚� */ - private List<OrderItemRefundDto> refundList; - /** 璁㈠崟id */ - private String orderId; - /** 閫�娆剧被鍨�(0:閫�娆℃暟閫�娆�,1:浠呴��娆� 榛樿:0) */ - private Integer refundType; - /** 鎿嶄綔浜篿d */ + + /** 鎿嶄綔浜哄憳宸ユ爣璇�*/ private String operatorId; - - //鎬昏鍗曢寤烘爣璇� - private String hisOrderId; - - //闈炲繀濉� 閲嶅彂鏍囪瘑 - private String resendRecordId; - - /** 閫�娆鹃噾棰� */ - private BigDecimal totalAmount; - /** 閫�娆句俊鎭泦鍚� 蹇呭~ */ - private List<OrderCouponRefunDto> couponList; - /** 鎿嶄綔浜鸿鑹瞚d 蹇呭~*/ + /** 鎿嶄綔浜哄憳宸ヨ鑹叉爣璇�-蹇呭~*/ private String roleId; + /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭~*/ private Integer isApproval; - /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭~*/ private Integer isRefund; - /** 閫�娆剧被鍨�(0:鍏ㄩ儴閫�娆�,1:閮ㄥ垎閫�娆�) */ - private Integer refundOperationType; + //////绯荤粺鍙傛暟 + /** 鍙��娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal totalAmount; + /** 閫夋嫨閫�娆炬�婚噾棰濓紙棰濆鏁版嵁锛�,parameterVerification鏂规硶鏍¢獙鐨勬椂鍊欒祴鍊� */ + private BigDecimal refundTotal; + /** 鍙��娆炬柟寮忛泦鍚� */ + private List<OrderPayMethodDto> payMethodList; + /** 鍙��娆句紭鎯犲埜淇℃伅闆嗗悎 */ + private List<OrderCouponRefunDto> payCouponList; /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭~*/ private Integer platformSource; - /**his鍔╂墜*/ - public static Integer HIS_ASSISTANT = 0; - - /**his鍚庡彴*/ - public static Integer HIS_BACKSTAGE = 1; + /**澶囩敤鍙傛暟*/ + //鎬昏鍗曢寤烘爣璇� + private String hisOrderId; + //闈炲繀濉� 閲嶅彂鏍囪瘑 + private String resendRecordId; } -- Gitblit v1.8.0