From a0cd34acf14a149cc3c08b41ca4dde6938a29ecc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Wed, 07 Jul 2021 22:31:34 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 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 42eab39..243f318 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
@@ -15,6 +15,16 @@
private static final long serialVersionUID = 1L;
+ private String createBy;
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
/**
* 订单明细
*/
@@ -32,6 +42,11 @@
*/
private Integer count;
+
+ /**
+ * 退款数量
+ */
+ private Integer refundCount;
/**
@@ -87,11 +102,8 @@
* 欠款金额
*/
private Double arrears;
-
-
-
- //页面参数使用
+
/**
* 付款方式
*/
@@ -108,8 +120,7 @@
*/
private Long cardId;
-
-
+
/**
* 是否为综合卡创建的订单明细
* 1是
@@ -123,6 +134,53 @@
*/
private ShoppingGoods shoppingGoods;
+
+ /**
+ * 原有数量
+ */
+ 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) {
+ this.preCount = preCount;
+ }
public ShoppingGoods getShoppingGoods() {
return shoppingGoods;
@@ -143,14 +201,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