feat：手机号隐私问题

刘帅

2026-09-20 a3bfafde009c644c21ee8c9971b436f4cd7481f1

 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java

@@ -1,16 +1,23 @@
package com.dsh.account.controller;


import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TUserAudit;
import com.dsh.account.feignclient.activity.model.IntegralCommodity;
import com.dsh.account.feignclient.other.SysLogClient;
import com.dsh.account.model.vo.userBenefitDetail.*;
import com.dsh.account.service.RechargeRecordsService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.service.UserAuditService;
import com.dsh.account.service.UserIntegralChangesService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
import com.dsh.account.util.wx.WxV3PayConfig;
import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -20,8 +27,14 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedReader;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 使用福利 控制器
@@ -34,6 +47,8 @@

    @Autowired
    private TAppUserService tauService;
    @Autowired
    private UserAuditService userAuditService;

    @Autowired
    private TokenUtil tokenUtil;
@@ -49,10 +64,15 @@

    private final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");

    @Autowired
    private PayMoneyUtil payMoneyUtil;
    @Autowired
    private TAppUserService appUserService;


    @ResponseBody
    @PostMapping("/api/useBenefit/indexOfAppUser")
    @ApiOperation(value = "福利主页", tags = {"APP-使用福利"})
    @ApiOperation(value = "福利主页【2.0】", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "lat", value = "经度", dataType = "string"),
@@ -60,7 +80,9 @@
    })
    public ResultUtil<IndexOfUserBenefirVo> queryAppUserUser(String lon, String lat) {
        try {
            System.out.println("21212321312");
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            System.out.println("33333333"+appUserId);
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
@@ -70,6 +92,17 @@
                commodities = commodities.subList(0, 5);
            }
            indexOfUserBenefirVo.setCommodities(commodities);
            TAppUser byId = appUserService.getById(appUserId);
            if (byId.getIsVip()!=null && byId.getIsVip()==1){
                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                if (byId.getVipEndTime().getTime() > System.currentTimeMillis()) {
                    indexOfUserBenefirVo.setVipEndTime(simpleDateFormat.format(byId.getVipEndTime()));
                } else {
                    indexOfUserBenefirVo.setVipEndTime("");
                }
            }else{
                indexOfUserBenefirVo.setVipEndTime("");
            }
            return ResultUtil.success(indexOfUserBenefirVo);
        } catch (Exception e) {
            e.printStackTrace();
@@ -77,7 +110,32 @@
        }
    }

    @ResponseBody
    @PostMapping("/api/useBenefit/getAuditById")
    @ApiOperation(value = "2.0新增接口 查询审核信息", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "用户头像审核记录id或用户昵称审核记录id", dataType = "int", required = true),
    })
    public ResultUtil<TUserAudit> getAuditById(Integer id) {
        TUserAudit userAudit = userAuditService.getById(id);
        if (null == userAudit){
            userAudit=new TUserAudit();
        }
        return ResultUtil.success(userAudit);
    }
    @ResponseBody
    @PostMapping("/api/useBenefit/cancelAudit")
    @ApiOperation(value = "2.0新增接口 关闭头像或昵称审核记录", tags = {"APP-使用福利"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
            @ApiImplicitParam(name = "id", value = "用户头像审核记录id或用户昵称审核记录id", dataType = "int", required = true),
    })
    public ResultUtil cancelAudit(Integer id) {
        userAuditService.removeById(id);

        return ResultUtil.success();
    }
    @ResponseBody
    @PostMapping("/api/useBenefit/userDetails")
    @ApiOperation(value = "用户个人信息", tags = {"APP-使用福利"})
