This commit is contained in:
dute7liang
2024-01-28 16:24:40 +08:00
parent afa28e5039
commit 76cfa50e5e
12 changed files with 61 additions and 47 deletions

View File

@@ -22,7 +22,7 @@ public interface AccountCashService extends IService<AccountCash> {
Page<AccountCashAdminVo> pageAdmin(PageQuery pageQuery, AccountCashAdminVo bo);
void fail(Long id);
void fail(Long id,String failRemark);
ExportBatchAuditVo batchAudit(List<Long> result);

View File

@@ -15,6 +15,8 @@ import com.ruoyi.cai.manager.IdManager;
import com.ruoyi.cai.mapper.AccountCashMapper;
import com.ruoyi.cai.notice.YunxinHttpService;
import com.ruoyi.cai.notice.dto.CashSuccessSendMesDTO;
import com.ruoyi.cai.pay.OrderNoUtil;
import com.ruoyi.cai.pay.OrderTypeEnum;
import com.ruoyi.cai.service.AccountCashService;
import com.ruoyi.cai.service.AccountBankcardService;
import com.ruoyi.cai.service.AccountService;
@@ -58,7 +60,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
AccountCash cash = new AccountCash();
cash.setUserId(res.getUserId());
cash.setTraceId(traceId);
cash.setOrderNo("orderNo");
cash.setOrderNo(OrderNoUtil.createOrderNo(OrderTypeEnum.WITHDRAW_ORDER_SUB));
cash.setWithdrawCoin(coinNum);
cash.setCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
cash.setRealCashMoney(BigDecimal.valueOf(withdrawExchange.getMoney()));
@@ -75,7 +77,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
}
@Override
public void fail(Long id) {
public void fail(Long id,String failRemark) {
AccountCash accountCash = this.getById(id);
if(accountCash == null){
return;
@@ -84,6 +86,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
.set(AccountCash::getVerifyTime, LocalDateTime.now())
.set(AccountCash::getOperateIp, ServletUtils.getClientIP())
.set(AccountCash::getStatus, AccountCashStatusEnum.FAIL.getCode())
.set(AccountCash::getVerifyRemark,failRemark)
.eq(AccountCash::getStatus, AccountCashStatusEnum.READY.getCode())
.eq(AccountCash::getId, id));
if(!update){
@@ -91,7 +94,7 @@ public class AccountCashServiceImpl extends ServiceImpl<AccountCashMapper, Accou
}
accountService.withdrawFail(accountCash.getUserId(),accountCash.getWithdrawCoin(),accountCash.getTraceId());
yunxinHttpService.cashFailSendMessage(accountCash.getUserId(),accountCash.getCreateTime(),accountCash.getCashMoney(),
accountCash.getVerifyRemark());
failRemark);
}

View File

@@ -1,6 +1,5 @@
package com.ruoyi.cai.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +32,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 用户账户Service业务层处理