From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index dfbe3d2..f160d12 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -42,7 +42,7 @@
private Date orderTime;
/**
- * 收款
+ * calculationType: 1,
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date payTime;
@@ -185,6 +185,29 @@
*/
private Long oldOrderId;
+ /**
+ * 该订单有退款
+ */
+ public static final Integer IS_HAS_REFUND_Y = 1;
+
+ /**
+ * 该订单无退款
+ */
+ public static final Integer IS_HAS_REFUND_N = 2;
+
+ /**
+ * 是否发生退款 1-是 2-否
+ */
+ private Integer isHasRefund;
+
+ public Integer getIsHasRefund() {
+ return isHasRefund;
+ }
+
+ public void setIsHasRefund(Integer isHasRefund) {
+ this.isHasRefund = isHasRefund;
+ }
+
public Long getOldOrderId() {
return oldOrderId;
}
--
Gitblit v1.9.1