1

zj

2024-10-01 f525648210da700d58d3b3a5c8a48d46abba4a68

 src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java

@@ -26,6 +26,7 @@
import javax.servlet.http.HttpServletRequest;

import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.translate.GoogleTranslateUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;

@@ -92,7 +93,7 @@
    UserAssetsMapper userAssetsMapper;

    @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 walletAddress,Integer type,HttpServletRequest request) throws Exception {
        if (StringUtils.isBlank(amt)) {
            return ServerResponse.createByErrorMsg("The parameter cannot be null");
        }
@@ -114,6 +115,9 @@
            UserBank userBank = this.iUserBankService.findUserBankByUserId(user.getId());
            if (userBank == null) {
                return ServerResponse.createByErrorMsg("未绑定银行卡",request);
            }
            if (type == 1 && StringUtils.isEmpty(walletAddress)) {
                return ServerResponse.createByErrorMsg("数字货币地址不能为空",request);
            }
            if (user.getAccountType().intValue() == 1) {
                return ServerResponse.createByErrorMsg("模拟用户无法提取资金",request);
@@ -142,24 +146,36 @@
            userWithdraw.setWithAmt(new BigDecimal(amt));
            userWithdraw.setApplyTime(new Date());
            userWithdraw.setWithName(user.getRealName());
            userWithdraw.setBankNo(userBank.getBankNo());
            userWithdraw.setBankName(userBank.getBankName());
            userWithdraw.setBankAddress(userBank.getBankAddress());
            if(type == 0){
                userWithdraw.setBankNo(userBank.getBankNo());
                userWithdraw.setBankName(userBank.getBankName());
                userWithdraw.setBranch("银行卡");
                userWithdraw.setPayeeName(userBank.getPayeeName());
                userWithdraw.setBankAddress("银行卡");
            }else{
                userWithdraw.setBankNo(walletAddress);
                userWithdraw.setPayeeName("加密货币");
                userWithdraw.setBankName("加密货币");
                userWithdraw.setBranch("加密货币");
                userWithdraw.setBankAddress("加密货币");
            }

            userWithdraw.setBranchNo(userBank.getBranchNo());

            userWithdraw.setWithStatus(Integer.valueOf(0));
            BigDecimal withfee = siteSetting.getWithFeePercent().multiply(new BigDecimal(amt)).add(new BigDecimal(siteSetting.getWithFeeSingle().intValue()));
            userWithdraw.setWithFee(withfee);
            userWithdraw.setAssetsType(accsetType);
            log.info("userWithdraw------------:"+userWithdraw.toString());
            log.info("userBank--------------:"+userBank.toString());
            int insertCount = this.userWithdrawMapper.insert(userWithdraw);
            if (insertCount > 0) {
                return ServerResponse.createBySuccessMsg("提现成功",request);
            }

            log.error("保存提现记录失败");

            throw new Exception("用户提现，保存提现记录失败");
        } else {
            return ServerResponse.createByErrorMsg("提现密码不正确!",request);
        }

        return ServerResponse.createBySuccessMsg("提现成功",request);
    }


@@ -172,7 +188,10 @@


        List<UserWithdraw> userWithdraws = this.userWithdrawMapper.findUserWithList(user.getId(), withStatus);

        userWithdraws.forEach(f->{
            f.setBankName(new GoogleTranslateUtil().translate(f.getBankName(),request.getHeader("lang")));
            f.setBankAddress(new GoogleTranslateUtil().translate(f.getBankAddress(),request.getHeader("lang")));
        });

        PageInfo pageInfo = new PageInfo(userWithdraws);