From e5a431b9082c8882ccdd69d04d4bd76645d44b6e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 一月 2026 20:50:03 +0800
Subject: [PATCH] bug修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 89 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index e89fe07..a969c91 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -2,12 +2,15 @@
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;
@@ -29,6 +32,7 @@
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;
@@ -43,6 +47,8 @@
@Autowired
private TAppUserService tauService;
+ @Autowired
+ private UserAuditService userAuditService;
@Autowired
private TokenUtil tokenUtil;
@@ -102,7 +108,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-使用福利"})
@@ -152,6 +183,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) {
@@ -175,8 +235,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("头像不能为空！");
}
--
Gitblit v1.7.1