location字段类型修改

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/LocationDTO.java

@@ -13,7 +13,8 @@ public class LocationDTO {
     private String adcode;
     private String adcode;
     private String street;
     private String street;
     private String number;
     private String number;
-    private String location;
+    private Float lat;
+    private Float lng;
     private String level;
     private String level;
 }
 }
 
 

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderCreateServiceImpl.java

@@ -124,7 +124,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         // 根据分单，填写clusterId/branchId/groupId/teamId等
         // 根据分单，填写clusterId/branchId/groupId/teamId等
 
 
         String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(req.getBrand(), req.getType(), req.getSkill());
         String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(req.getBrand(), req.getType(), req.getSkill());
-        String teamId = commonService.getTeamIdByInput(req.getLocation().getLocation(), req.getAddress(), layer);
+        String loc = String.format("%f,%f", req.getLocation().getLng(), req.getLocation().getLat());
+        String teamId = commonService.getTeamIdByInput(loc, req.getAddress(), layer);
         OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(teamId);
         OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(teamId);
         entity.setOrgClusterId(teamEntity.getClusterId());
         entity.setOrgClusterId(teamEntity.getClusterId());
         entity.setOrgBranchId(teamEntity.getBranchId());
         entity.setOrgBranchId(teamEntity.getBranchId());
@@ -132,9 +133,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         entity.setOrgTeamId(teamId);
         entity.setOrgTeamId(teamId);
 
 
         // 根据orderTags, 解析保存到type、skill等字段
         // 根据orderTags, 解析保存到type、skill等字段
-        String[] l = req.getLocation().getLocation().split(",");
-        entity.setX(l[0]);
-        entity.setY(l[1]);
+        entity.setX(req.getLocation().getLng().toString());
+        entity.setY(req.getLocation().getLat().toString());
         // todo 服务单状态、预约状态等
         // todo 服务单状态、预约状态等
         entity.setStatus("OPEN");
         entity.setStatus("OPEN");
         entity.setAppointmentStatus("NOT_ASSIGNED");
         entity.setAppointmentStatus("NOT_ASSIGNED");