修改同步逻辑

platform-common/src/main/java/com/platform/service/custom/MySysUserBrandService.java

@@ -68,7 +68,7 @@ public class MySysUserBrandService extends SysUserBrandServiceImpl {
         return getBaseMapper().update(sysUserBrand , updateWrapper);
     }
 
-    public SysUserBrand getUserBrandById(long userId , long brandId){
+    public SysUserBrand getUserBrandById(Long userId , Integer brandId){
         QueryWrapper<SysUserBrand> queryWrapper = new QueryWrapper<>();
         if(!ObjectUtils.isEmpty(userId)){
             queryWrapper.eq("user_id" , userId);

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

@@ -234,22 +234,24 @@ public class SysUserController extends AbstractController {
         Long currentUserId = getUserId();
 
         List<SceneEntity> scenes = sceneService.queryByUserId(currentUserId);
-        scenes.parallelStream().filter(scene -> scene.getSceneUrl().contains("www.4dkankan.com")
-                || scene.getSceneUrl().contains("test.4dkankan.com")).forEach(scene -> {
-            // 四维看看场景数据解绑
-            scene.setCreateUserId(null);
-            sceneService.update(scene, false);
-            // 四维看看场景直播间数据解绑
-            BrandEntity brandEntity = brandService.queryByScene(scene.getSceneNum());
-            if(ObjectUtils.isEmpty(brandEntity)){
-                return;
-            }
-            brandService.unbindUser(null,brandEntity.getId().intValue());
-            // 删除直播间
-            brandService.delete(brandEntity.getId().intValue());
-            // 直播间商品删除
-            goodsService.deleteByBrandId(brandEntity.getId());
-        });
+        scenes.parallelStream().filter(scene -> !ObjectUtils.isEmpty(scene.getSceneUrl()))
+                .filter(scene -> scene.getSceneUrl().contains("www.4dkankan.com")
+                        || scene.getSceneUrl().contains("test.4dkankan.com"))
+                .forEach(scene -> {
+                    // 四维看看场景数据解绑
+                    scene.setCreateUserId(null);
+                    sceneService.update(scene, false);
+                    // 四维看看场景直播间数据解绑
+                    BrandEntity brandEntity = brandService.queryByScene(scene.getSceneNum());
+                    if (ObjectUtils.isEmpty(brandEntity)) {
+                        return;
+                    }
+                    brandService.unbindUser(null, brandEntity.getId().intValue());
+                    // 删除直播间
+                    brandService.delete(brandEntity.getId().intValue());
+                    // 直播间商品删除
+                    goodsService.deleteByBrandId(brandEntity.getId());
+                });
         return R.ok();
     }
 

platform-shop/src/main/java/com/platform/service/impl/BrandServiceImpl.java

@@ -413,15 +413,12 @@ public class BrandServiceImpl implements BrandService {
     public void unbindUser(Long userId,Integer brandId) {
         SysUserBrand dbUserBrand  = mySysUserBrandService.getUserBrandById(userId ,brandId);
         //解绑
-        if(null == dbUserBrand){
+        if(ObjectUtils.isEmpty(dbUserBrand)){
             log.info("用户之前未绑定，无需解绑");
             return;
         }
         dbUserBrand.setCanShow(0);
         dbUserBrand.setEnable(0);
-        int update = mySysUserBrandService.updateSysUserBrand(dbUserBrand);
-        if(update != 1){
-            log.info("解绑失败");
-        }
+        mySysUserBrandService.updateSysUserBrand(dbUserBrand);
     }
 }