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

platform-common/src/main/java/com/platform/service/impl/ZhiHouseService.java

@@ -180,11 +180,12 @@ public class ZhiHouseService {
         return JSONObject.parseObject(JSONObject.toJSONString(mySceneList.get(0)));
     }
 
-    public Object generateDefaultLiveRoom(String sceneNum) {
+    public Object generateDefaultLiveRoom(String sceneNum,Boolean lived) {
         String url = zhiHouseHost + "scene/generateDefaultLiveRoom";
         logger.info("请求地址：{}",url);
         Map<String ,Object> params = new HashMap<>(1);
         params.put("sceneNum",sceneNum);
+        params.put("lived",lived);
         ResponseEntity<ReturnDTO> responseEntity = restTemplate.postForEntity(url,params,ReturnDTO.class);
         if(responseEntity.getStatusCode()!= HttpStatus.OK){
             throw new CommonBaseException(ResultCodeEnum.D100,"生成直播间失败");

platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -284,6 +284,14 @@ public class BrandController extends AbstractController{
         if(ObjectUtils.isEmpty(ids)){
             return Result.success();
         }
+        Map<String,Object> brandIds = new HashMap<>();
+        brandIds.put("idList",Arrays.asList(ids));
+        List<BrandEntity> entities = brandService.queryList(brandIds);
+        if(ObjectUtils.isEmpty(entities)){
+            return Result.success();
+        }
+
+
         // 判断场景是否绑定商品，如果绑定商品，不允许删除；
         Map<String, Object> params = new HashMap<>();
         params.put("brandIdList", Arrays.asList(ids));
@@ -301,6 +309,11 @@ public class BrandController extends AbstractController{
         // 删除绑定关系
         mySysUserBrandService.deleteByBrandIds(ids);
 
+
+        for (BrandEntity entity : entities) {
+            zhiHouseService.generateDefaultLiveRoom(entity.getSceneNum(),false);
+        }
+
         brandService.deleteBatch(ids);
         return Result.success();
     }

platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -45,11 +45,11 @@ public class SceneController extends AbstractController{
 
             BrandEntity brand = brandService.queryByScene(sceneNum);
             if (!ObjectUtils.isEmpty(brand)) {
-                zhiHouseService.generateDefaultLiveRoom(sceneNum);
+                zhiHouseService.generateDefaultLiveRoom(sceneNum,true);
                 return Result.failure("直播间已存在！");
             }
 
-            Object result = zhiHouseService.generateDefaultLiveRoom(sceneNum);
+            Object result = zhiHouseService.generateDefaultLiveRoom(sceneNum,true);
 
             SceneEntity sceneEntity = JSONObject.parseObject(JSONObject.toJSONString(result),SceneEntity.class);
             sceneEntity.setToken(token);