fix:结算

cloudroam

2024-10-23 0ac9091ca1afc9d7e9516e71e0e2806c352d0d5d

fix:结算

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

@@ -167,18 +167,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("不通过理由不能为空");
           }
        }

        BeanUtils.copyProperties(walletWithdrawRecordDTO, withdrawRecordDO);
        withdrawRecordDO.update(SecurityUtils.getUserId());
        withdrawRecordDO.setApproveState(walletWithdrawRecordDTO.getApproveState());
@@ -192,11 +196,13 @@
            String name = "";
            name = "供应商" + s.getName();
            UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>().eq("user_id", s.getUserId()));

            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 + "钱包提现";
@@ -215,6 +221,7 @@
            walletBillRecordDO.setTransferId(transferReqDTO.getAppId());
            //提现金额
            BigDecimal withdrawAmount  = withdrawRecordDO.getAmount();

            if(withdrawAmount.doubleValue() > 0) {//结算金额>0时才去转账
                TransferDetailReqDTO dr = new TransferDetailReqDTO();
                dr.setId(UUIDGenerator.getUUID());
@@ -233,6 +240,7 @@
                //发起转账
                paymentV3Service.doBatchTransfer(transferReqDTO, SecurityUtils.getUserId());
            }

            walletBillRecordMapper.insert(walletBillRecordDO);
            //不需要更新结算单了，此时提现的金额和计算单上的金额不一致


 src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java

@@ -6,6 +6,7 @@
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.constant.LockConstants;
import com.mzl.flower.dto.request.payment.*;
import com.mzl.flower.dto.response.payment.OrderSettlementDTO;
import com.mzl.flower.dto.response.payment.OrderSettlementDetailDTO;
@@ -27,8 +28,11 @@
import com.mzl.flower.mapper.wallet.WalletBillRecordMapper;
import com.mzl.flower.mapper.wallet.WalletMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.service.wallet.WalletService;
import com.mzl.flower.utils.UUIDGenerator;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,6 +44,7 @@
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;

@Slf4j
@Service
@@ -96,6 +101,12 @@

    @Autowired
    private WalletBillRecordDetailMapper walletBillRecordDetailMapper;

    @Autowired
    private WalletService walletService;

    @Autowired
    RedissonClient redissonClient;

    public Page<OrderSettlementListDTO> selectSettlementList(Page page, OrderSettlementQueryDTO dto){
        dto.setStartDate(parseLocalDateTime(dto.getStartDateStr(), true));
@@ -759,34 +770,36 @@
            //旧逻辑转账的时候才会标记状态为结算中
            //新逻辑不是立即转账。不走结算后转账逻辑。此时没有转账时间、openID、转账ID、转账明细ID，直接标记结算状态完成，存金额到钱包中
            settlement.setStatus(Constants.SETTLEMENT_STATUS.COMPLETED.name());

            settlementMapper.insert(settlement);

            WalletDO walletDO = walletService.getCurrentSupplier();
            if (null == walletDO) {
                throw new ValidationException("钱包不能为空");
            }
            RLock lock = redissonClient.getLock(String.format(LockConstants.WALLET_ID_KEY, walletDO.getId()));
            try {
                if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
                    try {
                        WalletDO walletDOInfo = walletService.getCurrentSupplier();
            //增加供应商结算金额保存到钱包
            walletBillRecord.setSupplierId(s.getId());
            walletBillRecord.setSettlementId(settlement.getId());
            walletBillRecord.setType(Constants.BILL_CHANGE_TYPE.settlement.name());
            walletBillRecord.setMethod(Constants.BILL_CHANGE_METHOD.add.name());
            WalletDO walletDOInfo = walletMapper.getTotalAmount(s.getUserId());
            if (ObjectUtils.isEmpty(walletDOInfo)) {
                // 新增钱包
                WalletDO walletDO = new WalletDO();
                walletDO.setUserId(s.getUserId());
                walletDO.setSupplierId(s.getId());
                walletDO.setTotalAmount(BigDecimal.ZERO);
                walletMapper.insert(walletDO);
                walletBillRecord.setOriginalAmount(BigDecimal.ZERO);
                walletBillRecord.setChangeAmount(settlementAmount);
                walletBillRecord.setBalance(settlementAmount);
            }else{
                walletBillRecord.setOriginalAmount(walletDOInfo.getTotalAmount());
                walletBillRecord.setChangeAmount(settlementAmount);
                walletBillRecord.setBalance(walletDOInfo.getTotalAmount().add(settlementAmount));
                //更新钱包
                walletDOInfo.setTotalAmount(walletBillRecord.getBalance());
                walletMapper.updateById(walletDOInfo);
            }
            walletBillRecordMapper.insert(walletBillRecord);
                    } finally {
                        lock.unlock();
                    }
                }
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }

        }