From 15cc5376398126d07e438b96dd5911d953d7737a Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Tue, 13 Oct 2026 11:24:20 -0400 Subject: [PATCH] =?UTF-8?q?apps=E6=B5=81=E6=B0=B4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppsBalanceLedgerController.java | 97 ++----------- .../domain/vo/AppsLedgerStatisticsQuery.java | 32 +++++ .../mapper/AppsBalanceLedgerMapper.java | 10 ++ .../com/ruoyi/system/mapper/AppsMapper.java | 6 + .../service/IAppsBalanceLedgerService.java | 40 +----- .../service/WalletLedgerPostingService.java | 89 +++++++++++- .../impl/AppsBalanceLedgerServiceImpl.java | 136 ++++-------------- .../mapper/system/AppsBalanceLedgerMapper.xml | 59 +++++++- .../resources/mapper/system/AppsMapper.xml | 6 + sql/apps_balance_ledger_indexes.sql | 13 ++ 10 files changed, 256 insertions(+), 232 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppsLedgerStatisticsQuery.java create mode 100644 sql/apps_balance_ledger_indexes.sql diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppsBalanceLedgerController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppsBalanceLedgerController.java index 771271b..098df9f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppsBalanceLedgerController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AppsBalanceLedgerController.java @@ -5,11 +5,9 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.select.Ids; -import com.ruoyi.common.select.SelectItem; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.AppsBalanceLedger; -import com.ruoyi.system.domain.AppsBalanceLedgerPlus; +import com.ruoyi.system.domain.vo.AppsLedgerStatisticsQuery; import com.ruoyi.system.service.IAppsBalanceLedgerService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -29,34 +27,6 @@ public class AppsBalanceLedgerController extends BaseController { @Autowired private IAppsBalanceLedgerService appsBalanceLedgerService; - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:getByIds')") - @PostMapping("/getByIds") - public AjaxResult getByIds(@RequestBody Ids ids) - { - List list = appsBalanceLedgerService.getByIds(ids.getLongIds(),false,AppsBalanceLedgerPlus::getAppId,AppsBalanceLedgerPlus::getId); - return AjaxResult.success(list); - } - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-getByIds')") - @PostMapping("/user/getByIds") - public AjaxResult userGetByIds(@RequestBody Ids ids) - { - List list = appsBalanceLedgerService.getByIds(ids.getLongIds(),true,AppsBalanceLedgerPlus::getUserId,AppsBalanceLedgerPlus::getAppId,AppsBalanceLedgerPlus::getId); - return AjaxResult.success(list); - } - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:select')") - @GetMapping("/select") - public AjaxResult select(String keyword) - { - List list = appsBalanceLedgerService.select(keyword,false); - return AjaxResult.success(list); - } - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-select')") - @GetMapping("/user/select") - public AjaxResult userSelect(String keyword) - { - List list = appsBalanceLedgerService.select(keyword,true); - return AjaxResult.success(list); - } /** * 查询应用账面余额流水列表 */ @@ -110,61 +80,16 @@ public class AppsBalanceLedgerController extends BaseController { return AjaxResult.success(appsBalanceLedgerService.selectAppsBalanceLedgerById(id,true)); } - /** - * 新增应用账面余额流水 - */ - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:add')") - @Log(title = "应用账面余额流水", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody AppsBalanceLedger appsBalanceLedger) - { - return toAjax(appsBalanceLedgerService.insertAppsBalanceLedger(appsBalanceLedger,false)); + + @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:list')") + @GetMapping("/statistics") + public AjaxResult statistics(AppsLedgerStatisticsQuery query) { + return AjaxResult.success(appsBalanceLedgerService.statistics(query, false)); } - /** - * 新增应用账面余额流水 - */ - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-add')") - @Log(title = "应用账面余额流水", businessType = BusinessType.INSERT) - @PostMapping("/user") - public AjaxResult userAdd(@RequestBody AppsBalanceLedger appsBalanceLedger) - { - return toAjax(appsBalanceLedgerService.insertAppsBalanceLedger(appsBalanceLedger,true)); - } - /** - * 修改应用账面余额流水 - */ - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:edit')") - @Log(title = "应用账面余额流水", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody AppsBalanceLedger appsBalanceLedger) - { - return toAjax(appsBalanceLedgerService.updateAppsBalanceLedger(appsBalanceLedger,false)); - } - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-edit')") - @Log(title = "应用账面余额流水", businessType = BusinessType.UPDATE) - @PutMapping("/user") - public AjaxResult userEdit(@RequestBody AppsBalanceLedger appsBalanceLedger) - { - return toAjax(appsBalanceLedgerService.updateAppsBalanceLedger(appsBalanceLedger,true)); - } - /** - * 删除应用账面余额流水 - */ - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:remove')") - @Log(title = "应用账面余额流水", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(appsBalanceLedgerService.deleteAppsBalanceLedgerByIds(ids,false)); - } - /** - * 删除应用账面余额流水 - */ - @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-remove')") - @Log(title = "应用账面余额流水", businessType = BusinessType.DELETE) - @DeleteMapping("/user/{ids}") - public AjaxResult userRemove(@PathVariable Long[] ids) - { - return toAjax(appsBalanceLedgerService.deleteAppsBalanceLedgerByIds(ids,true)); + + @PreAuthorize("@ss.hasPermi('system:appsBalanceLedger:user-list')") + @GetMapping("/user/statistics") + public AjaxResult userStatistics(AppsLedgerStatisticsQuery query) { + return AjaxResult.success(appsBalanceLedgerService.statistics(query, true)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppsLedgerStatisticsQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppsLedgerStatisticsQuery.java new file mode 100644 index 0000000..1972a32 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/AppsLedgerStatisticsQuery.java @@ -0,0 +1,32 @@ +package com.ruoyi.system.domain.vo; + +import java.util.Date; +import org.springframework.format.annotation.DateTimeFormat; + +/** 应用余额流水统计查询条件。 */ +public class AppsLedgerStatisticsQuery { + private Long appId; + private Long userId; + private String currency; + private String businessType; + private String granularity; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date beginTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date endTime; + + public Long getAppId() { return appId; } + public void setAppId(Long appId) { this.appId = appId; } + public Long getUserId() { return userId; } + public void setUserId(Long userId) { this.userId = userId; } + public String getCurrency() { return currency; } + public void setCurrency(String currency) { this.currency = currency; } + public String getBusinessType() { return businessType; } + public void setBusinessType(String businessType) { this.businessType = businessType; } + public String getGranularity() { return granularity; } + public void setGranularity(String granularity) { this.granularity = granularity; } + public Date getBeginTime() { return beginTime; } + public void setBeginTime(Date beginTime) { this.beginTime = beginTime; } + public Date getEndTime() { return endTime; } + public void setEndTime(Date endTime) { this.endTime = endTime; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsBalanceLedgerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsBalanceLedgerMapper.java index 6aeeba3..22b1203 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsBalanceLedgerMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsBalanceLedgerMapper.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.AppsBalanceLedger; import com.ruoyi.system.domain.AppsBalanceLedgerPlus; +import com.ruoyi.system.domain.vo.AppsLedgerStatisticsQuery; +import com.ruoyi.system.domain.vo.WalletLedgerSummaryVo; +import com.ruoyi.system.domain.vo.WalletLedgerTrendVo; /** * 应用账面余额流水Mapper接口 @@ -31,6 +34,13 @@ public interface AppsBalanceLedgerMapper extends BaseMapper selectAppsBalanceLedgerList(AppsBalanceLedger appsBalanceLedger); + /** 系统业务幂等写入,重复幂等键不生成新流水。 */ + int insertSystemLedgerIgnoreDuplicate(AppsBalanceLedger ledger); + + List selectStatisticsSummary(AppsLedgerStatisticsQuery query); + + List selectStatisticsTrend(AppsLedgerStatisticsQuery query); + /** * 新增应用账面余额流水 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java index 23dbb89..000a6c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AppsMapper.java @@ -24,6 +24,12 @@ public interface AppsMapper extends BaseMapper /** 锁定应用,串行化同一应用的钱包领取。 */ Apps selectAppsByIdForUpdate(@Param("id") Long id); + /** 订单结算时仅更新应用可用余额,冻结余额不参与变动。 */ + int updateAvailableBalances(@Param("id") Long id, + @Param("usdtBalance") java.math.BigDecimal usdtBalance, + @Param("trxBalance") java.math.BigDecimal trxBalance, + @Param("updatedAt") java.util.Date updatedAt); + int updateKeyPair(@Param("id") Long id, @Param("publicKey") String publicKey, @Param("privateKey") String privateKey, @Param("updatedAt") java.util.Date updatedAt); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppsBalanceLedgerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppsBalanceLedgerService.java index 23dc183..1e2281c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppsBalanceLedgerService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IAppsBalanceLedgerService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.select.SelectItem; import com.ruoyi.system.domain.AppsBalanceLedger; import com.ruoyi.system.domain.AppsBalanceLedgerPlus; +import com.ruoyi.system.domain.vo.AppsLedgerStatisticsQuery; +import com.ruoyi.system.domain.vo.WalletLedgerStatisticsVo; import java.util.List; import java.util.Map; @@ -40,31 +42,7 @@ public interface IAppsBalanceLedgerService extends IService getByIds(List ids,boolean isUser, SFunction... columns); @@ -76,16 +54,4 @@ public interface IAppsBalanceLedgerService extends IService getMapByIds(List ids); - /** - * @param field sum 字段 - * @param where 条件 - * @param tClass 返回类型 - * @param - * @return - */ - T sum(String field, String where, Class tClass); - - 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/WalletLedgerPostingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/WalletLedgerPostingService.java index a6fa99b..2605eca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/WalletLedgerPostingService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/WalletLedgerPostingService.java @@ -3,15 +3,22 @@ package com.ruoyi.system.service; import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.system.domain.UsdtAggregationTaskItemPlus; +import com.ruoyi.system.domain.Apps; +import com.ruoyi.system.domain.AppsBalanceLedger; +import com.ruoyi.system.domain.UsdtConfig; import com.ruoyi.system.domain.UsdtOrdersPlus; import com.ruoyi.system.domain.WalletAddressLedger; import com.ruoyi.system.domain.WalletAddressPlus; import com.ruoyi.system.mapper.UsdtOrdersMapper; +import com.ruoyi.system.mapper.AppsBalanceLedgerMapper; +import com.ruoyi.system.mapper.AppsMapper; +import com.ruoyi.system.mapper.UsdtConfigMapper; import com.ruoyi.system.mapper.WalletAddressLedgerMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.math.BigDecimal; /** * 系统业务流水入账服务。 @@ -26,15 +33,24 @@ public class WalletLedgerPostingService { private final WalletAddressLedgerMapper ledgerMapper; private final IWalletAddressService walletService; private final IUsdtAggregationTaskItemService aggregationItemService; + private final AppsMapper appsMapper; + private final AppsBalanceLedgerMapper appsLedgerMapper; + private final UsdtConfigMapper configMapper; public WalletLedgerPostingService(UsdtOrdersMapper ordersMapper, WalletAddressLedgerMapper ledgerMapper, IWalletAddressService walletService, - IUsdtAggregationTaskItemService aggregationItemService) { + IUsdtAggregationTaskItemService aggregationItemService, + AppsMapper appsMapper, + AppsBalanceLedgerMapper appsLedgerMapper, + UsdtConfigMapper configMapper) { this.ordersMapper = ordersMapper; this.ledgerMapper = ledgerMapper; this.walletService = walletService; this.aggregationItemService = aggregationItemService; + this.appsMapper = appsMapper; + this.appsLedgerMapper = appsLedgerMapper; + this.configMapper = configMapper; } /** 将待支付订单结算为成功,同一订单重复扫描不会重复产生流水。 */ @@ -74,9 +90,80 @@ public class WalletLedgerPostingService { ledger.setSourceType("ORDER"); ledger.setRemark("订单支付成功"); ledgerMapper.insertSystemLedgerIgnoreDuplicate(ledger); + + postOrderToAppBalance(order, transactionId, now); return ordersMapper.markOrderPaid(order.getId(), transactionId, now) == 1; } + /** + * 代收订单增加应用 USDT 可用余额,并扣减配置的 TRX 手续费。 + * 冻结余额仅写入流水快照,不参与本次余额计算。 + */ + private void postOrderToAppBalance(UsdtOrdersPlus order, String transactionId, Date now) { + Apps app = appsMapper.selectAppsByIdForUpdate(order.getAppId()); + if (app == null) { + throw new CustomException("订单所属应用不存在"); + } + UsdtConfig config = configMapper.selectFirstForUpdate(); + if (config == null || config.getReceiveUsdtNum() == null) { + throw new CustomException("全局配置未设置订单代收手续费"); + } + BigDecimal fee = config.getReceiveUsdtNum(); + if (fee.compareTo(BigDecimal.ZERO) < 0) { + throw new CustomException("订单代收手续费不能小于0"); + } + + BigDecimal usdtBefore = zeroIfNull(app.getUsdtBalance()); + BigDecimal trxBefore = zeroIfNull(app.getTrxBalance()); + BigDecimal usdtAfter = usdtBefore.add(order.getActualAmount()); + BigDecimal trxAfter = trxBefore.subtract(fee); + BigDecimal usdtFrozen = zeroIfNull(app.getUsdtFrozenBalance()); + BigDecimal trxFrozen = zeroIfNull(app.getTrxFrozenBalance()); + + appsLedgerMapper.insertSystemLedgerIgnoreDuplicate(buildAppLedger(order, transactionId, + "ORDER_RECEIVE", "USDT", 1, order.getActualAmount(), usdtBefore, usdtAfter, + usdtFrozen, "订单代收到账", now, app.getUserId())); + appsLedgerMapper.insertSystemLedgerIgnoreDuplicate(buildAppLedger(order, transactionId, + "ORDER_FEE", "TRX", 2, fee, trxBefore, trxAfter, + trxFrozen, "订单代收手续费", now, app.getUserId())); + + if (appsMapper.updateAvailableBalances(app.getId(), usdtAfter, trxAfter, now) != 1) { + throw new CustomException("应用余额更新失败"); + } + } + + private AppsBalanceLedger buildAppLedger(UsdtOrdersPlus order, String transactionId, + String businessType, String currency, int direction, BigDecimal amount, + BigDecimal before, BigDecimal after, BigDecimal frozen, + String remark, Date now, Long userId) { + AppsBalanceLedger ledger = new AppsBalanceLedger(); + ledger.setTradeNo(order.getTradeId()); + ledger.setIdempotencyKey(businessType + ":" + order.getId() + ":" + currency); + ledger.setAppId(order.getAppId()); + ledger.setUserId(userId); + ledger.setCurrency(currency); + ledger.setBalanceType(1); + ledger.setBusinessType(businessType); + ledger.setDirection(direction); + ledger.setAmount(amount); + ledger.setBalanceBefore(before); + ledger.setBalanceAfter(after); + ledger.setAvailableBefore(before); + ledger.setAvailableAfter(after); + ledger.setFrozenBefore(frozen); + ledger.setFrozenAfter(frozen); + ledger.setOrderId(order.getId()); + ledger.setMerchantOrderId(order.getOrderId()); + ledger.setTransactionId(transactionId); + ledger.setRemark(remark); + ledger.setCreatedAt(now); + return ledger; + } + + private BigDecimal zeroIfNull(BigDecimal value) { + return value == null ? BigDecimal.ZERO : value; + } + /** 将已广播成功的归集明细与对应支出流水原子落库。 */ @Transactional(rollbackFor = Exception.class) public void completeAggregationItem(UsdtAggregationTaskItemPlus item, diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsBalanceLedgerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsBalanceLedgerServiceImpl.java index 427d993..f2d4c5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsBalanceLedgerServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AppsBalanceLedgerServiceImpl.java @@ -1,19 +1,18 @@ package com.ruoyi.system.service.impl; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.select.SelectItem; -import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.exception.CustomException; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.AppsBalanceLedger; import com.ruoyi.system.domain.AppsBalanceLedgerPlus; +import com.ruoyi.system.domain.vo.AppsLedgerStatisticsQuery; +import com.ruoyi.system.domain.vo.WalletLedgerStatisticsVo; import com.ruoyi.system.mapper.AppsBalanceLedgerMapper; import com.ruoyi.system.service.IAppsBalanceLedgerService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import java.util.*; @@ -28,8 +27,6 @@ public class AppsBalanceLedgerServiceImpl extends ServiceImpl getByIds(List ids ,boolean isUser, SFunction... columns) { @@ -122,48 +119,32 @@ public class AppsBalanceLedgerServiceImpl extends ServiceImpl T sum(String field, String where, Class tClass) { - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select "); - stringBuffer.append(" sum(" + field + ") as total "); - stringBuffer.append(" from apps_balance_ledger "); - if (StringUtils.isNotBlank(where)) { - stringBuffer.append(" where "); - stringBuffer.append(where); + @Override + public WalletLedgerStatisticsVo statistics(AppsLedgerStatisticsQuery query, boolean isUser) { + AppsLedgerStatisticsQuery safeQuery = query == null ? new AppsLedgerStatisticsQuery() : query; + String granularity = safeQuery.getGranularity(); + if (granularity == null || granularity.trim().isEmpty()) { + safeQuery.setGranularity("DAY"); + } else { + granularity = granularity.trim().toUpperCase(Locale.ENGLISH); + if (!Arrays.asList("DAY", "MONTH", "YEAR").contains(granularity)) { + throw new CustomException("统计粒度仅支持 DAY、MONTH、YEAR"); + } + safeQuery.setGranularity(granularity); } - T result = jdbcTemplate.queryForObject(stringBuffer.toString(), tClass); - return result; - } - - public Long count(String where) { - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select "); - stringBuffer.append(" count(1)"); - stringBuffer.append(" from "); - stringBuffer.append(" apps_balance_ledger "); - if (StringUtils.isNotBlank(where)) { - stringBuffer.append(" where "); - stringBuffer.append(where); + if (safeQuery.getCurrency() != null && !safeQuery.getCurrency().trim().isEmpty()) { + String currency = safeQuery.getCurrency().trim().toUpperCase(Locale.ENGLISH); + if (!Arrays.asList("USDT", "TRX").contains(currency)) { + throw new CustomException("币种仅支持 USDT、TRX"); + } + safeQuery.setCurrency(currency); } - Long result = jdbcTemplate.queryForObject(stringBuffer.toString(), Long.class); - return result; - } - - public List countByGroupBy(String select, String where, String groupby, Class tClass) { - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append("select "); - stringBuffer.append(select); - stringBuffer.append(" from "); - stringBuffer.append(" apps_balance_ledger "); - if (StringUtils.isNotBlank(where)) { - stringBuffer.append(" where "); - stringBuffer.append(where); + if (isUser) { + safeQuery.setUserId(SecurityUtils.getUserId()); } - stringBuffer.append(" group by "); - stringBuffer.append(groupby); - List result = jdbcTemplate.queryForList(stringBuffer.toString()); - List tList = JSONArray.parseArray(JSONArray.toJSONString(result), tClass); - return tList; + return new WalletLedgerStatisticsVo( + appsBalanceLedgerMapper.selectStatisticsSummary(safeQuery), + appsBalanceLedgerMapper.selectStatisticsTrend(safeQuery)); } /** * 查询应用账面余额流水 @@ -175,6 +156,9 @@ public class AppsBalanceLedgerServiceImpl extends ServiceImpl list= getByIds(Arrays.asList(ids),false,AppsBalanceLedgerPlus::getUserId,AppsBalanceLedgerPlus::getId); - checkUserPlus(list); - } - return appsBalanceLedgerMapper.deleteAppsBalanceLedgerByIds(ids); - } - - /** - * 删除应用账面余额流水信息 - * - * @param id 应用账面余额流水ID - * @return 结果 - */ - @Override - public int deleteAppsBalanceLedgerById(Long id,boolean isUser) - { - if(isUser){ - AppsBalanceLedgerPlus vo = getById(id,AppsBalanceLedgerPlus::getUserId,AppsBalanceLedgerPlus::getId); - checkUser(vo); - } - return appsBalanceLedgerMapper.deleteAppsBalanceLedgerById(id); - } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AppsBalanceLedgerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppsBalanceLedgerMapper.xml index 1f1ed0f..c4f5b9b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AppsBalanceLedgerMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AppsBalanceLedgerMapper.xml @@ -62,7 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and operator_id = #{operatorId} and request_id = #{requestId} and created_at = #{createdAt} + and created_at >= #{params.beginTime} + and created_at <= #{params.endTime} + order by created_at desc, id desc + select currency, + coalesce(sum(case when direction = 1 then amount else 0 end), 0) as incomeAmount, + coalesce(sum(case when direction = 2 then amount else 0 end), 0) as expenseAmount, + coalesce(sum(case when direction = 1 then amount else -amount end), 0) as netAmount, + count(1) as count + from apps_balance_ledger + where + group by currency + order by currency + + + + update apps_balance_ledger @@ -167,4 +224,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml index 8576373..f49b120 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AppsMapper.xml @@ -74,6 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} and deleted_at is null for update + + update apps + set usdt_balance = #{usdtBalance}, trx_balance = #{trxBalance}, updated_at = #{updatedAt} + where id = #{id} and deleted_at is null + + update apps set public_key = #{publicKey}, private_key = #{privateKey}, updated_at = #{updatedAt} diff --git a/sql/apps_balance_ledger_indexes.sql b/sql/apps_balance_ledger_indexes.sql new file mode 100644 index 0000000..e87a55e --- /dev/null +++ b/sql/apps_balance_ledger_indexes.sql @@ -0,0 +1,13 @@ +-- 应用流水金额精度、幂等与报表索引。 +-- 执行前请通过 SHOW INDEX 检查重复幂等键和已有等价索引。 +ALTER TABLE `apps_balance_ledger` + MODIFY COLUMN `amount` DECIMAL(30,6) NOT NULL COMMENT '变动金额,始终为正数', + MODIFY COLUMN `balance_before` DECIMAL(30,6) NULL COMMENT '变动前余额', + MODIFY COLUMN `balance_after` DECIMAL(30,6) NULL COMMENT '变动后余额', + MODIFY COLUMN `available_before` DECIMAL(30,6) NULL COMMENT '变动前可用余额', + MODIFY COLUMN `available_after` DECIMAL(30,6) NULL COMMENT '变动后可用余额', + MODIFY COLUMN `frozen_before` DECIMAL(30,6) NULL COMMENT '变动前冻结余额', + MODIFY COLUMN `frozen_after` DECIMAL(30,6) NULL COMMENT '变动后冻结余额', + ADD UNIQUE KEY `uk_apps_ledger_idempotency` (`idempotency_key`), + ADD KEY `idx_apps_ledger_app_time` (`app_id`, `created_at`), + ADD KEY `idx_apps_ledger_user_time` (`user_id`, `created_at`);