Skip to content

yangxiujun / paidan_demo

Go to a project
Commit 10b2bb52 by wangli
Options

接口新增返回字段

1 parent c503cdaf
Inline Side-by-side
Showing with 18 additions and 15 deletions
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchEngineerOrderListResp.java
...@@ -42,16 +42,14 @@ public class DispatchEngineerOrderListResp { ...@@ -42,16 +42,14 @@ public class DispatchEngineerOrderListResp {
private String phone; private String phone;
private String expectTimeDesc; private String expectTimeDesc;
private String source; private String source;
private String appointmentStatus; private String dispatcher;
private String appointmentType; private String appointmentType;
private String createTime; private String appointmentStatus;
private String serviceStatus;
private String orderStatus; private String orderStatus;
private String orderStatusDesc; private String orderStatusDesc;
private String createTime;
private String groupTag; private String groupTag;
private Integer groupWeight; private Integer groupWeight;
private String intentionTime; // 待删除 TODO
private String customerName; // 待删除 TODO
private String category; // 待删除 TODO
private String remark; // 待删除 TODO
} }
} }
project-order/src/main/java/com/dituhui/pea/order/dto/DispatchOrderListResp.java
...@@ -31,14 +31,13 @@ public class DispatchOrderListResp { ...@@ -31,14 +31,13 @@ public class DispatchOrderListResp {
private String phone; private String phone;
private String expectTimeDesc; private String expectTimeDesc;
private String source; private String source;
private String appointmentStatus;
private String appointmentType; private String appointmentType;
private String dispatcher;
private String appointmentStatus;
private String orderStatus;
private String serviceStatus;
private String createTime; private String createTime;
private String groupTag; private String groupTag;
private Integer groupWeight; private Integer groupWeight;
private String intentionTime; // 待删除 TODO
private String customerName; // 待删除 TODO
private String category; // 待删除 TODO
private String remark; // 待删除 TODO
} }
} }
project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java
...@@ -12,6 +12,7 @@ import com.dituhui.pea.order.dto.DispatchEngineerOrderListResp; ...@@ -12,6 +12,7 @@ import com.dituhui.pea.order.dto.DispatchEngineerOrderListResp;
import com.dituhui.pea.order.dto.DispatchOrderListReq; import com.dituhui.pea.order.dto.DispatchOrderListReq;
import com.dituhui.pea.order.dto.DispatchOrderListResp; import com.dituhui.pea.order.dto.DispatchOrderListResp;
import com.dituhui.pea.order.entity.*; import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.enums.OrderStatus;
import com.dituhui.pea.order.service.DispatchService; import com.dituhui.pea.order.service.DispatchService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -97,8 +98,11 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -97,8 +98,11 @@ public class DispatchServiceImpl implements DispatchService {
item.setPhone(o.getPhone()); item.setPhone(o.getPhone());
item.setExpectTimeDesc(o.getExpectTimeDesc()); item.setExpectTimeDesc(o.getExpectTimeDesc());
item.setSource(o.getSource()); item.setSource(o.getSource());
item.setAppointmentStatus(o.getAppointmentStatus()); item.setDispatcher(o.getDispatcher());
item.setAppointmentType(o.getAppointmentMethod()); item.setAppointmentType(o.getAppointmentMethod());
item.setAppointmentStatus(o.getAppointmentStatus());
item.setOrderStatus(o.getOrderStatus());
item.setServiceStatus(o.getServiceStatus());
item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime())); item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
String[] tags = gt.getGroupTag(o).split("#"); String[] tags = gt.getGroupTag(o).split("#");
...@@ -194,10 +198,12 @@ public class DispatchServiceImpl implements DispatchService { ...@@ -194,10 +198,12 @@ public class DispatchServiceImpl implements DispatchService {
item.setExpectTimeDesc(String.format("%s/%s", time, timeSlot)); item.setExpectTimeDesc(String.format("%s/%s", time, timeSlot));
item.setSource(o.getSource()); item.setSource(o.getSource());
item.setAppointmentStatus(o.getAppointmentStatus()); item.setDispatcher(o.getDispatcher());
item.setAppointmentType(o.getAppointmentMethod()); item.setAppointmentType(o.getAppointmentMethod());
item.setOrderStatus(o.getOrderStatus()); // 预约单状态 item.setAppointmentStatus(o.getAppointmentStatus());
item.setOrderStatusDesc(o.getOrderStatus()); // 预约单状态描述, TODO item.setOrderStatus(o.getOrderStatus()); // 订单状态
item.setServiceStatus(o.getServiceStatus());
item.setOrderStatusDesc(OrderStatus.valueOf(o.getOrderStatus()).getDescription());
item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime())); item.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
items.add(item); items.add(item);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!