Merge branch 'dev_schedule0718' into 'develop'

修改

See merge request !256

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

@@ -342,17 +342,18 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 	private List<KV> packOrderDetail(OrderRequest order) {
 	private List<KV> packOrderDetail(OrderRequest order) {
 		List<KV> items = new ArrayList<>();
 		List<KV> items = new ArrayList<>();
 		items.add(this.packOrderItem("客户姓名", order.getName()));
 		items.add(this.packOrderItem("客户姓名", order.getName()));
-		items.add(this.packOrderItem("标签", order.getTags()));
 		items.add(this.packOrderItem("客户电话", order.getPhone()));
 		items.add(this.packOrderItem("客户电话", order.getPhone()));
+		items.add(this.packOrderItem("客户地址", String.format("%s%s%s",order.getCity(), order.getCounty(), order.getAddress())));
+		items.add(this.packOrderItem("品牌", order.getBrand()));
 		items.add(this.packOrderItem("设备", order.getType()));
 		items.add(this.packOrderItem("设备", order.getType()));
 		items.add(this.packOrderItem("服务", order.getSkill()));
 		items.add(this.packOrderItem("服务", order.getSkill()));
 		items.add(this.packOrderItem("故障描述", order.getFaultDescribe()));
 		items.add(this.packOrderItem("故障描述", order.getFaultDescribe()));
-		items.add(this.packOrderItem("备注", order.getApplyNote()));
-		log.info("======= 意向时间111 {}", order.getExpectTimeBegin());
 		items.add(this.packOrderItem("意向时间", TimeUtils.IsoTimestamp2DateTime(order.getExpectTimeBegin())));
 		items.add(this.packOrderItem("意向时间", TimeUtils.IsoTimestamp2DateTime(order.getExpectTimeBegin())));
-		log.info("======= 意向时间222 {}", TimeUtils.IsoTimestamp2DateTime(order.getExpectTimeBegin()));
 		items.add(this.packOrderItem("时间要求", order.getExpectTimeDesc()));
 		items.add(this.packOrderItem("时间要求", order.getExpectTimeDesc()));
 		items.add(this.packOrderItem("预约方式", order.getSource()));
 		items.add(this.packOrderItem("预约方式", order.getSource()));
+		items.add(this.packOrderItem("标签", order.getTags()));
+		items.add(this.packOrderItem("创建时间", TimeUtils.IsoTimestamp2DateTime(order.getCreateTime())));
+		items.add(this.packOrderItem("备注", order.getApplyNote()));
 		return items;
 		return items;
 	}
 	}