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/SysOrderItem.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
index dc1bdea..acd3b19 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
@@ -33,6 +33,11 @@
private Integer count;
+ /**
+ * 退款数量
+ */
+ private Integer refundCount;
+
/**
* 是否为赠送和 是否
@@ -87,11 +92,8 @@
* 欠款金额
*/
private Double arrears;
-
-
-
- //页面参数使用
+
/**
* 付款方式
*/
@@ -108,8 +110,7 @@
*/
private Long cardId;
-
-
+
/**
* 是否为综合卡创建的订单明细
* 1是
@@ -129,8 +130,42 @@
*/
private int preCount;
+ /**
+ * 是否退库存
+ */
+ private String isReturnStore;
+
+ /**
+ * 退款时，原itemid
+ */
+ private Long oldItemId;
+
+ public Long getOldItemId() {
+ return oldItemId;
+ }
+
+ public void setOldItemId(Long oldItemId) {
+ this.oldItemId = oldItemId;
+ }
+
+ public String getIsReturnStore() {
+ return isReturnStore;
+ }
+
+ public void setIsReturnStore(String isReturnStore) {
+ this.isReturnStore = isReturnStore;
+ }
+
public int getPreCount() {
return preCount;
+ }
+
+ public Integer getRefundCount() {
+ return refundCount;
+ }
+
+ public void setRefundCount(Integer refundCount) {
+ this.refundCount = refundCount;
}
public void setPreCount(int preCount) {
@@ -156,14 +191,15 @@
/**
* 业绩计算
*/
- private List<AchieveNew> achaeveList;
+ private List<AchieveNew> achieveList;
- public List<AchieveNew> getAchaeveList() {
- return achaeveList;
+
+ public List<AchieveNew> getAchieveList() {
+ return achieveList;
}
- public void setAchaeveList(List<AchieveNew> achaeveList) {
- this.achaeveList = achaeveList;
+ public void setAchieveList(List<AchieveNew> achieveList) {
+ this.achieveList = achieveList;
}
public String getPayMethodDetail() {
--
Gitblit v1.9.1