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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -12,6 +12,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
@@ -26,6 +27,7 @@
import com.doumee.service.business.MemberService;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +59,36 @@
    }

    @Override
    public String createManageMember(Member member) {
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        QueryWrapper<Member> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.ONE)
                .eq(Member::getCardNo,member.getCardNo());
        Integer integer = memberMapper.selectCount(wrapper);

        if (integer > 0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡号存在重复");
        }
        Member insert = new Member();
        insert.setCreateDate(new Date());
        insert.setCreator(principal.getId());
        insert.setEditDate(new Date());
        insert.setEditor(principal.getId());
        insert.setIsdeleted(Constants.ZERO);
        insert.setName(member.getName());
        insert.setNickname(member.getNickname());
        insert.setStatus(member.getStatus());
        insert.setRegisterDate(new Date());
        insert.setCardNo(member.getCardNo());
        insert.setType(Constants.ONE);
        memberMapper.insert(insert);
        return insert.getId();
    }

    @Override
    public void deleteById(String id) {
        memberMapper.deleteById(id);
    }
@@ -81,6 +113,29 @@
    }

    @Override
    public void update(Member member) {

        QueryWrapper<Member> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(Member::getIsdeleted,Constants.ZERO)
                .eq(Member::getType,Constants.ONE)
                .eq(Member::getCardNo,member.getCardNo());
        Member member1 = memberMapper.selectOne(wrapper);
        if (Objects.nonNull(member1) && !member1.getId().equals(member.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"卡号存在重复");
        }
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Member update = new Member();
        update.setId(member.getId());
        update.setName(member.getName());
        update.setStatus(member.getStatus());
        update.setEditDate(new Date());
        update.setEditor(principal.getId());
        memberMapper.updateById(member);

    }

    @Override
    public void updateByIdInBatch(List<Member> members) {
        if (CollectionUtils.isEmpty(members)) {
            return;
@@ -98,7 +153,7 @@
    @Override
    public Member findOne(Member member) {
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        return memberMapper.selectOne(wrapper);
        return memberMapper.selectOne(wrapper.last(" limit 1"));
    }

    @Override
@@ -106,7 +161,7 @@
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        return memberMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<Member> findPage(PageWrap<Member> pageWrap) {
        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -136,7 +191,7 @@
            queryWrapper.lambda().eq(Member::getInfo, pageWrap.getModel().getInfo());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(Member::getName, pageWrap.getModel().getName());
            queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getNickname() != null) {
            queryWrapper.lambda().eq(Member::getNickname, pageWrap.getModel().getNickname());
@@ -174,7 +229,7 @@
            queryWrapper.lambda().eq(Member::getPassword, pageWrap.getModel().getPassword());
        }
        if (pageWrap.getModel().getCardNo() != null) {
            queryWrapper.lambda().eq(Member::getCardNo, pageWrap.getModel().getCardNo());
            queryWrapper.lambda().like(Member::getCardNo, pageWrap.getModel().getCardNo());
        }
        if (pageWrap.getModel().getCardSign() != null) {
            queryWrapper.lambda().eq(Member::getCardSign, pageWrap.getModel().getCardSign());
@@ -192,6 +247,23 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(memberMapper.selectPage(page, queryWrapper));
    }


    @Override
    public PageData<Member> findManagerMemberPage(PageWrap<Member> pageWrap) {

        IPage<Member> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().like(Member::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getCardNo() != null) {
            queryWrapper.lambda().like(Member::getCardNo, pageWrap.getModel().getCardNo());
        }
        queryWrapper.lambda().eq(Member::getType, Constants.ONE);
        return PageData.from(memberMapper.selectPage(page, queryWrapper));
    }

@@ -256,31 +328,29 @@
            if(Objects.isNull(member)){
                //新增用户 需要进行用户绑定手机号
                member = new Member();
                member.setId(Constants.getUUID());
                member.setCreateDate(new Date());
                member.setIsdeleted(Constants.ZERO);
                member.setOpenid(openId);
                member.setUnionid(unionId);
                member.setType(Constants.ZERO);
                member.setRegisterDate(new Date());
                member.setOrigin(Constants.ZERO.toString());
                member.setStatus(Constants.ZERO);
                memberMapper.insert(member);
                accountResponse.setStatus(Constants.ONE);
            }else{
                UserResponse userResponse = getUserInfo(member.getId());
                if(StringUtils.isBlank(member.getPhone())){
                    accountResponse.setStatus(Constants.ONE);
                }else{
                    JwtPayLoad payLoad = new JwtPayLoad(userResponse.getId());
                    accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
                }
                accountResponse.setUserResponse(userResponse);
            }

            UserResponse userResponse = getUserInfo(member.getId());
            if(StringUtils.isBlank(member.getPhone())){
                accountResponse.setStatus(Constants.ONE);
            }
            JwtPayLoad payLoad = new JwtPayLoad(member.getId());
            accountResponse.setToken(JwtTokenUtil.generateToken(payLoad));
            accountResponse.setSessionKey(session.getSessionKey());
            accountResponse.setUserResponse(userResponse);
            return accountResponse;
        } catch (WxErrorException e) {
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "微信登录异常！请联系管理员");
        }

    }


@@ -323,7 +393,6 @@
        userResponse.setMobile(member.getPhone());
        return userResponse;
    }



}