فهرست منبع

添加绑定账号自动同步逻辑

tianboguang 3 سال پیش
والد
کامیت
604cd64a9d

+ 8 - 4
platform-shop/src/main/java/com/platform/controller/SceneController.java

@@ -195,16 +195,20 @@ public class SceneController extends AbstractController{
         boolean geratedable = false;
         if(Constant.SUPER_ADMIN == userId){
             requestScene.setUserId(-1L);
-        }else{
+        } else {
             CurrentUserLoginVo user = getUser();
-            if(user.getRoleId() == 6){
+            if (user.getRoleId() == 6) {
                 geratedable = true;
                 // 获取该公司下所有员工手机号
                 List<Long> subDeptIds = getAllSubDeptIds(getDeptId());
                 List<SysUserEntity> users = sysUserService.getSysUserListByDeptIds(subDeptIds);
                 requestScene.setPhone(users.stream().map(SysUserEntity::getMobile).collect(Collectors.joining(";")));
-            }else if(user.getRoleId() == 8 && (ObjectUtils.isEmpty(user.getIsPlatformStreamer()) && !user.getIsPlatformStreamer())){
-                requestScene.setPhone(user.getMobile());
+            } else if (user.getRoleId() == 8) {
+                if ((ObjectUtils.isEmpty(user.getIsPlatformStreamer()) || !user.getIsPlatformStreamer())) {
+                    requestScene.setPhone(user.getMobile());
+                } else {
+                    requestScene.setUserId(-1L);
+                }
             }
         }
         JSONObject mySceneJsonData = zhiHouseService.getSceneFromZhiHouse(requestScene);

+ 8 - 1
platform-shop/src/main/java/com/platform/controller/SysUserController.java

@@ -12,6 +12,7 @@ import com.platform.service.SysUserRoleService;
 import com.platform.service.SysUserService;
 import com.platform.service.custom.MySysUserBrandService;
 import com.platform.service.impl.SysDeptServiceImpl;
+import com.platform.service.impl.ZhiHouseService;
 import com.platform.utils.*;
 import com.platform.validator.Assert;
 import com.platform.validator.ValidatorUtils;
@@ -62,6 +63,9 @@ public class SysUserController extends AbstractController {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private ZhiHouseService zhiHouseService;
+
     @Value("${scenePath}")
     private String scenePath;
 
@@ -193,11 +197,14 @@ public class SysUserController extends AbstractController {
      */
     @SysLog("修改密码")
     @PostMapping("/bind4dkkUser")
-    public R password(String fdkkPassword, String fdkkUser) {
+    public R bind4dkkUser(String fdkkPassword, String fdkkUser) {
         Assert.isBlank(fdkkUser, "手机号不为能空");
         Assert.isBlank(fdkkPassword, "4d看看密码不为能空");
         //更新密码
         sysUserService.updatePassword(getUser().getMobile(), null, fdkkPassword, fdkkUser);
+
+        // 同步数据
+        zhiHouseService.sync4dkkSceneData(getUser().getMobile());
         return R.ok();
     }