Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -238,6 +238,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         order.setExpectTimeBegin(expectBegin);
         order.setExpectTimeBegin(expectBegin);
         order.setExpectTimeEnd(expectEnd);
         order.setExpectTimeEnd(expectEnd);
         order.setExpectTimeDesc(req.getExpectDesc());
         order.setExpectTimeDesc(req.getExpectDesc());
+        order.setTranscend(0);
         order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
         order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
         order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
         order.setReschedulingReason(StringUtils.isNotBlank(req.getReschedulingReason()) ? req.getReschedulingReason() : order.getReschedulingReason());
         boolean skillUpdate = false;
         boolean skillUpdate = false;
@@ -363,6 +364,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                         order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
                         order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
                         order.setAppointmentStatus(OrderFlowEnum.INIT.name());
                         order.setAppointmentStatus(OrderFlowEnum.INIT.name());
                         sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
                         sendMsg(order.getOrgBranchId(), order.getOrderId(), req.getExpectBegin());
+                    } else {
+                        order.setTranscend(1);
                     }
                     }
                 }
                 }
             } else if (!isToday && !isBelong) {
             } else if (!isToday && !isBelong) {