From efa1a4d29afeac22b62a624858f6cb31b96b43f0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 11:48:02 +0800
Subject: [PATCH] 提交所有枚举类
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
index 63e459a..20af828 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.OrderFromEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +46,7 @@
private LocalDateTime orderTime;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单")
- private Integer orderFrom;
+ private OrderFromEnum orderFrom;
@ApiModelProperty(value = "会员id")
private Long memberId;
@@ -55,13 +58,13 @@
private String phoneNumber;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
- private Integer paymentMethod;
+ private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "支付合计")
private BigDecimal totalAmount;
@ApiModelProperty(value = "订单状态 1=待发货 2=待收货 3=已完成 4=已取消")
- private Integer orderStatus;
+ private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
private LocalDateTime payTime;
--
Gitblit v1.7.1