From 89e17a219d8a6d208e4cb32a43e90abb89b3c93b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Jan 2021 16:17:26 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
index 6292e8f..8c8cc65 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderFlow.java
@@ -1,5 +1,8 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -11,10 +14,22 @@
public class SysOrderFlow implements Serializable {
private static final long serialVersionUID = 7519131902836023680L;
- public static final String PAY_METHOD_CARD = "会员卡";
+ public static final String PAY_METHOD_CARD = "储值卡";
+
+ public static final String PAY_METHOD_ARREARS = "欠款";
+
+ public static final String FLOW_TYPE_BUY = "购买";
+
+ public static final String FLOW_TYPE_REPAY = "还款";
+
+ public static final String FLOW_TYPE_REFUND = "退款";
+
+ public static final String IS_GIFT_Y = "Y";
+ public static final String IS_GIFT_N = "N";
private String createBy;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT-8")
private Date createTime;
private String updateBy;
@@ -40,6 +55,20 @@
private Long cardId;
private String isGift;
+
+ private String orderNo;
+
+ private Long shopId;
+
+ private Long companyId;
+
+ public String getOrderNo() {
+ return orderNo;
+ }
+
+ public void setOrderNo(String orderNo) {
+ this.orderNo = orderNo;
+ }
public Long getCardId() {
return cardId;
@@ -152,4 +181,20 @@
public void setVipId(Long vipId) {
this.vipId = vipId;
}
+
+ public Long getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(Long shopId) {
+ this.shopId = shopId;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
}
--
Gitblit v1.9.1