From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
index e4a068c..2b77da3 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
@@ -10,14 +10,18 @@
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.io.resource.ClassPathResource;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.xiaopeng.api.dto.account.UcUserInfo;
import com.xiaopeng.api.feignClient.account.SysGroupMenuClient;
+import com.xiaopeng.api.feignClient.account.UserResourcesClient;
import com.xiaopeng.api.model.operation.XpInvitationCode;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.api.vo.account.LoginUser;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.DateUtils;
+import com.xiaopeng.common.core.utils.SensitiveDataCryptoUtil;
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.log.annotation.AdminOperationLog;
@@ -36,6 +40,7 @@
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +60,9 @@
import java.util.*;
import java.util.stream.Collectors;
import java.util.regex.Pattern;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
/**
* <p>
@@ -79,6 +87,8 @@
private SysGroupMenuClient groupMenuClient;
@Resource
private TokenService tokenService;
+ @Autowired
+ private UserResourcesClient userResourcesClient;
private static final Pattern CHINESE_PATTERN = Pattern.compile("\\p{IsHan}");
private static final long INVITATION_CODE_LIMIT = 500L;
@@ -106,7 +116,7 @@
content = "生成邀请码",
appendRequestData = true
)
- public R add(@RequestBody InvitationAddDto dto) {
+ public R add(@RequestBody InvitationAddDto dto){
long existing = xpInvitationCodeService.count();
long incoming = Arrays.stream(Optional.ofNullable(dto.getPhones()).orElse("").split(","))
.map(String::trim)
@@ -128,16 +138,16 @@
@PutMapping("/api/v1/invitation/unbind")
@ResponseBody
@ApiOperation(value = "解绑")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "id", name = "id", dataType = "Long", required = true)
+ })
@AdminOperationLog(
businessType = AdminBusinessType.INVITATION_CODE_MANAGEMENT,
operationType = AdminOperationType.EDIT,
contentExpression = "'解绑邀请码,id=' + #p0",
appendRequestData = false
)
- @ApiImplicitParams({
- @ApiImplicitParam(value = "id", name = "id", dataType = "Long", required = true)
- })
- public R unbind(@RequestParam("id") Long id) {
+ public R unbind(@RequestParam("id") Long id){
UpdateWrapper<XpInvitationCode> xpInvitationCodeUpdateWrapper = new UpdateWrapper<>();
xpInvitationCodeUpdateWrapper.eq("id", id);
xpInvitationCodeUpdateWrapper.set("status", 3);
@@ -301,11 +311,14 @@
String res = replace.replace("/", "-");
locationExcel.setBindTime(res);
}
-
- xpInvitationCode.setBindTime(DateUtils.stringToLocalDateTime(locationExcel.getBindTime()));
- xpInvitationCode.setStatus(2);
+ UcUserInfo userByMobile = userResourcesClient.getUserByMobile(locationExcel.getBindAccount());
+ if(null == userByMobile || StringUtils.isEmpty(userByMobile.getUid())){
+ throw new ServiceException("手机号"+locationExcel.getBindAccount()+"查询用户失败");
+ }
XpWhitelist xpWhitelist = new XpWhitelist();
- xpWhitelist.setAccount(locationExcel.getBindAccount());
+ xpWhitelist.setAccount(SensitiveDataCryptoUtil.encrypt(locationExcel.getBindAccount()));
+ xpWhitelist.setNickName(userByMobile.getNickName());
+ xpWhitelist.setAppUserId(userByMobile.getUid());
xpWhitelist.setStatus(true);
xpWhitelist.setIsPriorityDispatch(false);
xpWhitelist.setWhitelistSource(2);
@@ -390,9 +403,18 @@
contentExpression = "'批量删除邀请码,ids=' + #p0",
appendRequestData = false
)
- public R deleteByIds(String ids) {
+ public R deleteByIds(String ids){
// 再转化为Long类型
List<Long> longs = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
+ List<XpInvitationCode> xpInvitationCodes = xpInvitationCodeService.listByIds(longs);
+ for (XpInvitationCode xpInvitationCode : xpInvitationCodes) {
+ XpWhitelist one = xpWhitelistService.getOne(new QueryWrapper<XpWhitelist>().eq("whitelist_source", 2)
+ .eq("status", 1).eq("is_deleted", 0)
+ .eq("account", SensitiveDataCryptoUtil.encrypt(xpInvitationCode.getBindAccount())).last(" limit 1"));
+ if(null != one){
+ xpWhitelistService.removeById(one);
+ }
+ }
xpInvitationCodeService.removeBatchByIds(longs);
return R.ok();
}
--
Gitblit v1.7.1