From 6b0b81af0d1d4cfa9702ec8c548d4bc89e202c46 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 6 Dec 2024 15:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/enums/OrderStatusEnum.java | 17 ++++++++--------- .../mapper/material/order/OrderInfoMapper.xml | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java index a1526ff..0d5b01e 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/OrderStatusEnum.java @@ -11,15 +11,14 @@ import lombok.Getter; public enum OrderStatusEnum { NO_ORDER_PLACED(0, "未下单"), - TO_ORDER_PLACED(1, "已下单"), - ORDER_RECEIVE(2, "已接单"), - ORDER_PENDING_SHIPMENT(3, "待出库"), - ORDER_AWAITING_RECEIPT(4, "待收货"), - ORDER_UNDER_LEASE(5, "租赁中"), - ORDER_TERMINATED(6, "已退租"), - ORDER_SETTLEMENT(7, "已结算"), - ORDER_FINISHED(8, "已完成"), - ORDER_CANCEL(9, "已取消"); + TO_ORDER_PLACED(1, "已下单-待接单"), + ORDER_RECEIVE(2, "已接单-待出库"), + ORDER_PENDING_SHIPMENT(3, "已出库-待收货"), + ORDER_AWAITING_RECEIPT(4, "已收货-租赁中"), + ORDER_UNDER_LEASE(5, "已退租-待结算"), + ORDER_TERMINATED(6, "已结算-待完成"), + ORDER_FINISHED(7, "已完成"), + ORDER_CANCEL(8, "已取消"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index ce73fe4..00d4535 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,rent_over_user = #{userName} ,rent_over_time = now() - + ,refuse_user = #{userName} ,refuse_time = now()