|
@@ -165,6 +165,9 @@ public class BrandController extends AbstractController{
|
|
return Result.failure("参数有误!");
|
|
return Result.failure("参数有误!");
|
|
}
|
|
}
|
|
BrandEntity brand = brandService.queryObject(brandEntity.getId().intValue());
|
|
BrandEntity brand = brandService.queryObject(brandEntity.getId().intValue());
|
|
|
|
+ if(brand == null ){
|
|
|
|
+ throw new RRException("直播间为空!");
|
|
|
|
+ }
|
|
BrandRspVo brandRspVo = new BrandRspVo();
|
|
BrandRspVo brandRspVo = new BrandRspVo();
|
|
BeanUtils.copyProperties(brand,brandRspVo);
|
|
BeanUtils.copyProperties(brand,brandRspVo);
|
|
JSONObject jsonObject = zhiHouseService.queryBySceneNum(brand.getSceneNum(),token);
|
|
JSONObject jsonObject = zhiHouseService.queryBySceneNum(brand.getSceneNum(),token);
|
|
@@ -295,6 +298,10 @@ public class BrandController extends AbstractController{
|
|
return Result.success();
|
|
return Result.success();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ Integer recommendCount = zhiHouseService.getCountRecommendByBrandIds(ids);
|
|
|
|
+ if(recommendCount == null || recommendCount >0){
|
|
|
|
+ throw new RRException("直播间数据已被绑定,请先解除绑定!");
|
|
|
|
+ }
|
|
|
|
|
|
// 判断场景是否绑定商品,如果绑定商品,不允许删除;
|
|
// 判断场景是否绑定商品,如果绑定商品,不允许删除;
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|