From cc18ca14afec7ac0db2be2a1cd31657de497884b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 10 Oct 2024 16:42:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 196 +++++++++++++-----------------------------------
1 files changed, 55 insertions(+), 141 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 5ddcdfc..c3ef163 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -1,6 +1,7 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.nq.dao.*;
import com.nq.enums.EConfigKey;
@@ -20,12 +21,14 @@
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.nq.utils.timeutil.DateTimeUtil;
+import com.nq.utils.timeutil.TimeUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
@@ -91,8 +94,11 @@
@Autowired
UserAssetsMapper userAssetsMapper;
+ @Resource
+ StockTimeSettingMapper stockTimeSettingMapper;
+
@Transactional
- public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,HttpServletRequest request) throws Exception {
+ public ServerResponse outMoney(String amt, String with_Pwd,String accsetType,String bankId,HttpServletRequest request) throws Exception {
if (StringUtils.isBlank(amt)) {
return ServerResponse.createByErrorMsg("The parameter cannot be null");
}
@@ -111,9 +117,9 @@
if (user.getIsActive() != 2) {
return ServerResponse.createByErrorMsg("未实名认证",request);
}
- UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
+ UserBank userBank = this.userBankMapper.selectById(bankId);
if (userBank == null) {
- return ServerResponse.createByErrorMsg("未绑定银行卡",request);
+ return ServerResponse.createByErrorMsg("银行卡不存在",request);
}
if (user.getAccountType().intValue() == 1) {
return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
@@ -123,12 +129,11 @@
return ServerResponse.createByErrorMsg("Analog users cannot withdraw funds" + siteSetting.getWithMinAmt(),request);
}
-
- String time = iStockConfigServices.queryByKey(EConfigKey.WITHDRAW_TIME_SETTING.getCode()).getCValue();
-
- if (!WithDrawUtils.checkIsWithTime( Integer.parseInt(time.split("-")[0]), Integer.parseInt(time.split("-")[1]))) {
- return ServerResponse.createByErrorMsg("撤销失败了。提现时间为" + time.split("-")[0] + "点 - " + time.split("-")[1] + "点之间的",request);
+ boolean b = getServerResponse();
+ if (!b) {
+ return ServerResponse.createByErrorMsg("提现失败,当前时间已停止提现", request);
}
+
BigDecimal useAmt = iUserAssetsServices.getAvailableBalance(accsetType,user.getId());
BigDecimal tAmt = new BigDecimal(amt);
if(useAmt.compareTo(tAmt)<0){
@@ -162,6 +167,16 @@
}
+ private boolean getServerResponse() {
+ StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type","IN"));
+ if(stockTimeSetting == null){
+ return false;
+ }
+ if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+ return false;
+ }
+ return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(), stockTimeSetting.getAmEndTime(), stockTimeSetting.getPmStartTime(), stockTimeSetting.getPmEndTime());
+ }
public ServerResponse<PageInfo> findUserWithList(String withStatus, HttpServletRequest request, int pageNum, int pageSize) {
@@ -221,7 +236,13 @@
User user = this.userMapper.selectById(userWithdraw.getUserId());
- int updateUserCount = this.userMapper.updateById(user);
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
+ }
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ int updateUserCount = userAssetsMapper.updateById(userAssets);
if (updateUserCount > 0) {
@@ -322,18 +343,30 @@
if (state.intValue() == 3 &&
StringUtils.isBlank(authMsg)) {
return ServerResponse.createByErrorMsg("失败信息必填");
-
+ }
+ User user = this.userMapper.selectById(userWithdraw.getUserId());
+ if (user == null) {
+ return ServerResponse.createByErrorMsg("用户不存在");
+ }
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+ if (userAssets == null) {
+ return ServerResponse.createByErrorMsg("用户资金账户不存在");
}
if (state == 3) {
- User user = this.userMapper.selectById(userWithdraw.getUserId());
- if (user == null) {
- return ServerResponse.createByErrorMsg("用户不存在");
+ if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+ BigDecimal subtract = userWithdraw.getWithAmt().subtract(userAssets.getAmountToBeCovered());
+ if(subtract.compareTo(BigDecimal.ZERO) > 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
+ userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ }else{
+ userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userWithdraw.getWithAmt()));
+ }
+ }else{
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
}
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId("IN", user.getId());
- if (userAssets == null) {
- return ServerResponse.createByErrorMsg("用户资金账户不存在");
- }
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
int updateCount = userAssetsMapper.updateById(userAssets);
if (updateCount > 0) {
log.info("提现失败，返还用户资金成功！");
@@ -342,21 +375,11 @@
throw new Exception("修改用户资金出错，抛出异常");
}
userWithdraw.setWithMsg(authMsg);
- }else if(state == 1){
- // 发起第三方提现
- BigDecimal bgAmount = userWithdraw.getWithAmt();
- if(siteSetting.getWithdraw().equals("Top1")){
- withdrawMethod1(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
- } else if (siteSetting.getWithdraw().equals("Top2")) {
- withdrawMethod2(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
- }else if(siteSetting.getWithdraw().equals("Top3")){
- withdrawMethod3(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
- }else{
- withdrawMethod4(userWithdraw.getId()+"",bgAmount.toString(), userMapper.selectById(userWithdraw.getUserId()));
- }
-
-
+ }else{
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(userWithdraw.getWithAmt()));
+ userAssetsMapper.updateById(userAssets);
}
+
userWithdraw.setWithStatus(state);
userWithdraw.setTransTime(new Date());
int updateCount = this.userWithdrawMapper.updateByPrimaryKeySelective(userWithdraw);
@@ -366,115 +389,6 @@
return ServerResponse.createByErrorMsg("操作失败！");
}
-
-
-
- public int withdrawMethod1(String ordersn, String payAmt, User user ) {
- UserBank userBank = userBankMapper.findUserBankByUserId(user.getId());
- Map<String,String> map = new HashedMap();
- map.put("mch_id",PayUtil.MCH_ID_TOP1);
- map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify.do");
- map.put("mch_transferId",ordersn);
- map.put("transfer_amount",payAmt);
- map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
- map.put("bank_code",userBank.getBankImg());
- map.put("receive_name",user.getRealName());
- map.put("receive_account",userBank.getBankNo());
- map.put("remark",userBank.getBankAddress());
- String signStr = SignUtil.sortData(map);
- map.put("sign_type","MD5");
- try {
- map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP1));
- String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP1, map, "utf-8");
- com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(reponse);
- }catch (Exception e){
- e.printStackTrace();
- }
- return -1;
- }
-
- public int withdrawMethod2(String ordersn, String payAmt, User user ) {
- UserBank userBank = userBankMapper.findUserBankByUserId(user.getId());
- Map<String,String> map = new HashedMap();
- map.put("mch_id",PayUtil.MCH_ID_TOP2);
- map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify2.do");
- map.put("mch_transferId",ordersn);
- map.put("transfer_amount",payAmt);
- map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
- map.put("bank_code",userBank.getBankImg());
- map.put("receive_name",user.getRealName());
- map.put("receive_account",userBank.getBankNo());
- map.put("remark",userBank.getBankAddress());
- String signStr = SignUtil.sortData(map);
- log.error("加密前排序字符 {}", signStr);
- map.put("sign_type","MD5");
- try {
- map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP2));
- log.info("支付通道2 代付的参数 {}",new Gson().toJson(map));
- String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP2, map, "utf-8");
- log.info("支付通道2 审核返回的 {}",reponse);
- com.alibaba.fastjson.JSONObject object = com.alibaba.fastjson.JSONObject.parseObject(reponse);
- }catch (Exception e){
- e.printStackTrace();
- }
- return -1;
- }
-
-
- public int withdrawMethod3(String ordersn, String payAmt, User user ) {
- UserBank userBank = userBankMapper.findUserBankByUserId(user.getId());
- Map<String,String> map = new HashedMap();
- map.put("mch_id",PayUtil.MCH_ID_TOP3);
- map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify3.do");
- map.put("mch_transferId",ordersn);
- map.put("transfer_amount",payAmt);
- map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
- map.put("bank_code",userBank.getBankImg());
- map.put("receive_name",user.getRealName());
- map.put("receive_account",userBank.getBankNo());
- map.put("remark",userBank.getBankAddress());
- String signStr = SignUtil.sortData(map);
- log.error("加密前排序字符 {}", signStr);
- map.put("sign_type","MD5");
- try {
- map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP3));
- log.info("支付通道3 代付的参数 {}",new Gson().toJson(map));
- String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP3, map, "utf-8");
- log.info("支付通道3 审核返回的 {}",reponse);
- }catch (Exception e){
- e.printStackTrace();
- }
- return -1;
- }
-
-
- public int withdrawMethod4(String ordersn, String payAmt, User user ) {
- UserBank userBank = userBankMapper.findUserBankByUserId(user.getId());
- Map<String,String> map = new HashedMap();
- map.put("mch_id",PayUtil.MCH_ID_TOP4);
- map.put("back_url","http://www.jumptalk.net:8091/api/pay/withdrawNotify4.do");
- map.put("mch_transferId",ordersn);
- map.put("transfer_amount",payAmt);
- map.put("apply_date", DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
- map.put("bank_code",userBank.getBankImg());
- map.put("receive_name",user.getRealName());
- map.put("receive_account",userBank.getBankNo());
- map.put("remark",userBank.getBankAddress());
- String signStr = SignUtil.sortData(map);
- map.put("sign_type","MD5");
- try {
- map.put("sign", SignAPI.sign(signStr,PayUtil.DF_TOKEN_TOP1));
- String reponse = HttpClientUtil.doPost(PayUtil.PAY_TRANSFER_ORDER_TOP1, map, "utf-8");
- log.info("支付通道4 审核返回的 {}",reponse);
- }catch (Exception e){
- e.printStackTrace();
- }
- return -1;
- }
-
-
-
-
public int deleteByUserId(Integer userId) {
return this.userWithdrawMapper.deleteByUserId(userId);
--
Gitblit v1.9.3