Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

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

@@ -290,6 +290,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setExpectTimeEnd(DateUtil.fromDate(req.getExpectEnd()));
         entity.setAppointmentStatus(OrderFlowEnum.INIT.name());
         entity.setAppointmentMethod(AppointmentMethodEnum.AUTO_BATCH.name());
+        entity.setDt(entity.getExpectTimeBegin().toLocalDate());
+        entity.setOrderId(orderId);
         //获取省市区
         AdministrativeDistrictReq administrativeDistrictReq = new AdministrativeDistrictReq();
         administrativeDistrictReq.setPoints(location.getLongitude() + "," + location.getLatitude());
@@ -400,7 +402,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
 
         // 字段转换
         entity.setSource(req.getSource());
-        entity.setOrderId(orderId);
         entity.setName(req.getName());
         entity.setPhone(req.getPhone());
         entity.setBeanBrand(req.getBrand());
@@ -414,7 +415,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setPlanEndTime(entity.getExpectTimeEnd());
         // order_request的description字段，仅仅用于内部备注，不对外
         entity.setApplyNote(req.getDescription());
-        entity.setDt(entity.getExpectTimeBegin().toLocalDate());
         entity.setSubId(newSubId(entity.getOrderId(), entity.getDt()));
         entity.setX(req.getLocation().getLongitude().toString());
         entity.setY(req.getLocation().getLatitude().toString());