From baa79615425b71521e67ec8a9344b88ce53fc5de Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 13:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 80 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 18 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 7f34c77..835d02c 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
@@ -1,6 +1,5 @@
package com.matrix.system.hive.bean;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,7 +15,15 @@
*/
public class SysOrder implements Serializable {
- private static final long serialVersionUID = 1L;
+ /**
+ * 订单类型-销售订单
+ */
+ public static final int ORDER_TYPE_SEAL= 1;
+
+ /**
+ * 订单类型-退款订单
+ */
+ public static final int ORDER_TYPE_REFUND= 2;
/**
* 序号
@@ -78,24 +85,24 @@
/**
* 订单总价
*/
- private double total;
+ private Double total;
/**
* 折后价
*/
- private double zkTotal;
+ private Double zkTotal;
/**
* 现金支付金额
*/
- private double cashPay;
+ private Double cashPay;
/**
* 现金支付金额
*/
- private double cardPay;
+ private Double cardPay;
/**
* 欠款金额
*/
- private double arrears;
+ private Double arrears;
/**
* 店铺id
@@ -126,7 +133,12 @@
* 会员姓名
*/
private String vipNo;
-
+
+ /**
+ * 订单类型1，销售订单，2退款订单
+ */
+ private Integer orderType;
+
/* 会员手机号
*/
private String vipPhone;
@@ -165,12 +177,36 @@
*/
private Integer times;
+
private String type;
/**
* 原有订单ID 退款时使用
*/
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;
@@ -194,6 +230,14 @@
public void setShopShortName(String shopShortName) {
this.shopShortName = shopShortName;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
}
public String getType() {
@@ -244,19 +288,19 @@
this.searchShop = searchShop;
}
- public double getArrears() {
+ public Double getArrears() {
return arrears;
}
- public void setArrears(double arrears) {
+ public void setArrears(Double arrears) {
this.arrears = arrears;
}
- public double getCardPay() {
+ public Double getCardPay() {
return cardPay;
}
- public void setCardPay(double cardPay) {
+ public void setCardPay(Double cardPay) {
this.cardPay = cardPay;
}
@@ -283,11 +327,11 @@
public void setEndTimeVo(Date endTimeVo) {
this.endTimeVo = endTimeVo;
}
- public double getCashPay() {
+ public Double getCashPay() {
return cashPay;
}
- public void setCashPay(double cashPay) {
+ public void setCashPay(Double cashPay) {
this.cashPay = cashPay;
}
@@ -393,11 +437,11 @@
this.activity = activity;
}
- public double getTotal() {
+ public Double getTotal() {
return total;
}
- public void setTotal(double total) {
+ public void setTotal(Double total) {
this.total = total;
}
@@ -422,11 +466,11 @@
this.changeId = changeId;
}
- public double getZkTotal() {
+ public Double getZkTotal() {
return zkTotal;
}
- public void setZkTotal(double zkTotal) {
+ public void setZkTotal(Double zkTotal) {
this.zkTotal = zkTotal;
}
--
Gitblit v1.9.1