新增代付订单 SQL、实体和 Mapper。
开放接口增加 /api/v1/payout/create 和 /api/v1/payout/query。 pay_usdt_num 按 TRX 手续费处理。 USDT 代付冻结 USDT 本金和 TRX 手续费。 TRX 代付冻结 TRX 本金与手续费总额。 创建时锁定 apps 行,避免与代收入账并发覆盖余额。 支持 appId + order_id 幂等。 审核通过进入待执行,拒绝时原路解冻。 已提供 [usdt_payout_order.sql](D:/myprojects/usdt/myEpusdt/sql/usdt_payout_order.sql)。 JDK 8 多模块编译通过。
This commit is contained in:
1 parent
14b3093177
commit
9c879c1312
7 files changed
+179
No files matched your search
@@ -0,0 +1,20 @@
|
||||
package com.ruoyi.system.controller;
|
||||
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.system.domain.UsdtPayoutOrder;
|
||||
import com.ruoyi.system.domain.dto.EncryptedRequest;
|
||||
import com.ruoyi.system.domain.vo.DecryptResult;
|
||||
import com.ruoyi.system.service.ApiSecurityService;
|
||||
import com.ruoyi.system.service.PayoutOrderService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/** 代付开放接口,不依赖浏览器会话或请求上下文。 */
|
||||
@RestController @RequestMapping("/api/v1/payout")
|
||||
public class PayoutOpenApiController {
|
||||
@Autowired private ApiSecurityService security; @Autowired private PayoutOrderService service;
|
||||
@PostMapping("/create") public AjaxResult create(@RequestBody EncryptedRequest request){return AjaxResult.success(view(service.create(security.decryptAndVerify(request)),null));}
|
||||
@PostMapping("/query") public AjaxResult query(@RequestBody EncryptedRequest request){DecryptResult d=security.decryptAndVerify(request);String orderId=parseOrderId(d.getPlainData());UsdtPayoutOrder o=service.find(d.getAppId(),orderId);return o==null?AjaxResult.error("代付订单不存在"):AjaxResult.success(view(o,null));}
|
||||
private java.util.Map<String,Object> view(UsdtPayoutOrder o,String redirect){java.util.Map<String,Object> m=new java.util.LinkedHashMap<>();m.put("order_id",o.getOrderId());m.put("trade_id",o.getTradeId());m.put("currency",o.getCurrency());m.put("amount",o.getAmount());m.put("fee_currency",o.getFeeCurrency());m.put("fee_amount",o.getFeeAmount());m.put("to_address",o.getToAddress());m.put("status",o.getStatus());m.put("transaction_id",o.getBlockTransactionId());if(redirect!=null)m.put("redirect_url",redirect);return m;}
|
||||
private String parseOrderId(String s){if(s==null||!s.startsWith("order_id=")||!s.endsWith("&"))throw new com.ruoyi.common.exception.CustomException("业务参数格式错误");return s.substring(9,s.length()-1);}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/** 应用代付订单。 */
|
||||
@TableName("usdt_payout_order")
|
||||
public class UsdtPayoutOrder implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Long id; private String tradeId; private String orderId; private Long appId; private Long userId;
|
||||
private String currency; private BigDecimal amount; private String feeCurrency; private BigDecimal feeAmount;
|
||||
private String toAddress; private Integer status; private String auditType; private String auditorId;
|
||||
private String auditRemark; private Date auditedAt; private String blockTransactionId; private String executeError;
|
||||
private Integer executeCount; private Date executedAt; private Date confirmedAt; private String notifyUrl;
|
||||
private String redirectUrl; private Integer callbackNum; private Integer callbackConfirm;
|
||||
private Date createdAt; private Date updatedAt; private Date deletedAt;
|
||||
public Long getId(){return id;} public void setId(Long v){id=v;} public String getTradeId(){return tradeId;} public void setTradeId(String v){tradeId=v;}
|
||||
public String getOrderId(){return orderId;} public void setOrderId(String v){orderId=v;} public Long getAppId(){return appId;} public void setAppId(Long v){appId=v;}
|
||||
public Long getUserId(){return userId;} public void setUserId(Long v){userId=v;} public String getCurrency(){return currency;} public void setCurrency(String v){currency=v;}
|
||||
public BigDecimal getAmount(){return amount;} public void setAmount(BigDecimal v){amount=v;} public String getFeeCurrency(){return feeCurrency;} public void setFeeCurrency(String v){feeCurrency=v;}
|
||||
public BigDecimal getFeeAmount(){return feeAmount;} public void setFeeAmount(BigDecimal v){feeAmount=v;} public String getToAddress(){return toAddress;} public void setToAddress(String v){toAddress=v;}
|
||||
public Integer getStatus(){return status;} public void setStatus(Integer v){status=v;} public String getAuditType(){return auditType;} public void setAuditType(String v){auditType=v;}
|
||||
public String getAuditorId(){return auditorId;} public void setAuditorId(String v){auditorId=v;} public String getAuditRemark(){return auditRemark;} public void setAuditRemark(String v){auditRemark=v;}
|
||||
public Date getAuditedAt(){return auditedAt;} public void setAuditedAt(Date v){auditedAt=v;} public String getBlockTransactionId(){return blockTransactionId;} public void setBlockTransactionId(String v){blockTransactionId=v;}
|
||||
public String getExecuteError(){return executeError;} public void setExecuteError(String v){executeError=v;} public Integer getExecuteCount(){return executeCount;} public void setExecuteCount(Integer v){executeCount=v;}
|
||||
public Date getExecutedAt(){return executedAt;} public void setExecutedAt(Date v){executedAt=v;} public Date getConfirmedAt(){return confirmedAt;} public void setConfirmedAt(Date v){confirmedAt=v;}
|
||||
public String getNotifyUrl(){return notifyUrl;} public void setNotifyUrl(String v){notifyUrl=v;} public String getRedirectUrl(){return redirectUrl;} public void setRedirectUrl(String v){redirectUrl=v;}
|
||||
public Integer getCallbackNum(){return callbackNum;} public void setCallbackNum(Integer v){callbackNum=v;} public Integer getCallbackConfirm(){return callbackConfirm;} public void setCallbackConfirm(Integer v){callbackConfirm=v;}
|
||||
public Date getCreatedAt(){return createdAt;} public void setCreatedAt(Date v){createdAt=v;} public Date getUpdatedAt(){return updatedAt;} public void setUpdatedAt(Date v){updatedAt=v;} public Date getDeletedAt(){return deletedAt;} public void setDeletedAt(Date v){deletedAt=v;}
|
||||
}
|
||||
@@ -30,6 +30,14 @@ public interface AppsMapper extends BaseMapper<AppsPlus>
|
||||
@Param("trxBalance") java.math.BigDecimal trxBalance,
|
||||
@Param("updatedAt") java.util.Date updatedAt);
|
||||
|
||||
/** 在已持有应用行锁时原子写入代付可用及冻结余额。 */
|
||||
int updatePayoutBalances(@Param("id") Long id,
|
||||
@Param("usdtBalance") java.math.BigDecimal usdtBalance,
|
||||
@Param("trxBalance") java.math.BigDecimal trxBalance,
|
||||
@Param("usdtFrozenBalance") java.math.BigDecimal usdtFrozenBalance,
|
||||
@Param("trxFrozenBalance") java.math.BigDecimal trxFrozenBalance,
|
||||
@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);
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.ruoyi.system.domain.UsdtPayoutOrder;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
public interface UsdtPayoutOrderMapper extends BaseMapper<UsdtPayoutOrder> {
|
||||
@Select("select * from usdt_payout_order where id=#{id} and deleted_at is null for update")
|
||||
UsdtPayoutOrder selectByIdForUpdate(@Param("id") Long id);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.ruoyi.common.exception.CustomException;
|
||||
import com.ruoyi.system.domain.Apps;
|
||||
import com.ruoyi.system.domain.UsdtConfigPlus;
|
||||
import com.ruoyi.system.domain.UsdtPayoutOrder;
|
||||
import com.ruoyi.system.domain.vo.DecryptResult;
|
||||
import com.ruoyi.system.mapper.AppsMapper;
|
||||
import com.ruoyi.system.mapper.UsdtConfigMapper;
|
||||
import com.ruoyi.system.mapper.UsdtPayoutOrderMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Date;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
|
||||
/** 代付创建、审核及余额冻结状态机;所有余额修改均先锁定应用行。 */
|
||||
@Service
|
||||
public class PayoutOrderService {
|
||||
public static final int PENDING_AUDIT=0, PENDING_EXECUTE=1, BROADCASTED=2,
|
||||
COMPLETED=3, REJECTED=4, EXECUTE_FAILED=5;
|
||||
@Autowired private AppsMapper appsMapper;
|
||||
@Autowired private UsdtConfigMapper configMapper;
|
||||
@Autowired private UsdtPayoutOrderMapper payoutMapper;
|
||||
|
||||
@Transactional(rollbackFor=Exception.class)
|
||||
public UsdtPayoutOrder create(DecryptResult request) {
|
||||
Map<String,String> p=parse(request.getPlainData());
|
||||
String orderId=required(p,"order_id"), currency=required(p,"currency").toUpperCase();
|
||||
String address=required(p,"to_address"), notifyUrl=required(p,"notify_url"), redirectUrl=trim(p.get("redirect_url"));
|
||||
if(!"USDT".equals(currency)&&!"TRX".equals(currency))throw new CustomException("currency仅支持USDT或TRX");
|
||||
if(!address.matches("T[1-9A-HJ-NP-Za-km-z]{33}"))throw new CustomException("收款地址格式错误");
|
||||
if(orderId.length()>64)throw new CustomException("order_id长度不能超过64");
|
||||
validateUrl(notifyUrl,true);validateUrl(redirectUrl,false);BigDecimal amount=amount(required(p,"amount"));
|
||||
Apps app=appsMapper.selectAppsByIdForUpdate(request.getAppId());
|
||||
if(app==null||!Integer.valueOf(1).equals(app.getStatus())||!Objects.equals(app.getUserId(),request.getUserId()))throw new CustomException("商户应用不可用");
|
||||
UsdtPayoutOrder old=find(app.getId(),orderId);if(old!=null)return old;
|
||||
UsdtConfigPlus cfg=configMapper.selectOne(new LambdaQueryWrapper<UsdtConfigPlus>().orderByAsc(UsdtConfigPlus::getId).last("limit 1"));
|
||||
BigDecimal fee=cfg==null||cfg.getPayUsdtNum()==null?BigDecimal.ZERO:cfg.getPayUsdtNum().setScale(6,RoundingMode.UNNECESSARY);
|
||||
if(fee.signum()<0)throw new CustomException("代付手续费配置不能小于0");
|
||||
BigDecimal ub=z(app.getUsdtBalance()),tb=z(app.getTrxBalance()),uf=z(app.getUsdtFrozenBalance()),tf=z(app.getTrxFrozenBalance());
|
||||
if("USDT".equals(currency)){if(ub.compareTo(amount)<0)throw new CustomException("USDT可用余额不足");if(tb.compareTo(fee)<0)throw new CustomException("TRX手续费余额不足");ub=ub.subtract(amount);uf=uf.add(amount);tb=tb.subtract(fee);tf=tf.add(fee);}
|
||||
else {BigDecimal total=amount.add(fee);if(tb.compareTo(total)<0)throw new CustomException("TRX可用余额不足");tb=tb.subtract(total);tf=tf.add(total);}
|
||||
Date now=new Date();if(appsMapper.updatePayoutBalances(app.getId(),ub,tb,uf,tf,now)!=1)throw new CustomException("冻结余额失败");
|
||||
UsdtPayoutOrder o=new UsdtPayoutOrder();o.setTradeId(UUID.randomUUID().toString().replace("-",""));o.setOrderId(orderId);o.setAppId(app.getId());o.setUserId(app.getUserId());o.setCurrency(currency);o.setAmount(amount);o.setFeeCurrency("TRX");o.setFeeAmount(fee);o.setToAddress(address);o.setStatus(PENDING_AUDIT);o.setNotifyUrl(notifyUrl);o.setRedirectUrl(redirectUrl);o.setCallbackNum(0);o.setCallbackConfirm(0);o.setExecuteCount(0);o.setCreatedAt(now);o.setUpdatedAt(now);payoutMapper.insert(o);return o;
|
||||
}
|
||||
public UsdtPayoutOrder find(Long appId,String orderId){return payoutMapper.selectOne(new LambdaQueryWrapper<UsdtPayoutOrder>().eq(UsdtPayoutOrder::getAppId,appId).eq(UsdtPayoutOrder::getOrderId,orderId).isNull(UsdtPayoutOrder::getDeletedAt).last("limit 1"));}
|
||||
@Transactional(rollbackFor=Exception.class)
|
||||
public void review(Long id,boolean approved,String channel,String reviewer,String remark){UsdtPayoutOrder probe=payoutMapper.selectById(id);if(probe==null)throw new CustomException("代付订单不存在");Apps app=appsMapper.selectAppsByIdForUpdate(probe.getAppId());UsdtPayoutOrder o=payoutMapper.selectByIdForUpdate(id);if(o==null||!Integer.valueOf(PENDING_AUDIT).equals(o.getStatus()))throw new CustomException("订单状态不允许审核");Date now=new Date();o.setAuditType(channel);o.setAuditorId(reviewer);o.setAuditRemark(remark);o.setAuditedAt(now);o.setUpdatedAt(now);if(approved)o.setStatus(PENDING_EXECUTE);else{unfreeze(app,o);o.setStatus(REJECTED);}payoutMapper.updateById(o);}
|
||||
private void unfreeze(Apps a,UsdtPayoutOrder o){BigDecimal ub=z(a.getUsdtBalance()),tb=z(a.getTrxBalance()),uf=z(a.getUsdtFrozenBalance()),tf=z(a.getTrxFrozenBalance());if("USDT".equals(o.getCurrency())){ub=ub.add(o.getAmount());uf=uf.subtract(o.getAmount());}else{tb=tb.add(o.getAmount());tf=tf.subtract(o.getAmount());}tb=tb.add(o.getFeeAmount());tf=tf.subtract(o.getFeeAmount());appsMapper.updatePayoutBalances(a.getId(),ub,tb,uf,tf,new Date());}
|
||||
private BigDecimal z(BigDecimal v){return v==null?BigDecimal.ZERO:v;} private String trim(String v){return v==null||v.trim().isEmpty()?null:v.trim();}
|
||||
private BigDecimal amount(String v){try{BigDecimal n=new BigDecimal(v).setScale(6,RoundingMode.UNNECESSARY);if(n.signum()<=0)throw new Exception();return n;}catch(Exception e){throw new CustomException("amount必须大于0且最多6位小数");}}
|
||||
private String required(Map<String,String> p,String n){String v=trim(p.get(n));if(v==null)throw new CustomException(n+"不能为空");return v;}
|
||||
private void validateUrl(String v,boolean required){if(v==null){if(required)throw new CustomException("notify_url不能为空");return;}if(v.length()>512||!(v.startsWith("http://")||v.startsWith("https://")))throw new CustomException("回调地址格式错误");}
|
||||
private Map<String,String> parse(String plain){Map<String,String> m=new LinkedHashMap<>();if(plain==null)throw new CustomException("业务参数格式错误");for(String s:plain.split("&")){if(s.isEmpty())continue;int i=s.indexOf('=');if(i<=0)throw new CustomException("业务参数格式错误");if(m.put(s.substring(0,i),s.substring(i+1))!=null)throw new CustomException("业务参数不能重复");}return m;}
|
||||
}
|
||||
@@ -3,6 +3,11 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper.AppsMapper">
|
||||
<update id="updatePayoutBalances">
|
||||
update apps set usdt_balance=#{usdtBalance}, trx_balance=#{trxBalance},
|
||||
usdt_frozen_balance=#{usdtFrozenBalance}, trx_frozen_balance=#{trxFrozenBalance},
|
||||
updated_at=#{updatedAt} where id=#{id} and deleted_at is null
|
||||
</update>
|
||||
|
||||
<resultMap type="Apps" id="AppsResult">
|
||||
<result property="id" column="id" />
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
-- 应用代付订单。金额统一 DECIMAL(30,6),状态变更只能通过业务服务完成。
|
||||
CREATE TABLE IF NOT EXISTS `usdt_payout_order` (
|
||||
`id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '代付订单ID',
|
||||
`trade_id` VARCHAR(32) NOT NULL COMMENT '平台代付交易号',
|
||||
`order_id` VARCHAR(64) NOT NULL COMMENT '商户代付订单号',
|
||||
`app_id` BIGINT NOT NULL COMMENT '应用ID',
|
||||
`user_id` BIGINT NOT NULL COMMENT '应用所属用户ID',
|
||||
`currency` VARCHAR(8) NOT NULL COMMENT '代付币种:USDT、TRX',
|
||||
`amount` DECIMAL(30,6) NOT NULL COMMENT '代付本金',
|
||||
`fee_currency` VARCHAR(8) NOT NULL DEFAULT 'TRX' COMMENT '手续费币种,固定TRX',
|
||||
`fee_amount` DECIMAL(30,6) NOT NULL DEFAULT 0 COMMENT '代付手续费',
|
||||
`to_address` VARCHAR(64) NOT NULL COMMENT '收款TRON地址',
|
||||
`status` TINYINT NOT NULL DEFAULT 0 COMMENT '0待审核 1待执行 2广播中 3已完成 4已拒绝 5执行失败',
|
||||
`audit_type` VARCHAR(16) DEFAULT NULL COMMENT '审核渠道:BACKOFFICE、TELEGRAM',
|
||||
`auditor_id` VARCHAR(64) DEFAULT NULL COMMENT '审核人标识',
|
||||
`audit_remark` VARCHAR(255) DEFAULT NULL COMMENT '审核备注',
|
||||
`audited_at` TIMESTAMP NULL DEFAULT NULL COMMENT '审核时间',
|
||||
`block_transaction_id` VARCHAR(128) DEFAULT NULL COMMENT '链上交易哈希',
|
||||
`execute_error` VARCHAR(1024) DEFAULT NULL COMMENT '最近执行错误',
|
||||
`execute_count` INT NOT NULL DEFAULT 0 COMMENT '执行次数',
|
||||
`executed_at` TIMESTAMP NULL DEFAULT NULL COMMENT '广播时间',
|
||||
`confirmed_at` TIMESTAMP NULL DEFAULT NULL COMMENT '链上确认时间',
|
||||
`notify_url` VARCHAR(512) NOT NULL COMMENT '异步通知地址',
|
||||
`redirect_url` VARCHAR(512) DEFAULT NULL COMMENT '同步跳转地址',
|
||||
`callback_num` INT NOT NULL DEFAULT 0 COMMENT '通知尝试次数',
|
||||
`callback_confirm` TINYINT NOT NULL DEFAULT 0 COMMENT '0未确认 1已确认',
|
||||
`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||
`deleted_at` TIMESTAMP NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `uk_payout_trade_id` (`trade_id`),
|
||||
UNIQUE KEY `uk_payout_app_order` (`app_id`,`order_id`),
|
||||
UNIQUE KEY `uk_payout_txid` (`block_transaction_id`),
|
||||
KEY `idx_payout_status` (`status`,`deleted_at`,`updated_at`),
|
||||
KEY `idx_payout_app` (`app_id`,`created_at`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应用代付订单';
|
||||
|
||||
-- 应用流水关联代付订单,生产升级只执行一次;已存在字段时跳过本句。
|
||||
ALTER TABLE `apps_balance_ledger`
|
||||
ADD COLUMN `payout_order_id` BIGINT NULL COMMENT '代付订单ID' AFTER `order_id`,
|
||||
ADD KEY `idx_apps_ledger_payout` (`payout_order_id`);
|
||||
Reference in new issue
Block a user