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

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

@@ -266,7 +266,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 	@Transactional
 	@Override
 	public Result<?> businessServiceBlockRemove(String blockId) throws BusinessException {
-		MapBlockInfoEntity block = mapBlockInfoDao.findByAreaIds(blockId);
+		MapBlockInfoEntity block = mapBlockInfoDao.getById(Integer.parseInt(blockId));
 		if (block == null) {
 			throw new BusinessException("区块不存在");
 		}
@@ -274,12 +274,12 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
 		entityManager.merge(block);
 
 		// 同步删除saas区块
-		String result = saasRemoteService.deleteArea(ak, blockId);
-		log.info("params:{} result:{}", blockId, result);
-		Result<Boolean> saasResult = TypeUtils.convertResult(result);
-		if (!ResultEnum.SUCCESS.getCode().equals(saasResult.getCode())) {
-			return Result.failure("删除失败，请联系管理员");
-		}
+//		String result = saasRemoteService.deleteArea(ak, blockId);
+//		log.info("params:{} result:{}", blockId, result);
+//		Result<Boolean> saasResult = TypeUtils.convertResult(result);
+//		if (!ResultEnum.SUCCESS.getCode().equals(saasResult.getCode())) {
+//			return Result.failure("删除失败，请联系管理员");
+//		}
 
 		return Result.success(null);
 	}