feat: 修改字段类型

guzijian
1 parent faf74894
Showing 2 changed files with 7 additions and 5 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
 package com.trash.garbage.pojo.vo;
  
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.trash.garbage.global.GlobalStatus;
 import lombok.Data;
  
 import java.util.ArrayList;
@@ -15,11 +16,13 @@ public class OrderDetailVo {
  
 	private Integer garCancelFlag;
  
+	private Integer garOrderCarNumber;
+
 	private String garReason;
 	private String garOrderHandlerId;
  
     private Integer garEvaluateFlag;
-	private Boolean garHandlerEvaluateFlag;
+	private Integer garHandlerEvaluateFlag;
 	private String garOrderCarType;
  
 	/**
@@ -114,7 +117,7 @@ public class OrderDetailVo {
         this.putDownImages = new ArrayList<>();
         this.putOnImages = new ArrayList<>();
         this.handleFlag = false;
-		this.garHandlerEvaluateFlag = true;
+		this.garHandlerEvaluateFlag = GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue();
     }
  
  
@@ -304,11 +307,11 @@ public class OrderDetailVo {
 		this.handleFlag = handleFlag;
 	}
  
-	public Boolean getGarHandlerEvaluateFlag() {
+	public Integer getGarHandlerEvaluateFlag() {
 		return garHandlerEvaluateFlag;
 	}
  
-	public void setGarHandlerEvaluateFlag(Boolean garHandlerEvaluateFlag) {
+	public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
 		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
 	}
  
@@ -97,7 +97,6 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         List<DriverVo> driverVos = null;
         if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription())) {
             vo.setHandleFlag(true);
-            vo.setGarHandlerEvaluateFlag(false);
             // 防止其他人员处理订单
             if (!order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue()) && !order.getGarOrderHandlerId().equals(user.getGarUserId())) {
                 vo.setHandleFlag(false);