Merge branch 'dev_bugfix_orderdetail0620' into 'develop'

简化代码

See merge request !122

project-order/src/main/java/com/dituhui/pea/order/dto/LabelValueDTO.java

@@ -8,4 +8,12 @@ import lombok.experimental.Accessors;
 public class LabelValueDTO {
 	private String value;
 	private String label;
+
+	public LabelValueDTO() {
+	}
+
+	public LabelValueDTO(String label, String value) {
+		this.label = label;
+		this.value = (value == null) ? "" : value;
+	}
 }

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

@@ -191,6 +191,7 @@ public class OrderAssignImpl implements OrderAssign {
 			TimeLineDTO item = new TimeLineDTO();
 			item.setOrderId(order.getOrderId());
 			item.setPreStatus(order.getPreStatus());
+			item.setAppointmentStatus(order.getStatus());
 			item.setStartTime(TimeUtils.timestamp2DateTime(order.getExpectStartTime(), "HH:mm"));
 			item.setEndTime(TimeUtils.timestamp2DateTime(order.getExpectEndTime(), "HH:mm"));
 			item.setTips(orderTips.getOrDefault(order.getOrderId(), empty));
@@ -211,19 +212,13 @@ public class OrderAssignImpl implements OrderAssign {
 	private List<LabelValueDTO> packOrderTip(OrderRequest order) {
 		// pack订单tips
 		List<LabelValueDTO> items = new ArrayList<>();
-		items.add(this.packLabelValue("类型/品牌", String.format("%s %s %s", order.getSkill(), order.getType(), order.getBrand())));
-		items.add(this.packLabelValue("电话/地址", String.format("%s %s\n%s", order.getName(), order.getPhone(), order.getAddress())));
-		items.add(this.packLabelValue("备注", order.getDescription()));
-		items.add(this.packLabelValue("标签", order.getTags()));
+		items.add(new LabelValueDTO("类型/品牌", String.format("%s %s %s", order.getSkill(), order.getType(), order.getBrand())));
+		items.add(new LabelValueDTO("电话/地址", String.format("%s %s\n%s", order.getName(), order.getPhone(), order.getAddress())));
+		items.add(new LabelValueDTO("备注", order.getDescription()));
+		items.add(new LabelValueDTO("标签", order.getTags()));
 		return items;
 	}
 
-	private LabelValueDTO packLabelValue(String label, String value) {
-		LabelValueDTO item = new LabelValueDTO();
-		item.setLabel(label);
-		item.setValue((value == null) ? "" : value);
-		return item;
-	}
 }
 
 @Data