From 0eb67c3b6badf538c959a5e68d293515720187c8 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期五, 28 四月 2023 18:22:12 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 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 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