Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
This commit is contained in:
Tankaikai
2025-01-08 19:06:17 +08:00
8 changed files with 40 additions and 200 deletions

View File

@@ -599,7 +599,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
return Result.error(baseResp.getErrorMsg());
}
} else {
sysUserMoneyDetails.setContent("成功提现" + money);
sysUserMoneyDetails.setContent("提现:" + money);
cashOut.setState(3);
}
@@ -626,7 +626,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
// 禁止该姓名的用户提现
Integer count = tbWithdrawBlacklistMapper.selectCount(Wrappers.<TbWithdrawBlacklist>lambdaQuery().in(TbWithdrawBlacklist::getRealName, withdrawCheckNameSet));
if (count > 0) {
userMoneyDetails.setContent("成功提现" + money);
userMoneyDetails.setContent("提现-" + money);
cashOut.setState(3);
cashOut.setRelationId("提现黑名单用户,请谨慎审核!");
} else {
@@ -643,7 +643,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
return Result.error(baseResp.getErrorMsg());
}
} else {
userMoneyDetails.setContent("成功提现" + money);
userMoneyDetails.setContent("提现:" + money);
cashOut.setState(3);
}
}