From b2a5e4be739b232876b87e65ed70fa5186943d1e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 09 三月 2022 09:29:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java
index c2f9eaa..9456b9c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderOperateDO.java
@@ -1,11 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -58,14 +58,19 @@
@Override
public String toString() {
- return "ComShopOrderOperateDO{" +
- "id=" + id +
- ", orderNo=" + orderNo +
- ", operationBy=" + operationBy +
- ", operationTime=" + operationTime +
- ", operationType=" + operationType +
- ", operationContent=" + operationContent +
- ", createAt=" + createAt +
- "}";
+ return "ComShopOrderOperateDO{" + "id=" + id + ", orderNo=" + orderNo + ", operationBy=" + operationBy
+ + ", operationTime=" + operationTime + ", operationType=" + operationType + ", operationContent="
+ + operationContent + ", createAt=" + createAt + "}";
+ }
+
+ /**
+ * 操作类型(1.创建订单 2.取消订单 3.订单支付 4.订单发货 5.订单完成)
+ */
+ public interface operationType {
+ int create = 1;
+ int cancel = 2;
+ int pay = 3;
+ int deliver = 4;
+ int complete = 5;
}
}
\ No newline at end of file
--
Gitblit v1.7.1