@@ -89,8 +147,10 @@
    })
    public ResultUtil<AppUserDetailsVo> queryAppUserDetails() {
        try {
            System.out.println("1111111");
            AppUserDetailsVo detailsVo = new AppUserDetailsVo();
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            System.out.println("222222"+appUserId);
            if (null == appUserId) {
                return ResultUtil.tokenErr();
            }
@@ -127,6 +187,35 @@

                    detailsVo.setMemberLifespan(format1.format(tAppUser.getVipEndTime()));
                }
                // 查询用户是否有待审核或已驳回的昵称头像审核记录
                TUserAudit nameAudit = userAuditService.lambdaQuery()
                        .eq(TUserAudit::getAppUserId, appUserId)
                        .eq(TUserAudit::getType, 1)
                        .ne(TUserAudit::getState, 2).last("limit 1").one();
                TUserAudit imageAudit = userAuditService.lambdaQuery()
                        .eq(TUserAudit::getAppUserId, appUserId)
                        .eq(TUserAudit::getType, 2)
                        .ne(TUserAudit::getState, 2).last("limit 1").one();
                if (nameAudit!=null){
                    detailsVo.setNameAuditId(nameAudit.getId());
                    if (nameAudit.getState()==1){
                        detailsVo.setNameAudit(1);
                    }else{
                        detailsVo.setNameAudit(3);
                    }
                }else{
                    detailsVo.setNameAudit(2);
                }
                if (imageAudit!=null){
                    detailsVo.setImageAuditId(imageAudit.getId());
                    if (imageAudit.getState()==1){
                        detailsVo.setImageAudit(1);
                    }else{
                        detailsVo.setImageAudit(3);
                    }
                }else{
                    detailsVo.setImageAudit(2);
                }
            }
            return ResultUtil.success(detailsVo);
        } catch (Exception e) {
@@ -150,8 +239,33 @@
            }
            TAppUser byId = tauService.getById(appUserId);
            if (ToolUtil.isNotEmpty(userImage)) {
                byId.setHeadImg(userImage);
                tauService.updateById(byId);
//                byId.setHeadImg(userImage);
//                tauService.updateById(byId);
                // 查询是否有待审核的头像
                TUserAudit userAudit = userAuditService
                        .lambdaQuery().eq(TUserAudit::getType, 2)
                        .eq(TUserAudit::getAppUserId, appUserId)
                        .ne(TUserAudit::getState, 2).last("limit 1").one();
                if (userAudit!=null){
                    userAudit.setState(1);
                    userAudit.setHeadImg(userImage);
                    UpdateWrapper<TUserAudit> tUserAuditUpdateWrapper = new UpdateWrapper<>();
                    tUserAuditUpdateWrapper.eq("id",userAudit.getId());
                    tUserAuditUpdateWrapper.set("state",1);
                    tUserAuditUpdateWrapper.set("headImg",userImage);
                    tUserAuditUpdateWrapper.set("remark",null);
                    tUserAuditUpdateWrapper.set("auditId",null);
                    tUserAuditUpdateWrapper.set("auditTime",null);
                    userAuditService.update(tUserAuditUpdateWrapper);
                }else{
                    TUserAudit tUserAudit = new TUserAudit();
                    tUserAudit.setAppUserId(appUserId);
                    tUserAudit.setHeadImg(userImage);
                    tUserAudit.setType(2);
                    tUserAudit.setInsertTime(new Date());
                    userAuditService.save(tUserAudit);

                }
            } else {
                ResultUtil.error("头像不能为空！");
            }
@@ -307,12 +421,8 @@
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil<List<Goods>> pointsMallList(MallRequest request) {
//        try {
        System.out.println("======request========" + request);
        System.err.println( "积分商城"+request);
        return ResultUtil.success(tauService.queryAppUserIntegral(request));
//        }catch (Exception e){
//            return ResultUtil.runErr();
//        }
    }


@@ -407,7 +517,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public synchronized ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType) {
    public ResultUtil productRedemptionOperation(GoodsExchangeVo exchangeType) {
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if (null == userIdFormRedis) {
@@ -421,6 +531,100 @@


    /**
     * V3版本回调
     * @param request
     * @param response
     */
    @ResponseBody
    @PostMapping("/base/coupon/weChatPaymentCouponCallback1")
    public void weChatPaymentCouponCallback1(HttpServletRequest request, HttpServletResponse response){
        try {
            System.err.println("微信回调");
            System.err.println("请求" + request);
            BufferedReader reader = request.getReader();
            String string1 = reader.toString();
            System.err.println("请求reader" + string1);
            StringBuilder requestBody = new StringBuilder();
            String line;
            while ((line = reader.readLine()) != null) {
                requestBody.append(line);
            }
            System.err.println("全部请求体" + requestBody);
            JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
            JSONObject resource = jsonObject.getJSONObject("resource");

            AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
            String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
                    resource.getString("ciphertext"));
            System.err.println("微信解密的字符串信息" + decryptedData);
            JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
            String code = jsonInfo.getString("out_trade_no");
            String trade_no = jsonInfo.getString("transaction_id");
            String trade_state = jsonInfo.getString("trade_state");
            if (trade_state.equals("SUCCESS")) {
                ResultUtil resultUtil = tauService.paymentCouponCallback(code, trade_no);
                if(resultUtil.getCode() == 200){
                    PrintWriter out = response.getWriter();
                    out.print("SUCCESS");
                    out.flush();
                    out.close();
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }

    @ResponseBody
    @PostMapping("/base/coupon/weChatPaymentCouponCallback")
    public void weChatPaymentCouponCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
            if(null != map){
                String code = map.get("out_trade_no");
                String trade_no = map.get("transaction_id");
                String result = map.get("result");
                ResultUtil resultUtil = tauService.paymentCouponCallback(code, trade_no);
                if(resultUtil.getCode() == 200){
                    PrintWriter out = response.getWriter();
                    out.print(result);
                    out.flush();
                    out.close();
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }

    @ResponseBody
    @PostMapping("/base/coupon/aliPaymentCouponCallback")
    public void aliPaymentCouponCallback(HttpServletRequest request, HttpServletResponse response){
        try {
            Map<String, String> map = payMoneyUtil.alipayCallback(request);
            if(null != map){
                String code = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
                ResultUtil resultUtil = tauService.paymentCouponCallback(code, trade_no);
                if(resultUtil.getCode() == 200){
                    PrintWriter out = response.getWriter();
                    out.print("success");
                    out.flush();
                    out.close();
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }







    /**
     * 积分明细
     */
    @ResponseBody