Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

framework/src/main/java/cn/lili/modules/order/order/entity/enums/TradeStatusEnum.java

@@ -1,30 +1,23 @@
 package cn.lili.modules.order.order.entity.enums;
 
 /**
- * 订单状态枚举
+ * 交易状态枚举
  *
  * @author Chopper
  * @since 2020/11/17 7:27 下午
  */
-public enum OrderStatusEnum {
+public enum TradeStatusEnum {
 
     /**
-     * 订单状态
+     * 交易状态
      */
     UNPAID("未付款"),
     PAID("已付款"),
-    UNDELIVERED("待发货"),
-    DELIVERED("已发货"),
-    COMPLETED("已完成"),
-    /**
-     * 虚拟订单需要核验商品
-     */
-    TAKE("待核验"),
     CANCELLED("已取消");
 
     private final String description;
 
-    OrderStatusEnum(String description) {
+    TradeStatusEnum(String description) {
         this.description = description;
     }