协议管理修改

mitao

2025-03-07 e16a9f6a4238ec02dc754be7b94639ad8af4e5a8

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

@@ -26,6 +26,7 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.member.controller.management.dto.MgtMemberDTO;
import com.ruoyi.member.controller.management.dto.MgtMemberPointsQuery;
import com.ruoyi.member.controller.management.dto.MgtMemberQuery;
import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
@@ -53,6 +54,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
@@ -195,7 +197,8 @@
                        sysUser.setNickName("白金用户");
                        sysUser.setUserType("03");
                        sysUser.setPhonenumber(response.getOpenId());
                        sysUser.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        sysUser.setAvatar(
                                "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();
@@ -207,7 +210,8 @@
                        member.setDelFlag(0);
                        member.setNickname("白酒用户");
                        member.setPhone(appMiniLoginDto.getPhone());
                        member.setAvatar("https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                        member.setAvatar(
                                "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                        member.setZfbOpenid(response.getOpenId());
                        this.save(member);
                        appMiniLoginVo.setZfbuserid(response.getUserId());
@@ -259,7 +263,7 @@
                    sysUser.setNickName("白金用户");
                    sysUser.setUserType("03");
                    sysUser.setAvatar(
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                    String password = "123456";
                    sysUser.setPassword(SecurityUtils.encryptPassword(password));
                    sysUser = sysUserService.registerUser(sysUser).getData();
@@ -271,7 +275,7 @@
                    member.setDelFlag(0);
                    member.setNickname("白酒用户");
                    member.setAvatar(
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/d41508d822cb4b7896aaa1bb56e6167f.png");
                            "https://jyzx-obs.obs.cn-sccd1.ctyun.cn/ca8552a34fb64d4d846afa1b5b173cf9.png");
                    member.setWxUnionid(unionid);
                    member.setPhone(appMiniLoginDto.getPhone());
                    member.setMiniOpenid(openid);
@@ -455,32 +459,33 @@
                mobile=openapiResult1.get("mobile");
            }
        }else{
            String responseAccessToken = null;
            try {
                responseAccessToken = getAccessTokenByWX();
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            if (StringUtils.isNotBlank(mobileDTO.getCode())) {
                String responseAccessToken = null;
                try {
                    responseAccessToken = getAccessTokenByWX();
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }

            JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
            String accessToken = jsonAccessToken.getString("access_token");
            String errmsg = jsonAccessToken.getString("errmsg");
            Long expiresIn = jsonAccessToken.getLong("expires_in");
            if (StringUtils.isBlank(accessToken)) {
                throw new ServiceException(errmsg);
                JSONObject jsonAccessToken = JSONObject.parseObject(responseAccessToken);
                String accessToken = jsonAccessToken.getString("access_token");
                String errmsg = jsonAccessToken.getString("errmsg");
                Long expiresIn = jsonAccessToken.getLong("expires_in");
                if (StringUtils.isBlank(accessToken)) {
                    throw new ServiceException(errmsg);
                }
                String responseUserPhoneNumber = null;
                try {
                    responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
                    log.info("微信获取手机号返回值：{}", JSON.toJSONString(responseUserPhoneNumber));
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
                JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
                String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
                JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
                mobile = jsonUserPhoneInfo.getString("purePhoneNumber");
            }
            String responseUserPhoneNumber = null;
            try {
                responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
                log.info("微信获取手机号返回值：{}", JSON.toJSONString(responseUserPhoneNumber));
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            JSONObject jsonUserPhoneNumber = JSONObject.parseObject(responseUserPhoneNumber);
            String phoneInfo = jsonUserPhoneNumber.getString("phone_info");
            JSONObject jsonUserPhoneInfo = JSONObject.parseObject(phoneInfo);
            mobile= jsonUserPhoneInfo.getString("purePhoneNumber");

        }
        return mobile;
    }
@@ -519,8 +524,11 @@
                        query.getRealName())
                .like(StringUtils.isNotBlank(query.getPhone()), Member::getPhone, query.getPhone())
                .eq(StringUtils.isNotBlank(query.getLevel()), Member::getLevel, query.getLevel())
                .eq(Objects.nonNull(query.getVipClassify()), Member::getVipClassify,
                        query.getVipClassify())
                .orderByDesc(Member::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));

        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page.getTotal(), page.getPages());
        }
@@ -630,7 +638,21 @@
                .list();
    }

    @Override
    public Member getMemberByUserId(Long userId) {
        return this.lambdaQuery().eq(Member::getUserId, userId).oneOpt().orElse(null);
    }

    /**
     * 编辑用户会员分类
     * @param dto
     * @return
     */
    @Override
    public void updMemberClassify(MgtMemberDTO dto) {
        Member member = BeanUtils.copyBean(dto, Member.class);
        updateById(member);
    }
}