Merge branch 'dev_bugfix_orderdetail0620' into 'develop'

Dev bugfix orderdetail0620

See merge request !118

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

@@ -7,6 +7,7 @@ import java.util.List;
 @Data
 @Data
 public class OrderServiceDetailResp {
 public class OrderServiceDetailResp {
 	private String orderId;
 	private String orderId;
+	private String appointmentStatus;
 	private String status;
 	private String status;
 	private String statusDesc;
 	private String statusDesc;
 	private String risk;
 	private String risk;

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

@@ -11,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import java.sql.Timestamp;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -57,6 +55,7 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
 		res.setRiskDesc("");
 		res.setRiskDesc("");
 		res.setStatusDesc("打开");
 		res.setStatusDesc("打开");
 		res.setStatus(order.getStatus());
 		res.setStatus(order.getStatus());
+		res.setAppointmentStatus(order.getAppointmentStatus());
 		res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
 		res.setLocation(String.format("%s,%s", order.getX(), order.getY()));
 		res.setItems(items);
 		res.setItems(items);