From fd0c783628ff8c35a514dbf88d4fe00d9501c652 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 30 Jan 2026 14:30:27 +0800
Subject: [PATCH] c2c
---
trading-order-service/src/main/java/com/yami/trading/service/c2c/impl/C2cOrderServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/c2c/impl/C2cOrderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/c2c/impl/C2cOrderServiceImpl.java
index 8b7170c..15bebc8 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/c2c/impl/C2cOrderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/c2c/impl/C2cOrderServiceImpl.java
@@ -131,8 +131,8 @@
if (C2cOrder.DIRECTION_BUY.equals(c2cOrder.getDirection())) {
// 买币
// 给用户账户添加相应的币种数量
- double amountBefore = 0d;
- double amountAfter = 0d;
+ double amountBefore;
+ double amountAfter;
if ("usdt".equalsIgnoreCase(c2cOrder.getSymbol())) {
Wallet wallet = this.walletService.saveWalletByPartyId(c2cOrder.getPartyId());
amountBefore = wallet.getMoney().doubleValue();
@@ -147,9 +147,9 @@
// 保存资金日志
MoneyLog moneyLog = new MoneyLog();
moneyLog.setCategory(Constants.MONEYLOG_CATEGORY_C2C);
- moneyLog.setAmount_before(new BigDecimal(amountBefore));
+ moneyLog.setAmountBefore(new BigDecimal(amountBefore));
moneyLog.setAmount(new BigDecimal(c2cOrder.getCoinAmount()));
- moneyLog.setAmount_after(new BigDecimal(amountAfter));
+ moneyLog.setAmountAfter(new BigDecimal(amountAfter));
moneyLog.setLog("c2c订单购买放行，订单号[" + c2cOrder.getOrderNo() + "]");
moneyLog.setUserId(c2cOrder.getPartyId());
moneyLog.setWallet_type(c2cOrder.getSymbol());
@@ -254,6 +254,7 @@
result.put("method_name", order.getMethodName());
result.put("method_img", Constants.IMAGES_HTTP+order.getMethodImg());
result.put("real_name", order.getRealName());
+ result.put("pay_real_name", order.getPayRealName());
result.put("param_name1", order.getParamName1());
result.put("param_value1", order.getParamValue1());
result.put("param_name2", order.getParamName2());
@@ -310,9 +311,9 @@
if ("3".equals(c2cOrder.getState())) {
throw new YamiShopBindException("该订单已完成");
}
- if ("recharge".equals(c2cOrder.getDirection())) {
+ if ("buy".equals(c2cOrder.getDirection())) {
// 充值
- } else if ("withdraw".equals(c2cOrder.getDirection())) {
+ } else if ("sell".equals(c2cOrder.getDirection())) {
// 提现
// 用户钱包退还
Wallet wallet = this.walletService.saveWalletByPartyId(c2cOrder.getPartyId());
@@ -321,11 +322,11 @@
this.walletService.update(c2cOrder.getPartyId().toString(), c2cOrder.getCoinAmount());
// 保存 资金日志
MoneyLog moneyLog = new MoneyLog();
- moneyLog.setCategory(Constants.MONEYLOG_CATEGORY_BANK_CARD);
+ moneyLog.setCategory(Constants.MONEYLOG_CATEGORY_C2C);
moneyLog.setAmountBefore(new BigDecimal(amountBefore));
moneyLog.setAmount(new BigDecimal(c2cOrder.getCoinAmount()));
moneyLog.setAmountAfter(new BigDecimal(amountAfter));
- moneyLog.setLog("银行卡订单取消，订单号[" + c2cOrder.getOrderNo() + "]");
+ moneyLog.setLog("C2C订单取消，订单号[" + c2cOrder.getOrderNo() + "]");
moneyLog.setUserId(c2cOrder.getPartyId());
moneyLog.setWalletType(c2cOrder.getSymbol());
moneyLog.setSymbol(c2cOrder.getSymbol());
@@ -333,7 +334,7 @@
this.moneyLogService.save(moneyLog);
// 保存 充提记录
WalletLog walletLog = new WalletLog();
- walletLog.setCategory(Constants.MONEYLOG_CATEGORY_BANK_CARD_WITHDRAW);
+ walletLog.setCategory(Constants.MONEYLOG_CATEGORY_C2C);
walletLog.setPartyId(c2cOrder.getPartyId());
walletLog.setOrderNo(c2cOrder.getOrderNo());
walletLog.setStatus(Integer.valueOf(c2cOrder.getState()).intValue());
@@ -490,7 +491,7 @@
return baseMapper.pagedC2cQuery(page,status,orderNo,userCode,rolename,c2cUserCode,c2cUserType,c2cUserPartyCode,direction);
}
-
+ @Transactional
public void saveOpen(C2cOrder c2cOrder,String remark) {
log.error("saveOpen start:"+remark);
C2cAdvert c2cAdvert = this.c2cAdvertService.getById(c2cOrder.getC2cAdvertId());
@@ -675,8 +676,8 @@
throw new YamiShopBindException("金额不在购买区间");
}
- double amountBefore = 0d;
- double amountAfter = 0d;
+ double amountBefore ;
+ double amountAfter ;
if ("usdt".equalsIgnoreCase(c2cAdvert.getSymbol())) {
@@ -704,9 +705,9 @@
// 保存资金日志
MoneyLog moneylog = new MoneyLog();
moneylog.setCategory(Constants.MONEYLOG_CATEGORY_C2C);
- moneylog.setAmount_before(new BigDecimal(amountBefore));
+ moneylog.setAmountBefore(new BigDecimal(amountBefore));
moneylog.setAmount(new BigDecimal(Arith.sub(0, c2cOrder.getCoinAmount())));
- moneylog.setAmount_after(new BigDecimal(amountAfter));
+ moneylog.setAmountAfter(new BigDecimal(amountAfter));
moneylog.setLog("c2c卖币，币种[" + c2cOrder.getSymbol() + "]，订单号[" + c2cOrder.getOrderNo() + "]");
moneylog.setUserId(c2cOrder.getPartyId());
moneylog.setWalletType(c2cOrder.getSymbol());
--
Gitblit v1.9.3