diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java index d14e7e5..e2b27f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/controller/ZcBaseUserController.java @@ -98,8 +98,10 @@ public class ZcBaseUserController extends BaseController { int flag = zcBaseUserService.insertZcBaseUser(zcBaseUser); if(flag > 0){ + // 存在修改用户信息情况(门店用户场景) + ZcBaseUser baseUser = zcBaseUserService.selectZcBaseUserByPhone(zcBaseUser.getPhoneNumber()); // 推送用户ID - dataPushApi.sendAddUser(zcBaseUser.getId()); + dataPushApi.sendAddUser(baseUser.getId()); } return toAjax(flag); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java index 8adc7a4..418c079 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/IZcBaseUserService.java @@ -30,6 +30,7 @@ public interface IZcBaseUserService public List selectZcBaseUserByStoreId(Long storeId, Long operatorId); + public ZcBaseUser selectZcBaseUserByPhone(String phone); /** * 新增租车用户信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java index e897007..f62b84e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/baseUser/service/impl/ZcBaseUserServiceImpl.java @@ -57,6 +57,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService return zcBaseUserMapper.selectZcBaseUserByStoreId(storeId,operatorId); } + @Override + public ZcBaseUser selectZcBaseUserByPhone(String phone) { + return zcBaseUserMapper.selectZcBaseUserByPhone(phone); + } + /** * 新增租车用户信息 * @@ -76,9 +81,11 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService a.setIsStore(1L); a.setUpdateTime(DateUtils.getNowDate()); int rows = zcBaseUserMapper.updateZcBaseUser(a); - // 然后绑定与门店的关联 - oldUser.setZcBaseUserStoreList(zcBaseUser.getZcBaseUserStoreList()); - insertZcBaseUserStore(oldUser); + if(rows > 0) { + // 然后绑定与门店的关联 + oldUser.setZcBaseUserStoreList(zcBaseUser.getZcBaseUserStoreList()); + insertZcBaseUserStore(oldUser); + } return rows; }else{ String md5Hexpwd = DigestUtils.md5Hex(zcBaseUser.getPassword()); @@ -86,7 +93,9 @@ public class ZcBaseUserServiceImpl implements IZcBaseUserService zcBaseUser.setIsStore(1L); zcBaseUser.setCreateTime(DateUtils.getNowDate()); int rows = zcBaseUserMapper.insertZcBaseUser(zcBaseUser); - insertZcBaseUserStore(zcBaseUser); + if (rows > 0){ + insertZcBaseUserStore(zcBaseUser); + } return rows; } }