From f620192bcac7f5cb910a99e092edcee00280ce10 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 11 Oct 2025 18:39:54 +0800
Subject: [PATCH] 充值提现修改
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java | 152 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 126 insertions(+), 26 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
index 28b9557..234bde5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
@@ -1,24 +1,38 @@
package com.yami.trading.api.controller;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yami.trading.api.UD.*;
+import com.yami.trading.bean.model.CapitaltWallet;
+import com.yami.trading.bean.model.RechargeBlockchainOrder;
import com.yami.trading.bean.model.Withdraw;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
+import com.yami.trading.common.exception.BusinessException;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.Arith;
+import com.yami.trading.common.util.C2cLock;
import com.yami.trading.common.util.DateUtils;
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.security.common.util.SecurityUtils;
+import com.yami.trading.service.CapitaltWalletService;
import com.yami.trading.service.SessionTokenService;
import com.yami.trading.service.WithdrawService;
import com.yami.trading.service.syspara.SysparaService;
import com.yami.trading.service.user.UserService;
import com.yami.trading.service.user.WalletLogService;
+import com.yami.trading.sys.model.SysUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.DecimalFormat;
@@ -44,6 +58,11 @@
private SysparaService sysparaService;
@Autowired
protected WalletLogService walletLogService;
+ @Autowired
+ CapitaltWalletService capitaltWalletService;
+
+ @Autowired
+ UdunClient udunClient;
/**
* 首次进入页面，传递session_token
@@ -72,19 +91,20 @@
public Result apply(String session_token, String safeword,
String amount, String from, String currency,
String channel){
- String partyId = SecurityUtils.getUser().getUserId();
- boolean lock = false;
- String error = this.verif(amount);
- if (!StringUtils.isNullOrEmpty(error)) {
- throw new YamiShopBindException(error);
- }
- double amount_double = Double.valueOf(amount).doubleValue();
+ Result resultObject=new Result();
+ try {
+ String partyId = SecurityUtils.getUser().getUserId();
+ String error = this.verif(amount);
+ if (!StringUtils.isNullOrEmpty(error)) {
+ throw new YamiShopBindException(error);
+ }
+ double amount_double = Double.valueOf(amount).doubleValue();
- // 交易所提现是否需要资金密码
- String exchange_withdraw_need_safeword = this.sysparaService.find("exchange_withdraw_need_safeword").getSvalue();
- if(StringUtils.isEmptyString(exchange_withdraw_need_safeword)) {
- throw new YamiShopBindException("系统参数错误");
- }
+ // 交易所提现是否需要资金密码
+ String exchange_withdraw_need_safeword = this.sysparaService.find("exchange_withdraw_need_safeword").getSvalue();
+ if(StringUtils.isEmptyString(exchange_withdraw_need_safeword)) {
+ throw new YamiShopBindException("系统参数错误");
+ }
if ("true".equals(exchange_withdraw_need_safeword)) {
@@ -99,22 +119,102 @@
throw new YamiShopBindException("资金密码错误");
}
}
- Object object = this.sessionTokenService.cacheGet(session_token);
- this.sessionTokenService.del(session_token);
-// if (null == object || !SecurityUtils.getUser().getUserId().equals((String) object)) {
-// throw new YamiShopBindException("请稍后再试");
-// }
- Withdraw withdraw = new Withdraw();
- withdraw.setUserId(partyId);
- withdraw.setVolume(new BigDecimal(amount_double));
- withdraw.setAddress(from);
- withdraw.setCurrency(currency);
- withdraw.setTx("");
- // 保存
- this.withdrawService.saveApply(withdraw, channel, null);
- return Result.succeed(null);
+
+ // 获取资金账户（capital）
+ CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ .eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
+ if(capitaltWallet.getMoney().compareTo(new BigDecimal(amount)) < 0){
+ throw new YamiShopBindException("Insufficient available balance for withdrawal！");
+ }
+
+ this.sessionTokenService.del(session_token);
+ Withdraw withdraw = new Withdraw();
+ withdraw.setUserId(partyId);
+ withdraw.setVolume(new BigDecimal(amount_double));
+ withdraw.setAddress(from);
+ withdraw.setCurrency(currency);
+ withdraw.setTx("");
+
+ //获取商户支持币种
+ /*List<Coin> coinList = udunClient.listSupportCoin(false);
+ String channelName = channel.replace("_", "");
+ Coin coin = coinList.stream().filter(x -> x.getName().replace("-","").equals(channelName)).findFirst().orElse(null);
+ if (coin == null) {
+ throw new YamiShopBindException("不支持的提现币种");
+ }*/
+ // 保存
+ this.withdrawService.saveApply(withdraw, channel, null);
+ /*ResultMsg resultMsg = udunClient.withdraw(from, withdraw.getVolume(), coin.getMainCoinType(),
+ coin.getCoinType(), withdraw.getOrderNo(), null);
+ if (resultMsg.getCode() != HttpStatus.HTTP_OK) {
+ log.error("withdraw:{}", JSONUtil.toJsonStr(resultMsg));
+ throw new UdunException(resultMsg.getCode(), resultMsg.getMessage());
+ }*/
+ resultObject.setCode(0);
+ } catch (YamiShopBindException e) { // 1. 显式捕获业务异常，优先处理
+ resultObject.setCode(1);
+ resultObject.setMsg(e.getMessage()); // 直接获取纯业务消息
+ log.error("业务异常: {}", e.getMessage());
+ throw e;
+ } catch (UdunException e) {
+ resultObject.setCode(1);
+ resultObject.setMsg(e.getMessage());
+ log.error("error:" + e.getMessage());
+ throw e;
+ } catch (Throwable t) {
+ resultObject.setCode(1);
+ resultObject.setMsg(t.getMessage());
+ log.error("error: {}", t.getMessage());
+ throw new RuntimeException(t);
+ }
+ return resultObject;
}
+ @PostMapping("withdrawCallback.action")
+ public ResultMsg withdrawCallback(HttpServletRequest request){
+ String timestamp = request.getParameter("timestamp");
+ String nonce = request.getParameter("nonce");
+ String sign = request.getParameter("sign");
+ String body = request.getParameter("body");
+
+ ResultMsg resultMsg = new ResultMsg();
+ try{
+ log.info("===withdrawCallback===：{}", body);
+ boolean flag = udunClient.checkSign(timestamp, nonce, body, sign);
+ log.info("===withdrawCallback===sign：{}", flag);
+
+ if (!flag){
+ resultMsg.setCode(406);
+ resultMsg.setMessage("提现回调验签失败");
+ return resultMsg;
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, Object> map = objectMapper.readValue(body, HashMap.class);
+ String address = map.get("address").toString();
+ String order_no = map.get("businessId").toString();
+
+ Withdraw withdraw = withdrawService.getOne(new LambdaQueryWrapper<>(Withdraw.class)
+ .eq(Withdraw::getOrderNo, order_no).last(" limit 1 "));
+ if(ObjectUtil.isEmpty(withdraw) && withdraw.getStatus() != 0 && !withdraw.getAddress().equals(address)){
+ log.info("withdraw failed:{}", withdraw);
+ resultMsg.setCode(200);
+ return resultMsg;
+ }
+ Integer status = Integer.valueOf(map.get("status").toString());
+ if (status == 3) { //交易成功
+ withdrawService.examineOk(withdraw.getUuid(), null);
+ } else if(status == 2) { //驳回
+ withdrawService.reject(withdraw.getUuid(), "订单失败：" + status, "withdrawCallback");
+ }
+ resultMsg.setCode(200);
+ }catch (Exception e){
+ resultMsg.setCode(500);
+ resultMsg.setMessage("回调处理失败");
+ }
+ return resultMsg;
+ }
+
+
/**
* 提现订单详情
* <p>
--
Gitblit v1.9.3