From 09206aedcfdf30050123e99f2af0a192ebad1de4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 03 Jun 2024 18:08:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/PayServiceImpl.java |   36 +++++++-----------------------------
 1 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/PayServiceImpl.java b/src/main/java/com/nq/service/impl/PayServiceImpl.java
index 2b99993..e7ea499 100644
--- a/src/main/java/com/nq/service/impl/PayServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -1,7 +1,6 @@
 package com.nq.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.google.gson.Gson;
 import com.nq.common.CmcPayConfig;
 import com.nq.common.ServerResponse;
@@ -44,7 +43,7 @@
 
 
 @Service("iPayService")
-public class PayServiceImpl implements IPayService{
+public class PayServiceImpl implements IPayService {
     private static final Logger log = LoggerFactory.getLogger(PayServiceImpl.class);
 
     @Autowired
@@ -233,38 +232,26 @@
 
 
     @Transactional
-    public ServerResponse flyPay(Integer payType, String payAmt, String currency,String payId, HttpServletRequest request) {
+    public ServerResponse flyPay(Integer payType, String payAmt, String currency, 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.setPayAmt(new BigDecimal(payAmt));
         userRecharge.setOrderStatus(Integer.valueOf(0));
         userRecharge.setAddTime(new Date());
+        userRecharge.setPayId(payType);
         userRecharge.setImg(currency);
-        userRecharge.setUserPhone(user.getPhone());
-        userRecharge.setPayType(payType);
+        userRecharge.setAssetsType(sitePay.getAssetsType());
         userRechargeMapper.insert(userRecharge);
-        return ServerResponse.createBySuccess("succeed");
+        return ServerResponse.createBySuccess("");
     }
 
-    @Override
-    public ServerResponse flyPayAmt(HttpServletRequest request,UserRecharge userRecharge) {
-        User user = iUserService.getCurrentUser(request);
-        userRecharge.setUserId(user.getId());
-        userRecharge.setNickName(user.getRealName());
-        userRecharge.setAgentId(user.getAgentId());
-        String ordersn = KeyUtils.getRechargeOrderSn();
-        userRecharge.setOrderSn(ordersn);
-        userRecharge.setOrderStatus(Integer.valueOf(0));
-        userRecharge.setAddTime(new Date());
-        userRecharge.setUserPhone(user.getPhone());
-        userRechargeMapper.insertSelective(userRecharge);
-        return ServerResponse.createBySuccessMsg("succeed");
-    }
 
     /**
      * 充值方式一
@@ -712,14 +699,5 @@
         }
 
         return retMap;
-    }
-
-    @Override
-    public ServerResponse editRecharge(UserRecharge userRecharge) {
-        if (userRecharge.getId()==null||userRecharge.getId()==0){
-            return ServerResponse.createByErrorMsg("param is null");
-        }
-        userRechargeMapper.updateByPrimaryKey(userRecharge);
-        return ServerResponse.createBySuccessMsg("Success!");
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3