Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/dao/OrderInfoDao.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long> {
     OrderInfoEntity getByOrderId(String orderId);
+    OrderInfoEntity getByOrderIdAndDt(String orderId, LocalDate dt);
 
     List<OrderInfoEntity> findByOrderId(String orderId);
 

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

@@ -180,10 +180,12 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 			return Result.failure("区块已存在或者裁剪为空");
 		}
 		String blockId = saasResult.getResult();
+
+		String blockName = String.format("%s_%s", layerName, team.getTeamName()); //区块名称
 		
 		MapBlockInfo block = new MapBlockInfo();
 		block.setBlockId(blockId);
-		block.setBlockName(team.getTeamName());  //默认使用team name;
+		block.setBlockName(blockName);
 		block.setBranchId(team.getBranchId());
 		block.setGroupId(team.getGroupId());
 		block.setTeamId(teamId);