fix:结算

cloudroam

2024-10-24 d19b094bde681e2a261ff28a088dd969b68ac65c

 src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java

@@ -23,6 +23,7 @@
import com.mzl.flower.mapper.supplier.SupplierMapper;
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.mapper.wallet.WalletWithdrawRecordMapper;
import com.mzl.flower.service.payment.UserPaymentV3Service;
import com.mzl.flower.service.supplier.SupplierService;
@@ -38,6 +39,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.math.BigDecimal;
@@ -72,6 +74,8 @@
    private final WalletBillRecordMapper walletBillRecordMapper;

    private final WalletBillRecordService walletBillRecordService;

    private final WalletMapper walletMapper;


    @Autowired
@@ -167,18 +171,22 @@

    @Override
    public void updateWallet(WalletWithdrawRecordDTO walletWithdrawRecordDTO) {

        WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletWithdrawRecordDTO.getId());
        if (withdrawRecordDO == null) {
            throw new ValidationException("提现记录信息不存在");
        }

        if (StringUtils.isEmpty(walletWithdrawRecordDTO.getApproveState())) {
            throw new ValidationException("审批状态不能为空");
        }

        if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
           if(StringUtils.isEmpty(walletWithdrawRecordDTO.getRejectReason())){
               throw new ValidationException("不通过理由不能为空");
           }
            if (StringUtils.isEmpty(walletWithdrawRecordDTO.getRejectReason())) {
                throw new ValidationException("不通过理由不能为空");
            }
        }

        BeanUtils.copyProperties(walletWithdrawRecordDTO, withdrawRecordDO);
        withdrawRecordDO.update(SecurityUtils.getUserId());
        withdrawRecordDO.setApproveState(walletWithdrawRecordDTO.getApproveState());
@@ -187,16 +195,18 @@
        walletWithdrawRecordMapper.updateById(withdrawRecordDO);

        //审批通过之后写转账信息
        if(Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())){
        if (Constants.WALLET_APPROVE_STATE.APPROVE.name().equals(walletWithdrawRecordDTO.getApproveState())) {
            Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
            String name = "";
            name = "供应商" + s.getName();
            UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));
            if(wechat == null){

            if (wechat == null) {
                String msg = name + "未绑定账号无法结算";
                log.error(msg);
                throw new ValidationException(msg);
            }

            LocalDateTime now = LocalDateTime.now();
            String day = format(now, "yyyy-MM-dd");
            String remarks = name + "钱包提现";
@@ -208,14 +218,15 @@
            transferReqDTO.setRemarks(remarks);

            //保存账单信息
            WalletBillRecordDO  walletBillRecordDO = new WalletBillRecordDO();
            WalletBillRecordDO walletBillRecordDO = new WalletBillRecordDO();
            walletBillRecordDO.setSupplierId(s.getId());
            walletBillRecordDO.setType(Constants.BILL_CHANGE_TYPE.withdraw.name());
            walletBillRecordDO.setMethod(Constants.BILL_CHANGE_METHOD.reduce.name());
            walletBillRecordDO.setTransferId(transferReqDTO.getAppId());
            //提现金额
            BigDecimal withdrawAmount  = withdrawRecordDO.getAmount();
            if(withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
            BigDecimal withdrawAmount = withdrawRecordDO.getAmount();

            if (withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
                TransferDetailReqDTO dr = new TransferDetailReqDTO();
                dr.setId(UUIDGenerator.getUUID());
                dr.setAmount(withdrawAmount.multiply(new BigDecimal(100)).longValue());
@@ -233,9 +244,24 @@
                //发起转账
                paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
            }

            //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息
            walletBillRecordDO.setTransferDetailId(Constants.TRANSFER_STATUS.ACCEPTED.name());
            walletBillRecordMapper.insert(walletBillRecordDO);
            //不需要更新结算单了，此时提现的金额和计算单上的金额不一致
        }

        if (Constants.WALLET_APPROVE_STATE.REJECT.name().equals(walletWithdrawRecordDTO.getApproveState())) {
            //更新钱包
            Supplier s = supplierMapper.selectById(withdrawRecordDO.getSupplierId());
            WalletDO walletDO = walletService.getBySupplierId(s.getId());
            if(!ObjectUtils.isEmpty(walletDO)){
                //提现中金额:审核失败体现中金额扣减
                walletDO.setWithdrawingAmount(walletDO.getWithdrawingAmount().subtract(withdrawRecordDO.getAmount()));
                //可提现金额:审核失败可提现金额增加
                walletDO.setWithdrawableAmount(walletDO.getWithdrawableAmount().add(withdrawRecordDO.getAmount()));
                walletMapper.updateById(walletDO);
            }
        }
    }
    public String format(LocalDateTime dateTime, String format) {