Commit b19f6155 by huangjinxin

fix:一家多单逻辑

1 parent 0dff24f0
...@@ -290,6 +290,8 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -290,6 +290,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity.setExpectTimeEnd(DateUtil.fromDate(req.getExpectEnd())); entity.setExpectTimeEnd(DateUtil.fromDate(req.getExpectEnd()));
entity.setAppointmentStatus(OrderFlowEnum.INIT.name()); entity.setAppointmentStatus(OrderFlowEnum.INIT.name());
entity.setAppointmentMethod(AppointmentMethodEnum.AUTO_BATCH.name()); entity.setAppointmentMethod(AppointmentMethodEnum.AUTO_BATCH.name());
entity.setDt(entity.getExpectTimeBegin().toLocalDate());
entity.setOrderId(orderId);
//获取省市区 //获取省市区
AdministrativeDistrictReq administrativeDistrictReq = new AdministrativeDistrictReq(); AdministrativeDistrictReq administrativeDistrictReq = new AdministrativeDistrictReq();
administrativeDistrictReq.setPoints(location.getLongitude() + "," + location.getLatitude()); administrativeDistrictReq.setPoints(location.getLongitude() + "," + location.getLatitude());
...@@ -400,7 +402,6 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -400,7 +402,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
// 字段转换 // 字段转换
entity.setSource(req.getSource()); entity.setSource(req.getSource());
entity.setOrderId(orderId);
entity.setName(req.getName()); entity.setName(req.getName());
entity.setPhone(req.getPhone()); entity.setPhone(req.getPhone());
entity.setBeanBrand(req.getBrand()); entity.setBeanBrand(req.getBrand());
...@@ -414,7 +415,6 @@ public class OrderCreateServiceImpl implements OrderCreateService { ...@@ -414,7 +415,6 @@ public class OrderCreateServiceImpl implements OrderCreateService {
entity.setPlanEndTime(entity.getExpectTimeEnd()); entity.setPlanEndTime(entity.getExpectTimeEnd());
// order_request的description字段,仅仅用于内部备注,不对外 // order_request的description字段,仅仅用于内部备注,不对外
entity.setApplyNote(req.getDescription()); entity.setApplyNote(req.getDescription());
entity.setDt(entity.getExpectTimeBegin().toLocalDate());
entity.setSubId(newSubId(entity.getOrderId(), entity.getDt())); entity.setSubId(newSubId(entity.getOrderId(), entity.getDt()));
entity.setX(req.getLocation().getLongitude().toString()); entity.setX(req.getLocation().getLongitude().toString());
entity.setY(req.getLocation().getLatitude().toString()); entity.setY(req.getLocation().getLatitude().toString());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!