Merge branch 'dev_orderlist0717' into 'develop'

修改

See merge request !249

project-order/src/main/java/com/dituhui/pea/order/service/impl/DispatchServiceImpl.java

@@ -214,7 +214,11 @@ public class DispatchServiceImpl implements DispatchService {
 				item.setAddress(o.getAddress());
 				item.setAddress(o.getAddress());
 				item.setName(o.getName());
 				item.setName(o.getName());
 				item.setPhone(o.getPhone());
 				item.setPhone(o.getPhone());
-				item.setExpectTimeDesc(o.getExpectTimeDesc());
+
+				String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
+				String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
+				item.setExpectTimeDesc(String.format("%s/%s", time, timeSlot));
+
 				item.setSource(o.getSource());
 				item.setSource(o.getSource());
 				item.setAppointmentStatus(o.getAppointmentStatus());
 				item.setAppointmentStatus(o.getAppointmentStatus());
 				item.setAppointmentType(o.getAppointmentMethod());
 				item.setAppointmentType(o.getAppointmentMethod());
@@ -226,8 +230,6 @@ public class DispatchServiceImpl implements DispatchService {
 				item.setCategory(String.format("%s-%s", o.getType(), o.getBrand()));
 				item.setCategory(String.format("%s-%s", o.getType(), o.getBrand()));
 				item.setRemark(o.getApplyNote());
 				item.setRemark(o.getApplyNote());
 				item.setCustomerName(o.getName());
 				item.setCustomerName(o.getName());
-				String time = TimeUtils.timestamp2DateTime(r.getExpectStartTime(), "HH:mm");
-				String timeSlot = this.parseTimeSlot(r.getExpectStartTime());
 				item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 				item.setIntentionTime(String.format("%s/%s", time, timeSlot));
 
 
 				items.add(item);
 				items.add(item);