From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java |  173 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 151 insertions(+), 22 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 0b49d2f..62d0769 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,7 @@
 package com.matrix.system.hive.bean;
 
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.anotations.Extend;
+import com.matrix.core.tools.DateUtil;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -15,7 +16,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;
 
 	/**
 	 * 序号
@@ -34,7 +43,7 @@
 	private Date orderTime;
 
 	/**
-	 * 收款
+	 * calculationType: 1,
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
 	private Date payTime;
@@ -48,7 +57,18 @@
 	 * 员工编号(美容顾问) 下单人id
 	 */
 	private Long staffId;
-	
+	/**
+	 * 收银员姓名
+	 */
+	@Extend
+	private String cashierName;
+
+
+	/**
+	 * 收银员
+	 */
+	private Long cashierId;
+
 	/**
 	 * 商机id
 	 */
@@ -77,24 +97,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
@@ -114,6 +134,8 @@
 	 * 订单明细
 	 */
 	private List<SysOrderItem> items;
+
+	private List<SysOrderFlow> flows;
 	/**
 	 * 会员姓名
 	 */
@@ -123,14 +145,22 @@
 	 * 会员姓名
 	 */
 	private String vipNo;
-	
+
+	/**
+	 * 订单类型1，销售订单，2退款订单
+	 */
+	private Integer orderType;
+
 	/* 会员手机号
 	 */
 	private String vipPhone;
 
+
 	private	String staffName;
 	
 	private String shopName;
+
+	private String shopShortName;
 	
 	private Long searchShop;
 	/**
@@ -149,12 +179,111 @@
 	/**
 	 * 表单搜索条件（开始时间结束时间）
 	 */
-	@DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
 	private Date beginTimeVo;
 
-	@DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+	@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
 	private Date endTimeVo;
 
+	/**
+	 * 消费次数
+	 */
+	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 String getCashierName() {
+		return cashierName;
+	}
+
+	public void setCashierName(String cashierName) {
+		this.cashierName = cashierName;
+	}
+
+	public Long getCashierId() {
+		return cashierId;
+	}
+
+	public void setCashierId(Long cashierId) {
+		this.cashierId = cashierId;
+	}
+
+	public Integer getIsHasRefund() {
+		return isHasRefund;
+	}
+
+	public void setIsHasRefund(Integer isHasRefund) {
+		this.isHasRefund = isHasRefund;
+	}
+
+	public Long getOldOrderId() {
+		return oldOrderId;
+	}
+
+	public void setOldOrderId(Long oldOrderId) {
+		this.oldOrderId = oldOrderId;
+	}
+
+	public List<SysOrderFlow> getFlows() {
+		return flows;
+	}
+
+	public void setFlows(List<SysOrderFlow> flows) {
+		this.flows = flows;
+	}
+
+	public String getShopShortName() {
+		return shopShortName;
+	}
+
+	public void setShopShortName(String shopShortName) {
+		this.shopShortName = shopShortName;
+	}
+
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Integer getTimes() {
+		return times;
+	}
+
+	public void setTimes(Integer times) {
+		this.times = times;
+	}
 
 	public String getBeatuyId() {
 		return beatuyId;
@@ -188,19 +317,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;
 	}
 
@@ -227,11 +356,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;
 	}
 	
@@ -337,11 +466,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;
 	}
 
@@ -366,11 +495,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