From c58e55a2e1fbee6c8d30cbc6655145f4ed337e29 Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sat, 17 Oct 2026 12:43:47 -0400 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A7=20PayoutOrderContro?= =?UTF-8?q?ller=EF=BC=8C=E5=8A=9F=E8=83=BD=E7=BB=9F=E4=B8=80=E5=88=B0=20[U?= =?UTF-8?q?sdtPayoutOrderController.java=20(line=2023)](D:/myprojects/usdt?= =?UTF-8?q?/myEpusdt/ruoyi-system/src/main/java/com/ruoyi/system/controlle?= =?UTF-8?q?r/UsdtPayoutOrderController.java:23)=E3=80=82=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=A7=20system/payout=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=8F=8A=20API=E3=80=82=20=E7=AE=A1=E7=90=86=E5=91=98=E5=92=8C?= =?UTF-8?q?=E5=95=86=E6=88=B7=E9=A1=B5=E9=9D=A2=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=85=B1=E4=BA=AB=E7=BB=84=E4=BB=B6=20[PayoutOrderVie?= =?UTF-8?q?w.vue](D:/myprojects/usdt/usdt-ui/src/views/system/usdtPayoutOr?= =?UTF-8?q?der/components/PayoutOrderView.vue)=E3=80=82=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=94=AF=E6=8C=81=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E3=80=81=E8=AF=A6=E6=83=85=E3=80=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E3=80=81=E5=AE=A1=E6=A0=B8=E3=80=81=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=B9=BF=E6=92=AD=E5=92=8C=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E3=80=82=20=E5=95=86=E6=88=B7=E4=BB=85=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E7=BB=9F=E8=AE=A1=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E6=97=A0=E5=A2=9E=E5=88=A0=E6=94=B9=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8F=8A=E6=89=A7=E8=A1=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E3=80=82=20=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E5=AE=8C=E6=88=90=20USDT/TRX=20=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E3=80=81=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E3=80=82=20=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E3=80=81=E8=AE=A2=E5=8D=95=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E5=B8=81=E7=A7=8D=E3=80=81=E7=8A=B6=E6=80=81=E3=80=81=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=89=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=80=82=20=E5=90=8E=E7=AB=AF=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0=E5=92=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E3=80=82=20=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E5=B7=B2=E7=A7=BB=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E7=BB=95=E8=BF=87=E5=86=BB=E7=BB=93=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E5=92=8C=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E6=9C=BA?= =?UTF-8?q?=E3=80=82=20=E6=9B=B4=E6=96=B0=20[usdt=5Fpayout=5Fmenu.sql](D:/?= =?UTF-8?q?myprojects/usdt/myEpusdt/sql/usdt=5Fpayout=5Fmenu.sql)=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E5=B9=82=E7=AD=89=E8=BF=81=E7=A7=BB=E6=97=A7=20system?= =?UTF-8?q?:payout:*=20=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayoutOrderController.java | 64 ------- .../controller/UsdtPayoutOrderController.java | 172 +++++------------- .../ruoyi/system/domain/UsdtPayoutOrder.java | 12 ++ .../domain/vo/PayoutOrderStatistics.java | 38 ++++ .../system/mapper/UsdtPayoutOrderMapper.java | 3 + .../service/IUsdtPayoutOrderService.java | 3 + .../impl/UsdtPayoutOrderServiceImpl.java | 18 +- .../mapper/system/UsdtPayoutOrderMapper.xml | 82 +++++---- sql/usdt_payout_menu.sql | 30 ++- 9 files changed, 195 insertions(+), 227 deletions(-) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/PayoutOrderController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PayoutOrderStatistics.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PayoutOrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/PayoutOrderController.java deleted file mode 100644 index 61bc019..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PayoutOrderController.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ruoyi.system.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.UsdtPayoutOrder; -import com.ruoyi.system.domain.UsdtPayoutOrderPlus; -import com.ruoyi.system.domain.dto.PayoutExecuteRequest; -import com.ruoyi.system.mapper.UsdtPayoutOrderMapper; -import com.ruoyi.system.service.PayoutProcessingService; -import com.ruoyi.system.service.TelegramAuditService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** 管理后台代付审核与执行接口。 */ -@RestController -@RequestMapping("/system/payout") -public class PayoutOrderController extends BaseController { - @Autowired - private UsdtPayoutOrderMapper mapper; - @Autowired - private PayoutProcessingService processingService; - @Autowired - private TelegramAuditService telegramAuditService; - - @PreAuthorize("@ss.hasPermi('system:payout:list')") - @GetMapping("/list") - public TableDataInfo list(UsdtPayoutOrder query) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .isNull(UsdtPayoutOrderPlus::getDeletedAt) - .orderByDesc(UsdtPayoutOrderPlus::getId); - if (query.getAppId() != null) { - wrapper.eq(UsdtPayoutOrderPlus::getAppId, query.getAppId()); - } - if (query.getStatus() != null) { - wrapper.eq(UsdtPayoutOrderPlus::getStatus, query.getStatus()); - } - startPage(); - List rows = mapper.selectList(wrapper); - return getDataTable(rows); - } - - @PreAuthorize("@ss.hasPermi('system:payout:review')") - @PostMapping("/{id}/review") - public AjaxResult review(@PathVariable Long id, @RequestParam boolean approved, - @RequestParam(required = false) String remark) { - telegramAuditService.reviewPayoutFromBackoffice(id, approved, remark); - return AjaxResult.success(); - } - - @PreAuthorize("@ss.hasPermi('system:payout:execute')") - @PostMapping("/{id}/execute") - public AjaxResult execute(@PathVariable Long id, @RequestBody PayoutExecuteRequest request) { - try { - return AjaxResult.success(processingService.execute(id, request.getConfigurationPassword())); - } finally { - request.setConfigurationPassword(null); - } - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtPayoutOrderController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtPayoutOrderController.java index fcb0402..eb53d0e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtPayoutOrderController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtPayoutOrderController.java @@ -5,164 +5,90 @@ 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.UsdtPayoutOrder; -import com.ruoyi.system.domain.UsdtPayoutOrderPlus; +import com.ruoyi.system.domain.dto.PayoutExecuteRequest; import com.ruoyi.system.service.IUsdtPayoutOrderService; +import com.ruoyi.system.service.PayoutProcessingService; +import com.ruoyi.system.service.TelegramAuditService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * 应用代付订单Controller - * - * @author luqj - * @date 2026-10-17 - */ +/** 代付订单只读查询、统计、审核和链上执行接口。 */ @RestController @RequestMapping("/system/usdtPayoutOrder") public class UsdtPayoutOrderController extends BaseController { @Autowired - private IUsdtPayoutOrderService usdtPayoutOrderService; + private IUsdtPayoutOrderService payoutOrderService; + @Autowired + private PayoutProcessingService processingService; + @Autowired + private TelegramAuditService telegramAuditService; - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:getByIds')") - @PostMapping("/getByIds") - public AjaxResult getByIds(@RequestBody Ids ids) { - List list = usdtPayoutOrderService.getByIds(ids.getLongIds(), false, UsdtPayoutOrderPlus::getTradeId, UsdtPayoutOrderPlus::getId); - return AjaxResult.success(list); - } - - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-getByIds')") - @PostMapping("/user/getByIds") - public AjaxResult userGetByIds(@RequestBody Ids ids) { - List list = usdtPayoutOrderService.getByIds(ids.getLongIds(), true, UsdtPayoutOrderPlus::getUserId, UsdtPayoutOrderPlus::getTradeId, UsdtPayoutOrderPlus::getId); - return AjaxResult.success(list); - } - - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:select')") - @GetMapping("/select") - public AjaxResult select(String keyword) { - List list = usdtPayoutOrderService.select(keyword, false); - return AjaxResult.success(list); - } - - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-select')") - @GetMapping("/user/select") - public AjaxResult userSelect(String keyword) { - List list = usdtPayoutOrderService.select(keyword, true); - return AjaxResult.success(list); - } - - /** - * 查询应用代付订单列表 - */ @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:list')") @GetMapping("/list") - public TableDataInfo list(UsdtPayoutOrder usdtPayoutOrder) { + public TableDataInfo list(UsdtPayoutOrder query) { startPage(); - List list = usdtPayoutOrderService.selectUsdtPayoutOrderList(usdtPayoutOrder, false); - return getDataTable(list); + return getDataTable(payoutOrderService.selectUsdtPayoutOrderList(query, false)); } - /** - * 查询应用代付订单列表 - */ @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-list')") @GetMapping("/user/list") - public TableDataInfo userList(UsdtPayoutOrder usdtPayoutOrder) { + public TableDataInfo userList(UsdtPayoutOrder query) { startPage(); - List list = usdtPayoutOrderService.selectUsdtPayoutOrderList(usdtPayoutOrder, true); - return getDataTable(list); + return getDataTable(payoutOrderService.selectUsdtPayoutOrderList(query, true)); } - /** - * 导出应用代付订单列表 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:export')") - @Log(title = "应用代付订单", businessType = BusinessType.EXPORT) - @GetMapping("/export") - public AjaxResult export(UsdtPayoutOrder usdtPayoutOrder) { - List list = usdtPayoutOrderService.selectUsdtPayoutOrderList(usdtPayoutOrder, false); - ExcelUtil util = new ExcelUtil(UsdtPayoutOrder.class); - return util.exportExcel(list, "usdtPayoutOrder"); + @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:list')") + @GetMapping("/statistics") + public AjaxResult statistics(UsdtPayoutOrder query) { + return AjaxResult.success(payoutOrderService.selectStatistics(query, false)); + } + + @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-list')") + @GetMapping("/user/statistics") + public AjaxResult userStatistics(UsdtPayoutOrder query) { + return AjaxResult.success(payoutOrderService.selectStatistics(query, true)); } - /** - * 获取应用代付订单详细信息 - */ @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:query')") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return AjaxResult.success(usdtPayoutOrderService.selectUsdtPayoutOrderById(id, false)); + @GetMapping("/{id}") + public AjaxResult getInfo(@PathVariable Long id) { + return AjaxResult.success(payoutOrderService.selectUsdtPayoutOrderById(id, false)); } - /** - * 获取应用代付订单详细信息 - */ @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-query')") - @GetMapping(value = "/user/{id}") - public AjaxResult userGetInfo(@PathVariable("id") Long id) { - return AjaxResult.success(usdtPayoutOrderService.selectUsdtPayoutOrderById(id, true)); + @GetMapping("/user/{id}") + public AjaxResult userGetInfo(@PathVariable Long id) { + return AjaxResult.success(payoutOrderService.selectUsdtPayoutOrderById(id, true)); } - /** - * 新增应用代付订单 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:add')") - @Log(title = "应用代付订单", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody UsdtPayoutOrder usdtPayoutOrder) { - return toAjax(usdtPayoutOrderService.insertUsdtPayoutOrder(usdtPayoutOrder, false)); + @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:export')") + @Log(title = "代付订单", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(UsdtPayoutOrder query) { + List list = payoutOrderService.selectUsdtPayoutOrderList(query, false); + return new ExcelUtil(UsdtPayoutOrder.class).exportExcel(list, "代付订单"); } - /** - * 新增应用代付订单 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-add')") - @Log(title = "应用代付订单", businessType = BusinessType.INSERT) - @PostMapping("/user") - public AjaxResult userAdd(@RequestBody UsdtPayoutOrder usdtPayoutOrder) { - return toAjax(usdtPayoutOrderService.insertUsdtPayoutOrder(usdtPayoutOrder, true)); + @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:review')") + @PostMapping("/{id}/review") + public AjaxResult review(@PathVariable Long id, @RequestParam boolean approved, + @RequestParam(required = false) String remark) { + telegramAuditService.reviewPayoutFromBackoffice(id, approved, remark); + return AjaxResult.success(); } - /** - * 修改应用代付订单 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:edit')") - @Log(title = "应用代付订单", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody UsdtPayoutOrder usdtPayoutOrder) { - return toAjax(usdtPayoutOrderService.updateUsdtPayoutOrder(usdtPayoutOrder, false)); - } - - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-edit')") - @Log(title = "应用代付订单", businessType = BusinessType.UPDATE) - @PutMapping("/user") - public AjaxResult userEdit(@RequestBody UsdtPayoutOrder usdtPayoutOrder) { - return toAjax(usdtPayoutOrderService.updateUsdtPayoutOrder(usdtPayoutOrder, true)); - } - - /** - * 删除应用代付订单 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:remove')") - @Log(title = "应用代付订单", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(usdtPayoutOrderService.deleteUsdtPayoutOrderByIds(ids, false)); - } - - /** - * 删除应用代付订单 - */ - @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:user-remove')") - @Log(title = "应用代付订单", businessType = BusinessType.DELETE) - @DeleteMapping("/user/{ids}") - public AjaxResult userRemove(@PathVariable Long[] ids) { - return toAjax(usdtPayoutOrderService.deleteUsdtPayoutOrderByIds(ids, true)); + @PreAuthorize("@ss.hasPermi('system:usdtPayoutOrder:execute')") + @PostMapping("/{id}/execute") + public AjaxResult execute(@PathVariable Long id, @RequestBody PayoutExecuteRequest request) { + try { + return AjaxResult.success(processingService.execute(id, request.getConfigurationPassword())); + } finally { + request.setConfigurationPassword(null); + } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtPayoutOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtPayoutOrder.java index ed2be31..7b1e1cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtPayoutOrder.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtPayoutOrder.java @@ -131,6 +131,12 @@ public class UsdtPayoutOrder extends BaseEntity @Excel(name = "0未确认 1已确认", width = 30, dateFormat = "yyyy-MM-dd") private Date deletedAt; + /** 关联应用名称,仅用于查询展示。 */ + private String appName; + + /** 应用所属用户名称,仅用于查询展示。 */ + private String userName; + public void setId(Long id) { this.id = id; @@ -374,6 +380,10 @@ public class UsdtPayoutOrder extends BaseEntity { return deletedAt; } + public String getAppName() { return appName; } + public void setAppName(String appName) { this.appName = appName; } + public String getUserName() { return userName; } + public void setUserName(String userName) { this.userName = userName; } @Override public String toString() { @@ -405,6 +415,8 @@ public class UsdtPayoutOrder extends BaseEntity .append("createdAt", getCreatedAt()) .append("updatedAt", getUpdatedAt()) .append("deletedAt", getDeletedAt()) + .append("appName", getAppName()) + .append("userName", getUserName()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PayoutOrderStatistics.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PayoutOrderStatistics.java new file mode 100644 index 0000000..480eda5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PayoutOrderStatistics.java @@ -0,0 +1,38 @@ +package com.ruoyi.system.domain.vo; + +import java.math.BigDecimal; + +/** 代付订单查询条件范围内的状态和金额汇总。 */ +public class PayoutOrderStatistics { + private Long totalCount; + private Long pendingAuditCount; + private Long pendingExecuteCount; + private Long confirmingCount; + private Long completedCount; + private Long rejectedCount; + private Long failedCount; + private BigDecimal completedUsdtAmount; + private BigDecimal completedTrxAmount; + private BigDecimal feeAmount; + + public Long getTotalCount() { return totalCount; } + public void setTotalCount(Long totalCount) { this.totalCount = totalCount; } + public Long getPendingAuditCount() { return pendingAuditCount; } + public void setPendingAuditCount(Long pendingAuditCount) { this.pendingAuditCount = pendingAuditCount; } + public Long getPendingExecuteCount() { return pendingExecuteCount; } + public void setPendingExecuteCount(Long pendingExecuteCount) { this.pendingExecuteCount = pendingExecuteCount; } + public Long getConfirmingCount() { return confirmingCount; } + public void setConfirmingCount(Long confirmingCount) { this.confirmingCount = confirmingCount; } + public Long getCompletedCount() { return completedCount; } + public void setCompletedCount(Long completedCount) { this.completedCount = completedCount; } + public Long getRejectedCount() { return rejectedCount; } + public void setRejectedCount(Long rejectedCount) { this.rejectedCount = rejectedCount; } + public Long getFailedCount() { return failedCount; } + public void setFailedCount(Long failedCount) { this.failedCount = failedCount; } + public BigDecimal getCompletedUsdtAmount() { return completedUsdtAmount; } + public void setCompletedUsdtAmount(BigDecimal completedUsdtAmount) { this.completedUsdtAmount = completedUsdtAmount; } + public BigDecimal getCompletedTrxAmount() { return completedTrxAmount; } + public void setCompletedTrxAmount(BigDecimal completedTrxAmount) { this.completedTrxAmount = completedTrxAmount; } + public BigDecimal getFeeAmount() { return feeAmount; } + public void setFeeAmount(BigDecimal feeAmount) { this.feeAmount = feeAmount; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtPayoutOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtPayoutOrderMapper.java index d47b44f..532eeb4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtPayoutOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtPayoutOrderMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.UsdtPayoutOrder; import com.ruoyi.system.domain.UsdtPayoutOrderPlus; +import com.ruoyi.system.domain.vo.PayoutOrderStatistics; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -85,6 +86,8 @@ public interface UsdtPayoutOrderMapper extends BaseMapper { */ public List selectUsdtPayoutOrderList(UsdtPayoutOrder usdtPayoutOrder); + PayoutOrderStatistics selectStatistics(UsdtPayoutOrder usdtPayoutOrder); + /** * 新增应用代付订单 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtPayoutOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtPayoutOrderService.java index bcb6c7a..9a8c60a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtPayoutOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtPayoutOrderService.java @@ -6,6 +6,7 @@ import com.ruoyi.system.domain.UsdtPayoutOrderPlus; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.system.domain.vo.PayoutOrderStatistics; /** * 应用代付订单Service接口 * @@ -32,6 +33,8 @@ public interface IUsdtPayoutOrderService extends IService */ public List selectUsdtPayoutOrderList(UsdtPayoutOrder usdtPayoutOrder,boolean isUser); + PayoutOrderStatistics selectStatistics(UsdtPayoutOrder usdtPayoutOrder, boolean isUser); + /** * 新增应用代付订单 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtPayoutOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtPayoutOrderServiceImpl.java index 2f5bafe..6fe6c15 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtPayoutOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtPayoutOrderServiceImpl.java @@ -20,6 +20,8 @@ import com.ruoyi.system.service.IUsdtPayoutOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.system.domain.vo.PayoutOrderStatistics; +import com.ruoyi.common.exception.CustomException; /** * 应用代付订单Service业务层处理 * @@ -67,8 +69,11 @@ public class UsdtPayoutOrderServiceImpl extends ServiceImpl + + - select id, trade_id, order_id, app_id, user_id, currency, amount, fee_currency, fee_amount, to_address, status, audit_type, auditor_id, audit_remark, audited_at, block_transaction_id, execute_error, execute_count, executed_at, confirmed_at, notify_url, redirect_url, callback_num, callback_confirm, created_at, updated_at, deleted_at from usdt_payout_order + select p.id, p.trade_id, p.order_id, p.app_id, p.user_id, p.currency, p.amount, + p.fee_currency, p.fee_amount, p.to_address, p.status, p.audit_type, + p.auditor_id, p.audit_remark, p.audited_at, p.block_transaction_id, + p.execute_error, p.execute_count, p.executed_at, p.confirmed_at, + p.notify_url, p.redirect_url, p.callback_num, p.callback_confirm, + p.created_at, p.updated_at, p.deleted_at, + a.name as app_name, u.user_name + from usdt_payout_order p + left join apps a on a.id = p.app_id + left join sys_user u on u.user_id = p.user_id + + + + p.deleted_at is null + and p.trade_id like concat('%', #{tradeId}, '%') + and p.order_id like concat('%', #{orderId}, '%') + and p.app_id = #{appId} + and p.user_id = #{userId} + and p.currency = #{currency} + and p.to_address like concat('%', #{toAddress}, '%') + and p.status = #{status} + and p.audit_type = #{auditType} + and p.callback_confirm = #{callbackConfirm} + + and p.created_at = ]]> #{params.beginTime} + + + and p.created_at date_add(#{params.endTime}, interval 1 day) + + + @@ -178,4 +198,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/sql/usdt_payout_menu.sql b/sql/usdt_payout_menu.sql index eaf89f0..120cf5e 100644 --- a/sql/usdt_payout_menu.sql +++ b/sql/usdt_payout_menu.sql @@ -1,26 +1,40 @@ -- 代付订单后台菜单和权限。父菜单名称请按实际部署环境调整。 +-- 先迁移旧菜单及按钮权限,避免新旧权限并存时重复插入菜单。 +UPDATE sys_menu +SET path = 'usdtPayoutOrder', component = 'system/usdtPayoutOrder/index', + perms = 'system:usdtPayoutOrder:list', update_by = 'admin', update_time = NOW() +WHERE perms = 'system:payout:list'; + +UPDATE sys_menu +SET perms = 'system:usdtPayoutOrder:review', update_by = 'admin', update_time = NOW() +WHERE perms = 'system:payout:review'; + +UPDATE sys_menu +SET perms = 'system:usdtPayoutOrder:execute', update_by = 'admin', update_time = NOW() +WHERE perms = 'system:payout:execute'; + SET @parent_id = (SELECT menu_id FROM sys_menu WHERE menu_name = 'USDT管理' AND menu_type = 'M' LIMIT 1); INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) -SELECT '代付订单', @parent_id, 8, 'payout', 'system/payout/index', 1, 0, 'C', - '0', '0', 'system:payout:list', 'money', 'admin', NOW() +SELECT '代付订单', @parent_id, 8, 'usdtPayoutOrder', 'system/usdtPayoutOrder/index', 1, 0, 'C', + '0', '0', 'system:usdtPayoutOrder:list', 'money', 'admin', NOW() WHERE @parent_id IS NOT NULL - AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:payout:list'); + AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:usdtPayoutOrder:list'); -SET @payout_menu_id = (SELECT menu_id FROM sys_menu WHERE perms = 'system:payout:list' LIMIT 1); +SET @payout_menu_id = (SELECT menu_id FROM sys_menu WHERE perms = 'system:usdtPayoutOrder:list' LIMIT 1); INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) SELECT '代付审核', @payout_menu_id, 1, '#', '', 1, 0, 'F', - '0', '0', 'system:payout:review', '#', 'admin', NOW() + '0', '0', 'system:usdtPayoutOrder:review', '#', 'admin', NOW() WHERE @payout_menu_id IS NOT NULL - AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:payout:review'); + AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:usdtPayoutOrder:review'); INSERT INTO sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) SELECT '代付执行', @payout_menu_id, 2, '#', '', 1, 0, 'F', - '0', '0', 'system:payout:execute', '#', 'admin', NOW() + '0', '0', 'system:usdtPayoutOrder:execute', '#', 'admin', NOW() WHERE @payout_menu_id IS NOT NULL - AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:payout:execute'); + AND NOT EXISTS (SELECT 1 FROM sys_menu WHERE perms = 'system:usdtPayoutOrder:execute');