From 68a2b4f68c0aca17480d5c5ca2e123b8abe6b016 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 9 Dec 2025 20:47:23 +0800 Subject: [PATCH] 111 --- .../com/ruoyi/task/SplitAccountsTask.java | 62 +++++++++++++++++++ .../com/ruoyi/system/domain/UsdtFundFlow.java | 6 +- .../ruoyi/system/domain/UsdtFundFlowPlus.java | 6 +- .../com/ruoyi/system/domain/UsdtOrders.java | 6 +- .../ruoyi/system/domain/UsdtOrdersPlus.java | 6 +- .../system/domain/WalletAddressPlus.java | 26 +++++++- .../system/service/IUsdtOrdersService.java | 9 +++ ...sdtUserSettlementConfigurationService.java | 2 + .../service/impl/UsdtOrdersServiceImpl.java | 14 +++++ ...serSettlementConfigurationServiceImpl.java | 7 +++ .../mapper/system/WalletAddressMapper.xml | 10 ++- 11 files changed, 140 insertions(+), 14 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java new file mode 100644 index 0000000..33cb8dc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/SplitAccountsTask.java @@ -0,0 +1,62 @@ +package com.ruoyi.task; + +import com.ruoyi.system.domain.UsdtFundFlow; +import com.ruoyi.system.domain.UsdtFundFlowPlus; +import com.ruoyi.system.domain.UsdtOrdersPlus; +import com.ruoyi.system.domain.UsdtUserSettlementConfigurationPlus; +import com.ruoyi.system.service.IUsdtFundFlowService; +import com.ruoyi.system.service.IUsdtOrdersService; +import com.ruoyi.system.service.IUsdtUserSettlementConfigurationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component("splitAccountsTask") +public class SplitAccountsTask { + @Autowired + private IUsdtOrdersService usdtOrdersService; + @Autowired + private IUsdtUserSettlementConfigurationService usdtUserSettlementConfigurationService; + @Autowired + private IUsdtFundFlowService usdtFundFlowService; + public void execute() { + List list = usdtOrdersService.getWillSettlement(1000); + Map configMap = new HashMap(); + List fundFlows = new ArrayList(); + List ids = new ArrayList<>(); + for (UsdtOrdersPlus usdtOrdersPlus : list) { + UsdtUserSettlementConfigurationPlus config = configMap.getOrDefault(usdtOrdersPlus.getUserId(), usdtUserSettlementConfigurationService.getByUserId(usdtOrdersPlus.getUserId())); + BigDecimal yj = usdtOrdersPlus.getActualAmount().multiply(config.getCommissionRate()); + UsdtFundFlowPlus yjFlow = new UsdtFundFlowPlus(); + yjFlow.setAppId(usdtOrdersPlus.getAppId()); + yjFlow.setAmount(yj); + yjFlow.setOrderId(usdtOrdersPlus.getId()); + yjFlow.setOpType(1); + yjFlow.setUserId(usdtOrdersPlus.getUserId()); + yjFlow.setToken(usdtOrdersPlus.getToken()); + + UsdtFundFlowPlus shFlow = new UsdtFundFlowPlus(); + shFlow.setAppId(usdtOrdersPlus.getAppId()); + shFlow.setAmount(usdtOrdersPlus.getActualAmount().subtract(yj)); + shFlow.setOrderId(usdtOrdersPlus.getId()); + shFlow.setOpType(0); + shFlow.setUserId(usdtOrdersPlus.getUserId()); + shFlow.setToken(usdtOrdersPlus.getToken()); + + fundFlows.add(yjFlow); + fundFlows.add(shFlow); + ids.add(usdtOrdersPlus.getId()); + } + if(!fundFlows.isEmpty()){ + usdtFundFlowService.saveBatch(fundFlows); + } + if(ids.isEmpty()){ + this.usdtOrdersService.updateSettlementStatusByIds(ids,1); + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlow.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlow.java index 63e77cc..7c1b4ca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlow.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlow.java @@ -52,7 +52,7 @@ public class UsdtFundFlow extends BaseEntity /** 操作类型 */ @Excel(name = "操作类型") - private Long opType; + private Integer opType; /** Token地址 */ @Excel(name = "Token地址") @@ -130,12 +130,12 @@ public class UsdtFundFlow extends BaseEntity { return amount; } - public void setOpType(Long opType) + public void setOpType(Integer opType) { this.opType = opType; } - public Long getOpType() + public Integer getOpType() { return opType; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlowPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlowPlus.java index f61c005..9c485a4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlowPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtFundFlowPlus.java @@ -47,7 +47,7 @@ public class UsdtFundFlowPlus implements Serializable private BigDecimal amount; /** 操作类型 */ @Excel(name = "操作类型") - private Long opType; + private Integer opType; /** Token地址 */ @Excel(name = "Token地址") private String token; @@ -126,12 +126,12 @@ public class UsdtFundFlowPlus implements Serializable { return amount; } - public void setOpType(Long opType) + public void setOpType(Integer opType) { this.opType = opType; } - public Long getOpType() + public Integer getOpType() { return opType; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java index 33e3390..b6975c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrders.java @@ -84,7 +84,7 @@ public class UsdtOrders extends BaseEntity /** 结算状态 */ @Excel(name = "结算状态") - private Long settlementStatus; + private Integer settlementStatus; /** 用户 */ @Excel(name = "用户") @@ -234,12 +234,12 @@ public class UsdtOrders extends BaseEntity { return appId; } - public void setSettlementStatus(Long settlementStatus) + public void setSettlementStatus(Integer settlementStatus) { this.settlementStatus = settlementStatus; } - public Long getSettlementStatus() + public Integer getSettlementStatus() { return settlementStatus; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java index 00d0c52..b2628bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java @@ -71,7 +71,7 @@ public class UsdtOrdersPlus implements Serializable private Long appId; /** 结算状态 */ @Excel(name = "结算状态") - private Long settlementStatus; + private Integer settlementStatus; /** 用户 */ @Excel(name = "用户") private Long userId; @@ -219,12 +219,12 @@ public class UsdtOrdersPlus implements Serializable { return appId; } - public void setSettlementStatus(Long settlementStatus) + public void setSettlementStatus(Integer settlementStatus) { this.settlementStatus = settlementStatus; } - public Long getSettlementStatus() + public Integer getSettlementStatus() { return settlementStatus; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java index 82b977a..12d2df5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/WalletAddressPlus.java @@ -1,5 +1,6 @@ package com.ruoyi.system.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -45,7 +46,30 @@ public class WalletAddressPlus implements Serializable /** 用户 */ @Excel(name = "用户") private Long userId; - public void setId(Long id) + + @Excel(name = "usdt余额") + private BigDecimal usdtBalance; + + @Excel(name = "trx余额") + private BigDecimal trxBalance; + + public BigDecimal getTrxBalance() { + return trxBalance; + } + + public void setTrxBalance(BigDecimal trxBalance) { + this.trxBalance = trxBalance; + } + + public BigDecimal getUsdtBalance() { + return usdtBalance; + } + + public void setUsdtBalance(BigDecimal usdtBalance) { + this.usdtBalance = usdtBalance; + } + + public void setId(Long id) { this.id = id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtOrdersService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtOrdersService.java index 9c4d0a1..0c9ea37 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtOrdersService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtOrdersService.java @@ -16,6 +16,11 @@ import java.util.Map; */ public interface IUsdtOrdersService extends IService { + /** + * 获取已支付未结算订单 + * @return + */ + List getWillSettlement(Integer size); List select(String keyword,boolean isUser); /** @@ -26,6 +31,8 @@ public interface IUsdtOrdersService extends IService */ public UsdtOrders selectUsdtOrdersById(Long id,boolean isUser); + + int updateSettlementStatusByIds(List ids,Integer settlementStatus); /** * 查询订单列表 * @@ -88,4 +95,6 @@ public interface IUsdtOrdersService extends IService Long count(String where); List countByGroupBy(String select, String where, String groupby, Class tClass); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtUserSettlementConfigurationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtUserSettlementConfigurationService.java index 33c71e1..1999a05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtUserSettlementConfigurationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtUserSettlementConfigurationService.java @@ -26,6 +26,8 @@ public interface IUsdtUserSettlementConfigurationService extends IService getWillSettlement(Integer size) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(UsdtOrdersPlus::getSettlementStatus,0).eq(UsdtOrdersPlus::getStatus,2).last("limit "+ size); + return list(lambdaQueryWrapper); + } + @Override public List select(String keyword,boolean isUser) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() @@ -181,6 +189,12 @@ public class UsdtOrdersServiceImpl extends ServiceImpl ids,Integer settlementStatus){ + UsdtOrdersPlus usdtOrders = new UsdtOrdersPlus(); + usdtOrders.setSettlementStatus(settlementStatus); + return baseMapper.update(usdtOrders, new LambdaQueryWrapper() + .and(i -> i.in(UsdtOrdersPlus::getId, ids))); + } /** * 查询订单列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtUserSettlementConfigurationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtUserSettlementConfigurationServiceImpl.java index 626da8e..298f29e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtUserSettlementConfigurationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtUserSettlementConfigurationServiceImpl.java @@ -181,6 +181,13 @@ public class UsdtUserSettlementConfigurationServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(UsdtUserSettlementConfigurationPlus::getUserId, userId); + return getOne(lambdaQueryWrapper); + } + /** * 查询商户配置列表 * diff --git a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml index 9b61ede..4c41e53 100644 --- a/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/WalletAddressMapper.xml @@ -13,10 +13,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, token, status, created_at, updated_at, deleted_at, app_id, user_id from wallet_address + select id, token, status, created_at, updated_at, deleted_at, app_id, user_id,usdt_balance,trx_balance from wallet_address