From b864ea85f84cee2df8616f4eb5757f5f3f1a5c43 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 19 Jan 2026 15:05:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.11rg' into 1.11rg
---
src/main/java/com/nq/service/impl/PayServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index a4a6af6..a067fc5 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -390,23 +390,20 @@
@Transactional
- public ServerResponse flyPay(Integer payType, String payAmt, String currency, HttpServletRequest request) {
+ public ServerResponse flyPay(String payAmt, HttpServletRequest request) {
User user = iUserService.getCurrentUser(request);
- SitePay sitePay = sitePayMapper.selectById(payType);
UserRecharge userRecharge = new UserRecharge();
userRecharge.setUserId(user.getId());
userRecharge.setNickName(user.getRealName());
userRecharge.setAgentId(user.getAgentId());
String ordersn = KeyUtils.getRechargeOrderSn();
userRecharge.setOrderSn(ordersn);
- userRecharge.setPayChannel(sitePay.getChannelName());
+ userRecharge.setPayChannel("カスタマーサービスに連絡して入金");
userRecharge.setPayAmt(new BigDecimal(payAmt));
userRecharge.setOrderStatus(Integer.valueOf(0));
userRecharge.setAddTime(new Date());
- userRecharge.setPayId(payType);
- userRecharge.setImg(currency);
userRechargeMapper.insert(userRecharge);
- return ServerResponse.createBySuccess( ((SiteInfo)siteInfoService.getInfo(request).getData()).getOnlineService());
+ return ServerResponse.createBySuccess();
}
--
Gitblit v1.9.3