feat: 新增返回字段，前端回显信息

guzijian
1 parent e8346572
Showing 2 changed files with 53 additions and 2 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
@@ -3,7 +3,6 @@ package com.trash.garbage.pojo.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import javax.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -19,6 +18,52 @@ public class OrderDetailVo {
     private Integer garEvaluateFlag;
 	private Boolean garHandleEvaluateFlag;
 	private String garOrderCarType;
+
+	/**
+	 * 处理人名
+	 */
+	private String garOrderHandleName;
+
+	public String getGarOrderHandlerId() {
+		return garOrderHandlerId;
+	}
+
+	public Boolean getGarHandleEvaluateFlag() {
+		return garHandleEvaluateFlag;
+	}
+
+	public void setGarHandleEvaluateFlag(Boolean garHandleEvaluateFlag) {
+		this.garHandleEvaluateFlag = garHandleEvaluateFlag;
+	}
+
+	public String getGarOrderCarType() {
+		return garOrderCarType;
+	}
+
+	public void setGarOrderCarType(String garOrderCarType) {
+		this.garOrderCarType = garOrderCarType;
+	}
+
+	public String getGarOrderHandleName() {
+		return garOrderHandleName;
+	}
+
+	public void setGarOrderHandleName(String garOrderHandleName) {
+		this.garOrderHandleName = garOrderHandleName;
+	}
+
+	public String getGarOrderHandleTel() {
+		return garOrderHandleTel;
+	}
+
+	public void setGarOrderHandleTel(String garOrderHandleTel) {
+		this.garOrderHandleTel = garOrderHandleTel;
+	}
+
+	/**
+	 * 联系方式
+	 */
+	private String garOrderHandleTel;
     /**
      * 订单地址
      */
@@ -104,7 +149,7 @@ public class OrderDetailVo {
 		this.garHandleEvaluateFlag = true;
     }
-	public String getGarOrderHandlerId() {
+	public String getGarOrderHandleId() {
 		return garOrderHandlerId;
 	}
@@ -3,6 +3,7 @@ package com.trash.garbage.service.impl;
 import java.util.ArrayList;
 import java.util.List;
+import com.trash.common.utils.StringUtils;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -112,6 +113,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 vo.getPutDownImages().add(image.getGarOrderImageUrl());
             }
         }
+        if (StringUtils.isNotEmpty(vo.getGarOrderHandlerId())){
+            GarUser handleUser = garUserService.getById(vo.getGarOrderHandleId());
+            vo.setGarOrderHandleName(handleUser.getGarUserName());
+            vo.setGarOrderHandleTel(handleUser.getGarUserTel());
+        }
         return vo;
     }