删除旧 PayoutOrderController,功能统一到 [UsdtPayoutOrderController.java (line 23)](D:/myprojects/usdt/myEpusdt/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtPayoutOrderController.java:23)。
删除旧 system/payout 页面及 API。 管理员和商户页面统一使用共享组件 [PayoutOrderView.vue](D:/myprojects/usdt/usdt-ui/src/views/system/usdtPayoutOrder/components/PayoutOrderView.vue)。 管理员支持查询、统计、详情、导出、审核、密码广播和失败重试。 商户仅支持查询、统计和详情,无增删改、审核及执行权限。 增加状态统计、完成 USDT/TRX 金额、手续费汇总。 增加应用、用户、订单号、币种、状态、时间范围等查询条件。 后端关联返回应用名称和用户名。 通用新增、修改、删除接口已移除,防止绕过冻结余额和审核状态机。 更新 [usdt_payout_menu.sql](D:/myprojects/usdt/myEpusdt/sql/usdt_payout_menu.sql),可幂等迁移旧 system:payout:* 权限。
This commit is contained in:
1 parent
1eca7a77bc
commit
c58e55a2e1
9 files changed
+195
-227
No files matched your search
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -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; }
|
||||
}
|
||||
Reference in new issue
Block a user