Commit bbc31bea by huangjinxin

fix:订单返回服务状态

1 parent 65adc43e
......@@ -22,6 +22,7 @@ public class ScheduleEngineerOverviewResp {
private String type;
private String skill;
private String orderStatus;
private String serviceStatus;
private String orderStatusName;
/**
* 在途公里数
......
......@@ -17,6 +17,7 @@ import com.dituhui.pea.order.enums.OrderFlowEnum;
import com.dituhui.pea.order.enums.VehicleEnum;
import com.dituhui.pea.order.service.ScheduleService;
import com.dituhui.pea.order.utils.CommonUtil;
import com.dituhui.pea.order.utils.OrderUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
......@@ -288,7 +289,8 @@ public class ScheduleServiceImpl implements ScheduleService {
item.setLocation(String.format("%s,%s", o.getX(), o.getY()));
item.setType(o.getType());
item.setSkill(o.getSkill());
item.setOrderStatus(o.getAppointmentStatus());
item.setOrderStatus(o.getOrderStatus());
item.setServiceStatus(OrderUtil.handleServiceStatus(o));
item.setOrderStatusName("");
item.setDistance(CommonUtil.converMToKm(o.getArriveDistance()));
item.setTimeType("auto");
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!