From 0741dc7f25811ea2acb4127fc43d1dc9a802221c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 21:37:07 +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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 fea0a21..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
@@ -1,5 +1,6 @@
package com.xzx.gc.entity;
+import com.xzx.gc.common.entity.BaseEntity;
import lombok.Data;
import javax.persistence.Table;
@@ -11,7 +12,7 @@
**/
@Data
@Table(name = "xzx_score_order")
-public class ScoreOrder {
+public class ScoreOrder extends BaseEntity {
private String orderNo;
@@ -26,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