订单状态修改，批量新增修改

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, "已取消");
 
 
 

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()
         </if>
-        <if test="orderStatus == 7">
+        <if test="orderStatus == 8">
             ,refuse_user = #{userName}
             ,refuse_time = now()
         </if>