Commit db81cf82 by 丁伟峰

Merge branch 'feat-dingwf-mvp616' into develop

2 parents 473ccf3b 2d8b177d
...@@ -58,9 +58,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -58,9 +58,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
/* /*
location ==> [layer_info] ==> team ==> (+skill) ==> [capacity_team_stat] location ==> [layer_info] ==> team ==> (+skill) ==> [capacity_team_stat]
*/ */
log.info("===> getOneCapacityData");
String teamId; String teamId;
String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill()); String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill());
List<LayerAndArea> layerAndAreas = getLayerAndAreas(reqDTO.getLocation(), reqDTO.getAddress()); List<LayerAndArea> layerAndAreas = getLayerAndAreas(reqDTO.getLocation(), reqDTO.getAddress());
log.info("=== getLayerAndAreas() ==> {}", layerAndAreas);
if (layerAndAreas == null || layerAndAreas.size() == 0) { if (layerAndAreas == null || layerAndAreas.size() == 0) {
// 分单接口没有查到,本地随机处理一下 // 分单接口没有查到,本地随机处理一下
teamId = capacityTeamStatDao.getRandomTeamIdByLayer(layer); teamId = capacityTeamStatDao.getRandomTeamIdByLayer(layer);
...@@ -74,6 +76,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService { ...@@ -74,6 +76,7 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
if (teamId == null || teamId.isBlank()) { if (teamId == null || teamId.isBlank()) {
teamId = capacityTeamStatDao.getRandomTeamId(); teamId = capacityTeamStatDao.getRandomTeamId();
} }
log.info("teamId ==> {}", teamId);
assert (teamId != null && !teamId.isBlank()); assert (teamId != null && !teamId.isBlank());
CapacityQueryOrderRespDTO capacityQueryRespDTO = new CapacityQueryOrderRespDTO(); CapacityQueryOrderRespDTO capacityQueryRespDTO = new CapacityQueryOrderRespDTO();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!