From f3bf2c69494bb78afa098819b742677dd8be6b7c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:01:25 +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 | 10 ++++++----
1 files changed, 6 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..7dcc56c 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,15 @@
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;
private String remark;
}
--
Gitblit v1.9.1