Merge remote-tracking branch 'origin/develop' into develop

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

@@ -214,6 +214,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.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
         if (order == null) {
         if (order == null) {
             throw new BusinessException("订单不存在");
             throw new BusinessException("订单不存在");
         }
         }
@@ -245,7 +246,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             //         (不给当前工程师)
             //         (不给当前工程师)
             if (!isNetwork) {
             if (!isNetwork) {
                 order.setServiceStatus(ServiceStatusEnum.INIT.getCode());
                 order.setServiceStatus(ServiceStatusEnum.INIT.getCode());
-                order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
                 CapacityQueryDTO.Service service = new CapacityQueryDTO.Service();
                 CapacityQueryDTO.Service service = new CapacityQueryDTO.Service();
                 service.setBrand(order.getBrand());
                 service.setBrand(order.getBrand());
                 service.setProductType(order.getType());
                 service.setProductType(order.getType());
@@ -266,7 +266,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             // a.未派人-改约到未来
             // a.未派人-改约到未来
             //  i.动态排班
             //  i.动态排班
             order.setServiceStatus(ServiceStatusEnum.INIT.getCode());
             order.setServiceStatus(ServiceStatusEnum.INIT.getCode());
-            order.setOrderStatus(OrderStatusEnum.RESCHEDULED.getCode());
             if (StringUtils.isBlank(req.getDescription())) {
             if (StringUtils.isBlank(req.getDescription())) {
                 order.setDescription(order.getDescription());
                 order.setDescription(order.getDescription());
             }
             }