diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtOrdersController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtOrdersController.java index f099895..5ed7803 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtOrdersController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtOrdersController.java @@ -29,6 +29,23 @@ public class UsdtOrdersController extends BaseController { @Autowired private IUsdtOrdersService usdtOrdersService; + @Autowired + private com.ruoyi.system.mapper.UsdtOrdersMapper usdtOrdersMapper; + + /** 统计范围与管理列表一致,复用查询权限,不允许客户端控制商户归属。 */ + @PreAuthorize("@ss.hasPermi('system:usdt_orders:list')") + @GetMapping("/statistics") + public AjaxResult statistics(UsdtOrders filter) { + return AjaxResult.success(usdtOrdersMapper.selectOrderStatistics(filter)); + } + + @PreAuthorize("@ss.hasPermi('system:usdt_orders:user-list')") + @GetMapping("/user/statistics") + public AjaxResult userStatistics(UsdtOrders filter) { + filter.setUserId(com.ruoyi.common.utils.SecurityUtils.getUserId()); + return AjaxResult.success(usdtOrdersMapper.selectOrderStatistics(filter)); + } + @PreAuthorize("@ss.hasPermi('system:usdt_orders:getByIds')") @PostMapping("/getByIds") public AjaxResult getByIds(@RequestBody Ids ids) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtOrdersMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtOrdersMapper.java index acbe4bf..84e0e63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtOrdersMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtOrdersMapper.java @@ -15,6 +15,9 @@ import com.ruoyi.system.domain.UsdtOrdersPlus; */ public interface UsdtOrdersMapper extends BaseMapper { + /** 按列表相同条件聚合全部订单,金额由数据库以 DECIMAL 计算,不受分页影响。 */ + java.util.Map selectOrderStatistics(UsdtOrders filter); + UsdtOrdersPlus selectByIdForUpdate(@Param("id") Long id); int countByTransactionId(@Param("transactionId") String transactionId, diff --git a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml index dd306b4..36d81e2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml @@ -34,9 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from orders - + + + order by created_at desc, id desc + + +