|
@@ -8,6 +8,7 @@ import com.ydtech.core.page.HttpResult;
|
|
|
import com.ydtech.exception.SystemException;
|
|
import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.constants.ManagementSource;
|
|
import com.ydtech.modules.admin.constants.ManagementSource;
|
|
|
import com.ydtech.modules.admin.constants.MoneyAttrConstants;
|
|
import com.ydtech.modules.admin.constants.MoneyAttrConstants;
|
|
|
|
|
+import com.ydtech.modules.admin.constants.SwitchConfig;
|
|
|
import com.ydtech.modules.admin.constants.WithdrawTypeConstants;
|
|
import com.ydtech.modules.admin.constants.WithdrawTypeConstants;
|
|
|
import com.ydtech.modules.admin.dao.SysUserAccountMapper;
|
|
import com.ydtech.modules.admin.dao.SysUserAccountMapper;
|
|
|
import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
|
|
import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
|
|
@@ -32,8 +33,13 @@ import com.ydtech.modules.order.entity.InsOrders;
|
|
|
import com.ydtech.modules.order.service.InsAreaCompanyService;
|
|
import com.ydtech.modules.order.service.InsAreaCompanyService;
|
|
|
import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
|
|
import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
|
|
|
import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
|
|
import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
|
|
|
|
|
+import com.ydtech.modules.ttqf.dao.PartTtqfRecordMapper;
|
|
|
|
|
+import com.ydtech.modules.ttqf.entity.PartTtqfRecord;
|
|
|
import com.ydtech.modules.ttqf.entity.vo.UserWithdrawal;
|
|
import com.ydtech.modules.ttqf.entity.vo.UserWithdrawal;
|
|
|
import com.ydtech.modules.ttqf.service.TtqfService;
|
|
import com.ydtech.modules.ttqf.service.TtqfService;
|
|
|
|
|
+import com.ydtech.modules.ttqf.xxx.InitializeInternalWithdrawalId;
|
|
|
|
|
+import com.ydtech.modules.ttqf.xxx.RoundRobinService;
|
|
|
|
|
+import com.ydtech.modules.ttqf.xxx.VirtualWithdrawal;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -291,6 +297,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional
|
|
@Transactional
|
|
|
public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
|
|
public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
|
|
|
|
|
+ if (sysSwitchConfigService.isEnabled(SwitchConfig.VIRTUAL_WITHDRAWAL.getCode())){
|
|
|
|
|
+ SpringUtil.getBean(VirtualWithdrawal.class).virtualWithdrawal("1212", new BigDecimal("100"));
|
|
|
|
|
+ return HttpResult.ok();
|
|
|
|
|
+ }
|
|
|
String userId = BaseController.getUser().getId();
|
|
String userId = BaseController.getUser().getId();
|
|
|
if (isManagement(userId) && sysSwitchConfigService.getBalanceExtractStatus()) {
|
|
if (isManagement(userId) && sysSwitchConfigService.getBalanceExtractStatus()) {
|
|
|
// 个代走线上付款
|
|
// 个代走线上付款
|
|
@@ -342,7 +352,6 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
throw new SystemException("该卡未绑定此账号,或输入卡号错误,或该账号尚未审核通过,请检查");
|
|
throw new SystemException("该卡未绑定此账号,或输入卡号错误,或该账号尚未审核通过,请检查");
|
|
|
}
|
|
}
|
|
|
byId.setIsDefault(1);
|
|
byId.setIsDefault(1);
|
|
|
-
|
|
|
|
|
sysAmountAuditingEntity.setBankNumber(byId.getBankNumber());
|
|
sysAmountAuditingEntity.setBankNumber(byId.getBankNumber());
|
|
|
sysUserAccountHistory.setFromBankCard(byId.getBankNumber());
|
|
sysUserAccountHistory.setFromBankCard(byId.getBankNumber());
|
|
|
sysUserBankCardService.updateById(byId);
|
|
sysUserBankCardService.updateById(byId);
|
|
@@ -411,11 +420,16 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
SysAmountAuditingHistory sysAmountAuditingHistoryTwo = new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId, date, "2", "1", sysUserAccountHistory.getId());
|
|
SysAmountAuditingHistory sysAmountAuditingHistoryTwo = new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId, date, "2", "1", sysUserAccountHistory.getId());
|
|
|
sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
|
|
sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
|
|
|
sysAmountAuditingHistoryService.save(sysAmountAuditingHistoryTwo);
|
|
sysAmountAuditingHistoryService.save(sysAmountAuditingHistoryTwo);
|
|
|
-
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ if (sysSwitchConfigService.isEnabled(SwitchConfig.VIRTUAL_WITHDRAWAL.getCode())){
|
|
|
|
|
+ SpringUtil.getBean(VirtualWithdrawal.class).virtualWithdrawal(userId, amount);
|
|
|
}
|
|
}
|
|
|
return HttpResult.ok("提现成功,等待审核");
|
|
return HttpResult.ok("提现成功,等待审核");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
public boolean isManagement(String userId) {
|
|
public boolean isManagement(String userId) {
|
|
|
SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
|
|
SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
|
|
|
if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())) {
|
|
if (ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())) {
|