Merge branch 'feature-dingwf-0715' into develop

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

@@ -42,6 +42,7 @@ public class CommonService {
         if (layerAndAreas == null || layerAndAreas.size() == 0) {
         if (layerAndAreas == null || layerAndAreas.size() == 0) {
             // 分单接口没有查到，本地随机处理一下
             // 分单接口没有查到，本地随机处理一下
             teamId = capacityTeamStatDao.getRandomTeamIdByLayer(layer);
             teamId = capacityTeamStatDao.getRandomTeamIdByLayer(layer);
+            log.info("分单接口没有查到，本地随机处理一下 ==> {}", teamId);
         } else {
         } else {
             // 分单接口查到了areaId(blockId)，查询map_block_info，从而限定groupId，然后再随机teamId，这样就相对真实一点
             // 分单接口查到了areaId(blockId)，查询map_block_info，从而限定groupId，然后再随机teamId，这样就相对真实一点
             // 生成随机索引
             // 生成随机索引
@@ -49,7 +50,7 @@ public class CommonService {
             // 获取随机元素
             // 获取随机元素
             LayerAndArea layerAndArea = layerAndAreas.get(randomIndex);
             LayerAndArea layerAndArea = layerAndAreas.get(randomIndex);
             teamId = mapBlockInfoDao.getTeamIdByBlockIdAndLayer(layerAndArea.areaId, layer);
             teamId = mapBlockInfoDao.getTeamIdByBlockIdAndLayer(layerAndArea.areaId, layer);
-            log.info("layerAndArea=={}, teamId=={}", layerAndArea, teamId);
+            log.info("分单接口查询返回区块，layerAndArea=={}, teamId=={}", layerAndArea, teamId);
         }
         }
         if (StringUtils.isEmpty(teamId)) {
         if (StringUtils.isEmpty(teamId)) {
             teamId = capacityTeamStatDao.getRandomTeamId();
             teamId = capacityTeamStatDao.getRandomTeamId();