用户端商品

rentaiming

2024-06-06 bfde6acbf95e55846239cb2c7a0fe48dea287f69

用户端商品

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -70,15 +70,6 @@
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
    }

    @ApiOperation("小程序注册")
    @PostMapping("miniRegister")
    public R<?> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto)
    {
        // 小程序用户登录
        AppMiniLoginVO appMiniLoginVo = sysLoginService.miniRegister(appUserRegisterDto);
        // 获取登录token
        return R.ok(tokenService.createMiniToken(appMiniLoginVo));
    }


    @ApiOperation("拍卖师小程序登录")

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -149,40 +149,6 @@
        return userInfo;
    }

    public AppMiniLoginVO miniRegister(AppMiniRegisterDTO appUserRegisterDto)
    {
        // 查询用户信息
        R<AppMiniLoginVO> userResult = MemberClient.miniRegister(appUserRegisterDto);
        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());
        }
        AppMiniLoginVO appMiniRegisterVo = userResult.getData();
        SysUser user=appMiniRegisterVo.getSysUser();
        if(appMiniRegisterVo.getSysUser()!=null){
            String username = user.getUserName();
            // IP黑名单校验
            String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
            if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
                throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
            }
            if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
                throw new ServiceException("对不起，您的账号： 已被删除");
            }
            if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
            {
                recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
                throw new ServiceException("对不起，您的账号： 已停用");
            }
            recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
        }
        return appMiniRegisterVo;
    }

    public AppMiniLoginVO actionMiniLogin(AppMiniLoginDTO appMiniLoginDto)
    {
        // 查询用户信息

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleTypeEnum.java

@@ -10,9 +10,10 @@
public enum ArticleTypeEnum {
    PLATFORM_RELEASE(1, "平台发布"),
    USER_POSTING(2, "用户发布");
    @JsonValue
    private final Integer code;

    @EnumValue
    private final Integer code;
    @JsonValue
    private final String desc;

    public static ArticleTypeEnum getEnumByCode(Integer code) {

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleCommentsDTO.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;
@Data
@ApiModel(value = "评论对象", description = "评论对象")
public class ArticleCommentsDTO extends BasePage {

    @ApiModelProperty(value = "资讯评论id")

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/ArticleDTO.java

@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.enums.ArticleTypeEnum;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;

@Data
@ApiModel(value = "资讯传输对象", description = "资讯传输对象")
public class ArticleDTO extends BasePage {
    @ApiModelProperty(value = "资讯id")
    private Long id;
@@ -29,5 +31,5 @@
    private Long memberId;

    @ApiModelProperty(value = "资讯图片")
    private MultipartFile[]  rticleImageUrl;
    private String rticleImageUrl;
}

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberArticleCollectionDTO.java

@@ -1,10 +1,12 @@
package com.ruoyi.article.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "資訊收藏对象", description = "資訊收藏对象")
public class MemberArticleCollectionDTO extends BasePage {

    @ApiModelProperty(value = "收藏目标id")

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/dto/MemberLikeDTO.java

@@ -1,10 +1,12 @@
package com.ruoyi.article.controller.forepart.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "資訊點讚对象", description = "資訊點讚对象")
public class MemberLikeDTO extends BasePage {
    @ApiModelProperty(value = "会员id")
    private Long memberId;

 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/Article.java

@@ -92,6 +92,7 @@

    @ApiModelProperty(value = "会员id")
    private Long memberId;

    @ApiModelProperty(value = "拒绝原因")
    private String refuseComment;


 ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/ArticleServiceImpl.java

@@ -123,22 +123,12 @@
            article=this.getById(articleDTO.getId());
        }
        article.setMemberId(articleDTO.getMemberId());

        article.setArticleType(ArticleTypeEnum.USER_POSTING);
        article.setStatus(AuditStatusEnum.TO_BE_REVIEWED);
        article.setContent(articleDTO.getContent());
        article.setTitle(articleDTO.getTitle());
        List<String> urlList=new ArrayList<>();
        if (articleDTO.getRticleImageUrl().length>0){
            for (MultipartFile file:articleDTO.getRticleImageUrl()){
                try {
                    String url= HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            article.setImages(urlList.toString());
        }
        article.setImages(articleDTO.getRticleImageUrl());
        this.saveOrUpdate(article);

    }

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java

@@ -50,6 +50,7 @@
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsinfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
@@ -86,6 +87,8 @@
    private final GoodsSkuClient goodsSkuClient;
    private final MemberClient memberClient;
    private final OrderClient orderClient;

    private final AuctionClient auctionClient;
    private final IAuctionBidRecordService auctionBidRecordService;
    private final AuctionAsyncMethodService auctionAsyncMethodService;
    // 创建一个静态共享的ObjectMapper实例以重用
@@ -459,7 +462,7 @@
        }else {
            auctionGoodsinfoVO.setIsCollection(1);
        }
        List<OrderAuctionBond> datas = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
        List<OrderAuctionBond> datas = auctionClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
        if (datas.size()>0){
            auctionGoodsinfoVO.setIsApply(2);
        }else{
@@ -498,7 +501,7 @@
    public PageDTO<AuctionGoodsListVO> getWdAuctionSalesList(AuctionGoodsListDTO auctionGoodsListDTO) {
        MemberAuctionSalesroomDTO memberAuctionSalesroomDTO =new MemberAuctionSalesroomDTO();
        memberAuctionSalesroomDTO.setMemberId(auctionGoodsListDTO.getMemberId());
        List<OrderAuctionBond> data = orderClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
        List<OrderAuctionBond> data = auctionClient.getAuctionGoodsOrderAuctionBondList(auctionGoodsListDTO, SecurityConstants.INNER).getData();
        Set<Long> goodsSkuIdList = null;
        goodsSkuIdList = data.stream().map(OrderAuctionBond::getAuctionSalesroomId)
                .collect(Collectors.toSet());

 ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java

@@ -60,6 +60,7 @@
import com.ruoyi.common.core.utils.page.Checker;
import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.AuctionSalesroom;
@@ -233,12 +234,10 @@
    public AuctionSalesroom getAuctionBidRecordOne(ForepartAuctionBidRecordDTO arepartAuctionBidRecordDTO) {
        R<SysUser> r=sysUserClient.queryUserByPhone(arepartAuctionBidRecordDTO.getPhone());
        SysUser sysUser=r.getData();

        if (sysUser!=null){
        if (sysUser==null){
            throw new ServiceException("手机号未注册");
        }

        if (!sysUser.getPassword().equals(arepartAuctionBidRecordDTO.getPassword())){
        if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){
            throw new ServiceException("密码输入错误");
        }

@@ -255,48 +254,6 @@
        if (appMiniLoginDto.getType()==1) {
            if (appMiniLoginDto.getAuth_code() == null || appMiniLoginDto.getAuth_code().length() == 0) {
            } else {
              /*  AppMiniLoginVO user=new AppMiniLoginVO();
                //String serverUrl, String appId, String privateKey, String format,String charset, String alipayPublicKey, String signType
                //实例化客户端 参数：正式环境URL,Appid,商户私钥 PKCS8格式,字符编码格式,字符格式,支付宝公钥,签名方式
                AlipayClient alipayClient = new DefaultAlipayClient(ALIPAY_BORDER_PROD,APP_ID_PROD, APP_PRIVATE_KEY, "json", "GBK", ALIPAY_PUBLIC_KEY, "RSA2");
                AlipaySystemOauthTokenRequest request = new AlipaySystemOauthTokenRequest();
                // 值为authorization_code时，代表用code换取
                request.setGrantType("authorization_code");
                //授权码，用户对应用授权后得到的
                request.setCode(appMiniLoginDto.getAuth_code());
                //这里使用execute方法
                AlipaySystemOauthTokenResponse response = null;
                try {
                    response = alipayClient.execute(request);
                } catch (AlipayApiException e) {
                    throw new RuntimeException(e);
                }
                //刷新令牌，上次换取访问令牌时得到。见出参的refresh_token字段

                //返回成功时 就将唯一标识返回
                if (response.isSuccess()) {
                    System.out.println("调用成功");
                    //我这里只返回了一个字段给前端用
                    String user1= response.getOpenId();
                    appMiniLoginVo.setZfbuserid(response.getOpenId());
                    AlipayUserInfoShareResponse  alipayUserInfoShareResponse= null;
                    try {
                        AlipayUserInfoShareRequest request1 = new AlipayUserInfoShareRequest();
                        AlipayUserInfoShareResponse response1 = alipayClient.execute(request1, response.getAccessToken());
                        appMiniLoginVo.setPhone(response1.getPhone());
                    } catch (Exception e) {
                        throw new RuntimeException(e);
                    }

                    R<SysUser> sysUserR = sysUserClient.queryUserByPhone(alipayUserInfoShareResponse.getPhone());
                    SysUser data = sysUserR.getData();
                    appMiniLoginVo.setSysUser(data);
                }
            }*/


                String response = JSON.parseObject(appMiniLoginDto.getAuth_code()).getString("response");

                //1. 获取验签和解密所需要的参数
                Map<String, String> openapiResult = JSON.parseObject(appMiniLoginDto.getAuth_code(),
                        new TypeReference<Map<String, String>>() {
@@ -340,6 +297,14 @@
                    plainData = content;
                }

                Map<String, String> openapiResult1 = JSON.parseObject(plainData,
                        new TypeReference<Map<String, String>>() {
                        }, Feature.OrderedField);

                R<SysUser> sysUserR = sysUserClient.queryUserByPhone(openapiResult1.get("mobile"));
                SysUser data = sysUserR.getData();
                appMiniLoginVo.setSysUser(data);
                appMiniLoginVo.setPhone(openapiResult1.get("mobile"));
            }
        }else{


 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartAlipayAppController.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java

@@ -2,13 +2,10 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.CustomConfigDTO;
import com.ruoyi.system.api.domain.dto.MemberDTO;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import io.swagger.annotations.Api;
@@ -50,14 +47,11 @@
         }
     }

    @PostMapping(value = "/miniRegister")
    @ApiOperation(value = "用户端-小程序注册")
    public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO) {
        AppMiniLoginVO appUserRegisterVo = iMemberService.miniRegister(appMiniRegisterDTO);
        if(appUserRegisterVo ==null){
            return R.fail("注册失败！");
        }
        return R.ok(appUserRegisterVo);
    @PostMapping(value = "/mobile")
    @ApiOperation(value = "用户端-小程序获取电话号码")
    public R mobile(@RequestBody MobileDTO mobileDTO) {
         iMemberService.mobile(mobileDTO);
        return R.ok();
    }

    @PostMapping("/getMembeid")

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/WeiXinAppController.java

File was deleted

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java

@@ -34,4 +34,11 @@
        return R.ok(memberService.getById(userId));
    }


    @PostMapping("/updMembeOne")
    @InnerAuth
    public R updMembeOne(@RequestBody Long userId) {
        return R.ok(memberService.getById(userId));
    }

}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberService.java

@@ -11,6 +11,8 @@
import com.ruoyi.system.api.domain.dto.MemberDTO;
import java.util.List;
import java.util.Set;

import com.ruoyi.system.api.domain.dto.MobileDTO;
import org.springframework.web.bind.annotation.RequestBody;

/**
@@ -33,7 +35,8 @@

    List<Member> getMemberListByIds(Set<Long> memberIdList);

    AppMiniLoginVO miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO);

    void mobile(@RequestBody MobileDTO mobileDTO);

    /**
     * 获取会员管理分页列表

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

@@ -5,9 +5,13 @@
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.alibaba.fastjson.parser.Feature;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.internal.util.AlipayEncrypt;
import com.alipay.api.internal.util.AlipaySignature;
import com.alipay.api.request.AlipaySystemOauthTokenRequest;
import com.alipay.api.response.AlipaySystemOauthTokenResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -43,6 +47,8 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;

import com.ruoyi.system.api.domain.dto.MobileDTO;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -122,7 +128,6 @@
    @Override
    public AppMiniLoginVO loginThird(AppMiniLoginDTO appMiniLoginDto) throws Exception {
        AppMiniLoginVO appMiniLoginVo = new AppMiniLoginVO();

        if(appMiniLoginDto.getType()==1){
            if (appMiniLoginDto.getAuth_code()== null || appMiniLoginDto.getAuth_code().length() == 0) {
            } else {
@@ -172,11 +177,9 @@
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();

                        if (sysUser==null){
                            sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                        }

                        member = new Member();
                        member.setUserId(sysUser.getUserId());
                        member.setDelFlag(0);
@@ -215,7 +218,6 @@
                if (member != null) {
                    sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                }

                LambdaQueryWrapper<Member> wrapper1= Wrappers.lambdaQuery();
                wrapper1.eq(Member::getMiniOpenid,openid);
                Member member1=this.getOne(wrapper1);
@@ -234,8 +236,6 @@
                        if (sysUser==null){
                            sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                        }


                        member = new Member();
                        member.setUserId(sysUser.getUserId());
                        member.setDelFlag(0);
@@ -244,7 +244,6 @@
                        member.setWxUnionid(unionid);
                        member.setMiniOpenid(openid);
                        this.save(member);

                    appMiniLoginVo.setMiniOpenid(member.getMiniOpenid());
                    appMiniLoginVo.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVo.setSysUser(sysUser);
@@ -293,14 +292,12 @@
        member.setPhone(memberDTO.getPhone());
        member.setIdNumber(memberDTO.getIdNumber());
        member.setRealName(memberDTO.getRealName());

        String realname = "";// 姓名
         String idcard = "";// 身份证
         int type = 1;// 普通版,不需要加密
          Map<String, Object> params = new HashMap<>();
          params.put("realname", realname);
          params.put("idcard", idcard);

        CloseableHttpClient httpClient = HttpClients.createDefault();
        CloseableHttpResponse response = null;
        String result = null;
@@ -331,7 +328,6 @@
      if (Integer.valueOf(jsonObject1.get("res").toString())==2){
          throw new ServiceException("实名认证失败");
      }

      String  sex=getGender(idcard);
      if (sex.equals("女")){
          member.setGender(GenderEnum.FEMALE);
@@ -339,7 +335,6 @@
        if (sex.equals("男")){
            member.setGender(GenderEnum.MALE);
        }

        this.updateById(member);
    }

@@ -347,7 +342,6 @@
        int genderNum = Integer.parseInt(idNumber.substring(16, 17));
        return genderNum % 2 == 0 ? "女" : "男";
    }


    public static String urlencode(Map<String, ?> data) {
        StringBuilder sb = new StringBuilder();
@@ -369,92 +363,89 @@
    }

    @Override
    public AppMiniLoginVO miniRegister(AppMiniRegisterDTO appMiniRegisterDTO) {
            AppMiniLoginVO appMiniLoginVO =new AppMiniLoginVO();
           SysUser sysUser;
            if (appMiniRegisterDTO.getType() == 1) {
                LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery();
                wrapper.eq(Member::getZfbOpenid, appMiniRegisterDTO.getZfbuserid());
                Member member = this.getOne(wrapper);

                //获取用户为空则新建
                if (member == null) {
                    //创建新用户
                    String memberId = IdUtils.simpleUUID();
                    sysUser = new SysUser();
                    sysUser.setUserName(memberId);
                    sysUser.setNickName("白金用户");
                    sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
                    sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                    String password = "123456";
                    sysUser.setPassword(SecurityUtils.encryptPassword(password));
                    sysUser = sysUserService.registerUser(sysUser).getData();

                    member = new Member();
                    member.setUserId(sysUser.getUserId());
                    member.setDelFlag(0);
                    member.setRealName("白酒用户");
                    member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                    member.setWxUnionid(appMiniRegisterDTO.getWxUnionid());
                    member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid());
                    this.save(member);

                    appMiniLoginVO.setMiniOpenid(member.getMiniOpenid());
                    appMiniLoginVO.setWxUnionid(member.getWxUnionid());
                    appMiniLoginVO.setSysUser(sysUser);
                    appMiniLoginVO.setMemberid(member.getId());
    public void mobile(MobileDTO mobileDTO) {
        Member byId = this.getById(mobileDTO.getMemberid());
        if (mobileDTO.getType()==1) {
            if (mobileDTO.getAuth_code() == null || mobileDTO.getAuth_code().length() == 0) {
                } else {
                    sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                    appMiniLoginVO.setZfbuserid( appMiniRegisterDTO.getZfbuserid());
                    appMiniLoginVO.setSysUser(sysUser);
                    appMiniLoginVO.setMemberid(member.getId());
                //1. 获取验签和解密所需要的参数
                Map<String, String> openapiResult = JSON.parseObject(mobileDTO.getAuth_code(),
                        new TypeReference<Map<String, String>>() {
                        }, Feature.OrderedField);
                String signType = "RSA2";
                String charset = "UTF-8";
                String encryptType = "AES";
                String sign = openapiResult.get("sign");
                String content = openapiResult.get("response");

                //如果密文的
                boolean isDataEncrypted = !content.startsWith("{");
                boolean signCheckPass = false;

                //2. 验签
                String signContent = content;

                //如果是加密的报文则需要在密文的前后添加双引号
                if (isDataEncrypted) {
                    signContent = "\"" + signContent + "\"";
                }
                try {
                    signCheckPass = AlipaySignature.rsaCheck(signContent, sign, ALIPAY_PUBLIC_KEY, charset, signType);
                } catch (AlipayApiException e) {
                    //验签异常, 日志
                }
                if (!signCheckPass) {
                    //验签不通过（异常或者报文被篡改），终止流程（不需要做解密）
                }

                //3. 解密
                String plainData = null;
                if (isDataEncrypted) {
                    try {
                        plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset);
                    } catch (AlipayApiException e) {
                        //解密异常, 记录日志
                        e.getMessage();
            }
            if (appMiniRegisterDTO.getType() == 2) {
                    LambdaQueryWrapper<Member> wrapper = Wrappers.lambdaQuery();
                    wrapper.eq(Member::getMiniOpenid, appMiniRegisterDTO.getMiniOpenid());
                    Member member = this.getOne(wrapper);
                    //获取用户为空则新建
                    if (member == null) {
                        //创建新用户
                        String memberId = IdUtils.simpleUUID();
                        sysUser = new SysUser();
                        sysUser.setUserName(memberId);
                        sysUser.setNickName("白金用户");
                        sysUser.setPhonenumber(appMiniRegisterDTO.getMiniOpenid());
                        sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        String password = "123456";
                        sysUser.setPassword(SecurityUtils.encryptPassword(password));
                        sysUser = sysUserService.registerUser(sysUser).getData();

                        member = new Member();
                        member.setUserId(sysUser.getUserId());
                        member.setDelFlag(0);
                        member.setRealName("白酒用户");
                        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
                        member.setWxUnionid(appMiniRegisterDTO.getWxUnionid());
                        member.setMiniOpenid(appMiniRegisterDTO.getMiniOpenid());
                        this.save(member);

                        appMiniLoginVO.setMiniOpenid(member.getMiniOpenid());
                        appMiniLoginVO.setWxUnionid(member.getWxUnionid());
                        appMiniLoginVO.setSysUser(sysUser);
                        appMiniLoginVO.setMemberid(member.getId());
                    } else {
                        sysUser = sysUserService.getSysUser(member.getUserId()).getData();
                        appMiniLoginVO.setMiniOpenid(member.getMiniOpenid());
                        appMiniLoginVO.setWxUnionid(member.getWxUnionid());
                        appMiniLoginVO.setSysUser(sysUser);
                        appMiniLoginVO.setMemberid(member.getId());
                    plainData = content;
                    }

                Map<String, String> openapiResult1 = JSON.parseObject(plainData,
                        new TypeReference<Map<String, String>>() {
                        }, Feature.OrderedField);



                byId.setPhone(openapiResult1.get("mobile"));
                this.updateById(byId);
            }
             return appMiniLoginVO;
        }else{
            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);
            }
            String responseUserPhoneNumber = null;
            try {
                responseUserPhoneNumber = getMobileByWX(accessToken, mobileDTO.getCode());
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            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);
        }
    }

    public static String getAccessTokenByWX() throws Exception {

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceRiseServiceImpl.java

@@ -69,18 +69,7 @@
        memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone());
        memberInvoiceRise.setIsDefault(memberInvoiceRiseDTO.getIsDefault());


        this.saveOrUpdate(memberInvoiceRise);

        LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId());
        wrapper.eq(MemberInvoiceRise::getDelFlag,0);
        wrapper.eq(MemberInvoiceRise::getIsDefault,2);
        MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper);

        if (memberInvoiceRise1==null){
            memberInvoiceRise.setIsDefault(2);
        }
    }

    @Override

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java

@@ -17,6 +17,7 @@
import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.Paylog;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.PaylogMapper;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.service.IPaylogService;
@@ -69,7 +70,7 @@


    @Resource
    private IOrderService iOrderService;
    private OrderMapper OrderMapper;
    @Resource
    private AuctionClient auctionClient;

@@ -151,9 +152,9 @@
                            LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
                            wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
                            wrapper1.eq(Order::getDelFlag,0);
                            Order page1 = iOrderService.getOne(wrapper1);
                            Order page1 = OrderMapper.selectOne(wrapper1);
                            page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
                            iOrderService.updateById(page1);
                            OrderMapper.updateById(page1);

                           MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                           memberPointsDTO.setMemberId(page1.getMemberId());
@@ -258,9 +259,9 @@
                        LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
                        wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
                        wrapper1.eq(Order::getDelFlag,0);
                        Order page1 = iOrderService.getOne(wrapper1);
                        Order page1 = OrderMapper.selectOne(wrapper1);
                        page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
                        iOrderService.updateById(page1);
                        OrderMapper.updateById(page1);

                        MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
                        memberPointsDTO.setMemberId(page1.getMemberId());

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/PromotionWishList.java

@@ -72,6 +72,7 @@
    private Integer delFlag;

    @ApiModelProperty(value = "会员id")
    @TableField(value = "member_id")
    private  Long memberId;

}

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionWishListServiceImpl.java

@@ -44,18 +44,8 @@
        promotionWishList.setExpectedPrice(promotionWishListDTO.getExpectedPrice());
        promotionWishList.setGoodsName(promotionWishListDTO.getGoodsName());
        promotionWishList.setRemark(promotionWishListDTO.getRemark());
        List<String> urlList=new ArrayList<>();
        if (promotionWishListDTO.getGoodsImageUrl().length>0){
            for (MultipartFile file:promotionWishListDTO.getGoodsImageUrl()){
                try {
                    String url= HuaWeiOBSUtil.obsUpload(file);
                    urlList.add(url);
                } catch (IOException e) {
                    throw new RuntimeException(e);
                }
            }
            promotionWishList.setGoodsImageUrl(urlList.toString());
        }
        promotionWishList.setGoodsImageUrl(promotionWishListDTO.getGoodsImageUrl());
        promotionWishList.setMemberId(promotionWishListDTO.getMemberId());
        this.save(promotionWishList);
    }