修复一下问题

This commit is contained in:
hy001 2026-07-10 12:09:27 +08:00
parent 7ead4fcc85
commit 0a29464a82
4 changed files with 49 additions and 43 deletions

22
.gitignore vendored
View File

@ -41,15 +41,15 @@ buildNumber.properties
.mtj.tmp/ .mtj.tmp/
# Package Files # # Package Files #
*.jar *.jar
*.war *.war
*.nar *.nar
*.ear *.ear
*.zip *.zip
*.tar.gz *.tar.gz
*.rar *.rar
*.iml *.iml
!maven_private/**/*.jar !maven_private/**/*.jar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
@ -96,4 +96,6 @@ target/
devops-monitor-id_rsa.key devops-monitor-id_rsa.key
/claude/ /claude/
.local-run/ .local-run/
.env

View File

@ -100,7 +100,8 @@ public class UserAuthTypeRestController extends BaseController {
*/ */
@GetMapping("/delete/account-auth/{userId}") @GetMapping("/delete/account-auth/{userId}")
public void deleteUserAccountLogin(@PathVariable("userId") Long userId) { public void deleteUserAccountLogin(@PathVariable("userId") Long userId) {
userAuthTypeService.deleteUserAccountLogin(userId); // 临时关闭 App 侧按 userId 删除账号密码登录信息避免普通用户指定他人 userId 触发删除
return;
} }
} }

View File

@ -275,13 +275,21 @@ public class RegisterDeviceClientServiceImpl implements RegisterDeviceClientServ
if (Objects.equals(otherUserId, userId)) { if (Objects.equals(otherUserId, userId)) {
continue; continue;
} }
// 判断是否为主播检查用户是否为团队成员 // 判断是否为主播检查用户是否为团队成员
TeamMember teamMember = TeamMember teamMember =
teamMemberService.getByMemberId(otherUserId); teamMemberService.getByMemberId(otherUserId);
if (teamMember != null) { if (teamMember == null) {
return true; continue;
} }
// 同设备账号已被封禁的不再占用该设备的主播/代理名额
UserProfile otherProfile = userProfileGateway.getByUserId(otherUserId);
if (otherProfile != null && otherProfile.checkAccountArchive()) {
continue;
}
return true;
} }
return false; return false;

View File

@ -1,8 +1,7 @@
package com.red.circle.wallet.inner.service.wallet.impl; package com.red.circle.wallet.inner.service.wallet.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.red.circle.common.business.core.enums.OpUserType; import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.tencent.cls.request.ClsLogSearchQry; import com.red.circle.component.tencent.cls.request.ClsLogSearchQry;
import com.red.circle.component.tencent.cls.response.ClsLogSearchResult; import com.red.circle.component.tencent.cls.response.ClsLogSearchResult;
import com.red.circle.component.tencent.cls.response.ClsLogSearchResultInfo; import com.red.circle.component.tencent.cls.response.ClsLogSearchResultInfo;
@ -77,11 +76,11 @@ public class WalletGoldClientServiceImpl implements WalletGoldClientService {
return walletGoldGateway.getBalance(userId); return walletGoldGateway.getBalance(userId);
} }
@Override @Override
public WalletReceiptResDTO changeBalance(GoldReceiptCmd cmd) { public WalletReceiptResDTO changeBalance(GoldReceiptCmd cmd) {
return walletInnerConvertor.toWalletReceiptResDTO( return walletInnerConvertor.toWalletReceiptResDTO(
walletGoldGateway.changeBalance(toGoldReceipt(cmd))); walletGoldGateway.changeBalance(toGoldReceipt(cmd)));
} }
private WalletReceipt toGoldReceipt(GoldReceiptCmd cmd) { private WalletReceipt toGoldReceipt(GoldReceiptCmd cmd) {
WalletReceipt receipt = walletInnerConvertor.toGoldReceipt(cmd); WalletReceipt receipt = walletInnerConvertor.toGoldReceipt(cmd);
@ -111,27 +110,23 @@ public class WalletGoldClientServiceImpl implements WalletGoldClientService {
return StringPool.UNKNOWN; return StringPool.UNKNOWN;
} }
@Override @Override
public WalletReceiptResDTO changeBalanceTest(TestWalletReceiptCmd cmd) { public WalletReceiptResDTO changeBalanceTest(TestWalletReceiptCmd cmd) {
return walletInnerConvertor.toWalletReceiptResDTO(walletGoldGateway.changeBalance( // 临时止血测试加币接口允许 raw eventType/eventId 入参线上先直接拒绝写余额
new WalletReceipt() log.warn("temporary block test gold balance change endpoint, userId={}, eventId={}, type={}",
.setReqTraceId(cmd.getReqTraceId()) cmd.getUserId(), cmd.getEventId(), cmd.getReceiptType());
.setReceiptType(cmd.getReceiptType()) return temporaryBlockedReceipt(cmd.getUserId());
.setUserId(cmd.getUserId()) }
.setSysOrigin(cmd.getSysOrigin())
.setEventType(cmd.getEventType()) private WalletReceiptResDTO temporaryBlockedReceipt(Long userId) {
.setEventDesc(cmd.getEventDesc()) WalletReceiptResDTO res = new WalletReceiptResDTO();
.setEventId(cmd.getEventId()) res.setBalance(walletGoldGateway.getBalance(userId));
.setRemark(cmd.getRemark()) res.setOpAmount(PennyAmount.ofPenny(0L));
.setOpUserType(OpUserType.APP) return res;
.setAmount(PennyAmount.ofDollar(cmd.getAmount())) }
.setCloseDelayAsset(cmd.getCloseDelayAsset())
.setCreateTime(DateUtils.now()) @Override
)); public void refundBack(RefundBackReceiptCmd cmd) {
}
@Override
public void refundBack(RefundBackReceiptCmd cmd) {
walletGoldGateway.refundBack(walletInnerConvertor.toRefundBackReceipt(cmd)); walletGoldGateway.refundBack(walletInnerConvertor.toRefundBackReceipt(cmd));
} }