From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify

---
 gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
index 9443cd9..72d3d33 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
@@ -36,10 +36,13 @@
     private String weight;
 
     /**
-     * 订单状态 状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消
+     * 订单状态 状态 1-待接单2-已接单3-已完成(用户)/待入库(集物员)4-已完成5-已取消
      */
     private Integer status;
     public static final Integer ORDER_STATUS_WAITING = 1;
+    public static final Integer ORDER_STATUS_IMG = 2;
+    public static final Integer ORDER_STATUS_CONFIRM = 3;
+    public static final Integer ORDER_STATUS_CANCEL = 5;
 
     /**
      * 评论
@@ -66,6 +69,6 @@
     /**
      * 集物员ID
      */
-    private String jyhId;
+    private String jhyId;
 
 }

--
Gitblit v1.9.1