Merge remote-tracking branch 'origin/master'

rentaiming

2024-07-20 ed4f07531b9cb0794e976a14cee3b591dec8d4f6

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

@@ -33,12 +33,10 @@
import com.ruoyi.member.domain.MemberLevel;
import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
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;
import com.ruoyi.system.api.constants.SecurityConstant;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberPoints;
@@ -55,7 +53,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
@@ -67,6 +64,8 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

/**
 * <p>
@@ -90,9 +89,9 @@
    //微信
    private static final String ACCESS_TOKEN_HOST = "https://api.weixin.qq.com/cgi-bin/token";

    private static final String WX_APPID = "wxe91f1af7638aa5dd";
    private static final String WX_APPID = "wx69e3ac6e13a889b7";

    private static final String WX_SECRET = "a787e1a462715604e0c9528b6d8960d1";
    private static final String WX_SECRET = "1b8bcfcb681524ac553e72054e5271ef";

    //支付寶
    /**
@@ -180,15 +179,20 @@
                        appMiniLoginVo.setZfbuserid(response.getOpenId());
                        appMiniLoginVo.setSysUser(sysUser);
                        appMiniLoginVo.setMemberid(member.getId());
                        redisService.setCacheObject(SecurityConstant.SESSION_KEY + response.getUserId(), null, 1L, TimeUnit.DAYS);
                        Member byId = this.getById(member.getId());
                        if (appMiniLoginDto.getPhone()!=null){
                            byId.setPhone(appMiniLoginDto.getPhone());
                            this.updateById(byId);
                        }
                    }else{
                        //创建新用户
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setNickName("白金用户");
                        sysUser.setUserType("03");
                        sysUser.setPhonenumber(response.getOpenId());
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();
@@ -199,7 +203,8 @@
                        member.setUserId(sysUser.getUserId());
                        member.setDelFlag(0);
                        member.setNickname("白酒用户");
                        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        member.setPhone(appMiniLoginDto.getPhone());
                        member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        member.setZfbOpenid(response.getOpenId());
                        this.save(member);
                        appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -238,13 +243,13 @@
                Member member1=this.getOne(wrapper1);

                if (member1==null){

                        //创建新用户
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setNickName("白金用户");
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        sysUser.setUserType("03");
                        sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();
@@ -255,8 +260,9 @@
                        member.setUserId(sysUser.getUserId());
                        member.setDelFlag(0);
                        member.setNickname("白酒用户");
                        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        member.setWxUnionid(unionid);
                        member.setPhone(appMiniLoginDto.getPhone());
                        member.setMiniOpenid(openid);
                        this.save(member);
                    appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
@@ -269,11 +275,13 @@
                    appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVo.setSysUser(sysUser);
                    appMiniLoginVo.setMemberid(member.getId());
                    Member byId = this.getById(member.getId());
                    if (appMiniLoginDto.getPhone()!=null){
                        byId.setPhone(appMiniLoginDto.getPhone());
                        this.updateById(byId);
                    }



                redisService.setCacheObject(SecurityConstant.SESSION_KEY + openid, sessionKey, 1L, TimeUnit.DAYS);
                }
            }
        }

@@ -287,6 +295,7 @@
    public Member getMembeid(MemberDTO memberDTO) {
        return  this.getById(memberDTO.getMemberid());
    }


    @Override
    public void updateMembeid(MemberDTO memberDTO) {
@@ -340,13 +349,13 @@
                response.close();
                httpClient.close();
            } catch (IOException e) {
                throw new RuntimeException(e);
                throw new RuntimeException("姓名或者身份证号有误");
            }
        }
     JSONObject jsonObject= JSON.parseObject(result);
        String object1= jsonObject.get("reason").toString();
        if(!object1.equals("成功")){
            throw new ServiceException(object1);
            throw new ServiceException("实名认证失败,姓名或者身份证号有误");
        }


@@ -391,8 +400,9 @@
    }

    @Override
    public void mobile(MobileDTO mobileDTO) {
    public String mobile(MobileDTO mobileDTO) {
        Member byId = this.getById(mobileDTO.getMemberid());
        String mobile=null;
        if (mobileDTO.getType()==1) {
            if (mobileDTO.getAuth_code() == null || mobileDTO.getAuth_code().length() == 0) {
            } else {
@@ -430,7 +440,7 @@
                String plainData = null;
                if (isDataEncrypted) {
                    try {
                        plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset);
                        plainData = AlipayEncrypt.decryptContent(content, encryptType, "XABBSOeWDakvuG9TDez4Qg====", charset);
                    } catch (AlipayApiException e) {
                        //解密异常, 记录日志
                        e.getMessage();
@@ -443,8 +453,7 @@
                        new TypeReference<Map<String, String>>() {
                        }, Feature.OrderedField);

                byId.setPhone(openapiResult1.get("mobile"));
                this.updateById(byId);
                mobile=openapiResult1.get("mobile");
            }
        }else{
            String responseAccessToken = null;
@@ -470,10 +479,10 @@
            JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
            String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
            JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
            String mobile = jsonUserPhoneInfo.getString("purePhoneNumber");
            byId.setPhone(mobile);
            this.updateById(byId);
            mobile= jsonUserPhoneInfo.getString("purePhoneNumber");

        }
        return mobile;
    }

    public static String getAccessTokenByWX() throws Exception {
@@ -506,11 +515,10 @@
    @Override
    public PageDTO<MgtMemberVO> getMemberPage(MgtMemberQuery query) {
        Page<Member> page = this.lambdaQuery()
                .select(Member::getId, Member::getNickname, Member::getRealName, Member::getPhone,
                        Member::getIdNumber)
                .like(StringUtils.isNotBlank(query.getRealName()), Member::getRealName,
                        query.getRealName())
                .like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
                .orderByDesc(Member::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page.getTotal(), page.getPages());
@@ -519,6 +527,7 @@
    }

    @Override
    @Transactional(propagation = Propagation.REQUIRES_NEW)
    public void updMembeOne(updMembeOneDTO dMembeOneDTO) {
        Member byId = this.getById(dMembeOneDTO.getMemberId());
        if (dMembeOneDTO.getMoney()!=null){
@@ -541,32 +550,32 @@
        this.updateById(byId);
        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());
                if (ia<0){
                    byId.setLevel(0);
                    break;
                }
            }
            if (i==list.size()-1){
                BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
                BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
                if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
                    byId.setLevel(list.get(i).getLevel());
                }else{
                    byId.setLevel(list.get(i).getLevel());
                }
            }else {
                BigDecimal cumulative = list.get(i - 1).getCumulativeConsumption();
                BigDecimal cumulative1 = list.get(i).getCumulativeConsumption();
                if (cumulative.compareTo(byId.getMoney()) <= 0 && cumulative1.compareTo(byId.getMoney()) >= 0) {
                    byId.setLevel(list.get(i).getLevel());
                }
        int appropriateLevel = findAppropriateLevel(list, byId.getMoney());
        byId.setLevel(appropriateLevel);
        this.updateById(byId);
    }


    private static int findAppropriateLevel(List<MemberLevel> memberLevels, BigDecimal money) {
        // 对于最开始的level，设置为0（假设0是最低等级）
        int level = 0;

        for (int i = 0; i < memberLevels.size(); i++) {
            MemberLevel currentLevel = memberLevels.get(i);
            BigDecimal currentCumulativeConsumption = currentLevel.getCumulativeConsumption();

            // 如果当前成员的消费额小于等于当前等级的累积消费额
            if (money.compareTo(currentCumulativeConsumption) < 0) {
                return level;
            }

            // 更新level为当前等级，准备下一次比较
            level = currentLevel.getLevel();
        }

        // 如果遍历完成后还没有返回，说明该成员的消费额高于所有已定义等级的累积消费额
        level = memberLevels.get(memberLevels.size() - 1).getLevel();
        return level;
    }

    /**
@@ -619,6 +628,8 @@
                .orderByDesc(Member::getLevel)
                .list();
    }


}