From 3a82a5078037deef31caf3694acc36c4f386ffb3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 11:14:43 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
index ec10c26..febd1c7 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreOrder.java
@@ -27,13 +27,22 @@
private BigDecimal totalPrice;
/**
- * 2-待收货3-已完成4-已取消
+ * 1-待发货2-待收货3-已收货4-已完成5-已评价6-已取消
*/
private Integer status;
public static final Integer STATUS_READY = 1;
- public static final Integer STATUS_ING = 2;
- public static final Integer STATUS_DONE = 3;
- public static final Integer STATUS_CANCEL = 4;
+ public static final Integer STATUS_ON = 2;
+ public static final Integer STATUS_DOING = 3;
+ public static final Integer STATUS_DONE = 4;
+ public static final Integer STATUS_EVALUATE = 5;
+ public static final Integer STATUS_CANCEL = 6;
+
+ /**
+ * 后台确认提货 1：是 2：否
+ */
+ private Integer isFinish;
+ public static final Integer ISFINISH_YES = 1;
+ public static final Integer ISFINISH_NO = 2;
private String remark;
}
--
Gitblit v1.9.1