Merge remote-tracking branch 'origin/master'

mitao

2024-06-12 e45091fdf9e412c758bc320f3f5664081631fa4b

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java

@@ -31,9 +31,10 @@
import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.domain.MemberLevel;
import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.service.IMemberLevelService;
import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.util.HttpUtils;
import com.ruoyi.system.api.RemoteUserService;
@@ -42,22 +43,20 @@
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberPoints;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.dto.*;

import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.MobileDTO;
import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;

import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -83,7 +82,7 @@

    public static RequestConfig config = RequestConfig.custom().setConnectTimeout(5000).setSocketTimeout(5000).build();
    // 配置您申请的KEY,在个人中心->我的数据,接口名称上方查看
    public static final String APPKEY = "";
    public static final String APPKEY = "61ad64e1ea78a24e00c449c346caa5d7";
    //明文查询地址
    public static String query_url = "http://op.juhe.cn/idcard/query?key=" + APPKEY;

@@ -134,11 +133,13 @@
    private RedisService redisService;

    @Resource
    private IMemberLevelService iMemberLevelService;
    private MemberLevelMapper memberLevelMapper;


    @Resource
    private IMemberPointsService memberPointsService;


    @Override
    public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
        AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();
@@ -304,6 +305,12 @@
    public void authentificationMembe(MemberDTO memberDTO) {
        Member member= this.getById(memberDTO.getMemberid());
        member.setPhone(memberDTO.getPhone());
        if(memberDTO.getIdNumber()==null){
            throw new ServiceException("身份证号不能为空");
        }
        if(memberDTO.getRealName()==null){
            throw new ServiceException("姓名不能为空");
        }
        member.setIdNumber(memberDTO.getIdNumber());
        member.setRealName(memberDTO.getRealName());
        String realname = "";// 姓名
@@ -337,6 +344,12 @@
            }
        }
     JSONObject jsonObject= JSON.parseObject(result);
        String object1= jsonObject.get("reason").toString();
        if(!object1.equals("成功")){
            throw new ServiceException(object1);
        }


      String object= jsonObject.get("result").toString();
      JSONObject jsonObject1= JSON.parseObject(object);
      if (Integer.valueOf(jsonObject1.get("res").toString())==2){
@@ -372,7 +385,7 @@
    }

    @Override
    public List<Member> getMemberListByIds(Set<Long> memberIdList) {
    public List<Member> getMemberListByIds(Collection<Long> memberIdList) {
        return this.listByIds(memberIdList);
    }

@@ -525,8 +538,8 @@
            }
        }
        this.updateById(byId);

        List<MemberLevel> list = iMemberLevelService.list();
        LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
        List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
        for (int i=0;i<list.size();i++){
            if (i==0){
                int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
@@ -554,8 +567,6 @@
        }

    }
}


    /**
     * 获取用户详情
@@ -588,6 +599,25 @@
        }
        return PageDTO.of(page, MgtMemberPointsVO.class);
    }

    @Override
    public List<Member> getMemberListByCondition(MemberDTO memberDTO) {
        return this.lambdaQuery()
                .like(StringUtils.isNotBlank(memberDTO.getNickname()), Member::getNickname,
                        memberDTO.getNickname())
                .like(StringUtils.isNotBlank(memberDTO.getRealName()), Member::getRealName,
                        memberDTO.getRealName())
                .like(StringUtils.isNotBlank(memberDTO.getPhone()), Member::getPhone,
                        memberDTO.getPhone()).list();
    }

    @Override
    public List<Member> getMemberListByLevel(List<String> memberLevelList) {
        return this.lambdaQuery()
                .in(StringUtils.isNotEmpty(memberLevelList), Member::getLevel, memberLevelList)
                .orderByDesc(Member::getLevel)
                .list();
    }
}