#feat .

yanghui

2022-11-28 42521c9b51c1bd9a40036f18fd610cd46601222d

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -31,6 +31,7 @@
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
import com.panzhihua.common.model.vos.sanshuo.ComSanshuoExpertVO;
import com.panzhihua.common.model.vos.shop.ComShopUserAddressVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.*;
@@ -331,6 +332,14 @@
            return R.fail();
        }
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        //获取后台商家user
        SysUserDO sysUser = userDao.selectOne(
                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, appId));
        //判断是否是商家账号
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
        }
        if (nonNull(sysUserDO.getStreetId())){
            loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
        }
@@ -532,12 +541,36 @@
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        //获取后台商家user
        SysUserDO sysUser = userDao.selectOne(
                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, "wx118de8a734d269f0"));
        //判断是否是商家账号
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
            Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
            loginUserInfoVO.setStoreIdId(storeId);

        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        //获取自提点账号
        if (StrUtil.isNotBlank(sysUserDO.getPhone())){
            if(userDao.checkPoint(sysUserDO.getPhone()) > 0){
                loginUserInfoVO.setIsPoint(true);
            }else {
                loginUserInfoVO.setIsPoint(false);
            }
        }
        //默认地址
        ComShopUserAddressVO comShopUserAddressVO = userDao.selectDefaultAddressVO(userId);
        if (nonNull(comShopUserAddressVO)){
            loginUserInfoVO.setComShopUserAddressVO(comShopUserAddressVO);
        }
        return R.ok(loginUserInfoVO);
    }
@@ -1335,7 +1368,6 @@
    @Override
    public R addUserBackstageProperty(AdministratorsUserVO administratorsUserVO) {
        SysUserDO sysUserDO = new SysUserDO();
        String appId=userDao.getCommunityAppId(administratorsUserVO.getCommunityId());
        Long roleId = administratorsUserVO.getRoleId();
        if (roleId.intValue() == 777777777) {
            SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1359,7 +1391,6 @@
                menu.add(300L);
                menu.add(303L);
            }

            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1385,10 +1416,9 @@
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        if (administratorsUserVO.getCommunityId().equals(10172)){
            roleId=1559112102373756548L;
        if (nonNull(administratorsUserVO.getAppid())){
            sysUserDO.setAppId(administratorsUserVO.getAppid());
        }
        sysUserDO.setAppId(appId);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -2888,6 +2918,7 @@
        sysUserDO.setPhone(convenientMerchantDTO.getMobilePhone());
        sysUserDO.setName(convenientMerchantDTO.getContacts());
        sysUserDO.setPassword(encode);
        sysUserDO.setAppId("wx118de8a734d269f0");
        try {
            userDao.insert(sysUserDO);
            return R.ok(sysUserDO.getUserId());