feat: 重复发送订单实体修改

constant/src/main/java/com/onsiteservice/constant/constant/BizConstants.java

@@ -19,6 +19,7 @@ public class BizConstants {
     public static class OrderConstants {
         public static final String ORDER_ID = "orderId";
         public static final String ORDER_STATUS = "orderStatus";
+        public static final String DUP_ORDER_STATUS = "dupOrderStatus";
         public static final long TIMEOUT_CANCEL_LIMIT = 1000 * 60 * 30;
 
         /**

constant/src/main/java/com/onsiteservice/constant/enums/BizCodeEnum.java

@@ -25,6 +25,7 @@ public enum BizCodeEnum {
     SERVICE_ORDER_CANNOT_VALUATION("订单不能派估价员"),
     SERVICE_ORDER_CANNOT_REVALUATION("订单未估价,不能修改"),
     SERVICE_ORDER_CANNOT_SEND("订单未受理,不能发送或已发送"),
+    SERVICE_ORDER_CANNOT_RESEND("订单不能重新发送"),
     SERVICE_ORDER_CANNOT_PAY("订单未受理,暂不能支付"),
     SERVICE_ORDER_CANNOT_CANCEL("订单不能取消"),
     SERVICE_ORDER_CANNOT_REFUND("订单不能申请退款"),

constant/src/main/java/com/onsiteservice/constant/enums/ServiceOrderStatusEnum.java

@@ -27,11 +27,12 @@ public enum ServiceOrderStatusEnum {
      * 已发送
      */
     SEND(3, "%s 已发送订单信息"),
+    RESEND(3, "%s 已重新发送订单信息"),
 
     /**
      * 已支付
      */
-    PAY(4, "用户已付款"),
+    PAY(4, "用户已付款 %s 元"),
 
     /**
      * 已派单

entity/src/main/java/com/onsiteservice/entity/order/ServiceOrder.java

@@ -99,17 +99,25 @@ public class ServiceOrder implements Serializable {
     private Boolean readAgreement;
 
     /**
-     * 订单状态：1已预约，2已派单，3进行中，4完成，5取消，6已评价
+     * 订单状态：1用户下单，2派估价员或修改估价员，3发送订单，4支付，5派维修工或修改维修工，6完成订单，7取消订单
      */
     @Column(name = "order_status")
-    @ApiModelProperty("订单状态：1已预约，2已派单，3进行中，4完成，5取消，6已评价")
+    @ApiModelProperty("订单状态：1用户下单，2派估价员或修改估价员，3发送订单，4支付，5派维修工或修改维修工，6完成订单，7取消订单")
     private Integer orderStatus;
 
     /**
-     * 价格
+     * 重新发送后的订单状态：3发送订单，4支付，5派维修工或修改维修工
      */
+    @Column(name = "dup_order_status")
+    @ApiModelProperty("重新发送后的订单状态：3发送订单，4支付，5派维修工或修改维修工")
+    private Integer dupOrderStatus;
+
+    @Column(name = "total_price")
+    @ApiModelProperty("订单总价格，以元为单位")
+    private BigDecimal totalPrice;
+
     @Column(name = "price")
-    @ApiModelProperty("订单价格")
+    @ApiModelProperty("当前发送订单操作的价格，以元为单位")
     private BigDecimal price;
 
     /**