feat:更新线下支付接口，RedisCache添加循环取锁方法，其他

yupeng

2025-02-12 d83e8e364048387bfa5c4c1fd07002940abdf63f

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

@@ -1,28 +1,39 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.constant.AmountConstant;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.mapper.TBillMapper;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.jsonwebtoken.lang.Assert;
import com.ruoyi.system.service.*;
import com.taxi591.bankapi.dto.ChargeBillRequest;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * <p>
@@ -33,6 +44,7 @@
 * @since 2025-01-17
 */
@Service
@Slf4j
public class TBillServiceImpl extends ServiceImpl<TBillMapper, TBill> implements TBillService {

    @Autowired
@@ -44,6 +56,20 @@
    @Autowired
    TBillDetailService tBillDetailService;

    @Autowired
    TFlowManagementService tFlowManagementService;

    @Autowired
    TBankFlowService tBankFlowService;

    @Autowired
    TBillConfirmService tBillConfirmService;

    @Autowired
    TPayOrderService tPayOrderService;

    @Autowired
    TOrderBillService orderBillService;

    public PageInfo<TBillDto> queryPage(TBillQuery query){
        PageInfo<TBill> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -52,14 +78,123 @@
    }


    private static final String[] ignorePro = {"payableFeesMoney","payableFeesPenalty","payFeesMoney","outstandingMoney"};

    /**
     * 传的金额
     *
     * 更新类型  1.仅更新信息及状态 2.更新信息、金额及状态
     * 为1时，仅更新非金额之外的信息及状态
     * 为2时，传入的金额，是需要增加或减少的金额，非计算后的金额
     * 当账单状态为已缴费后，不做任何更新
     * @param tBill
     * @param type
     * @return
     */
    public Boolean lockAndUpdateInfo(TBill tBill){
    public TBill lockAndUpdateInfo(@NotNull TBill tBill, @NotNull Integer type){
        if (StringUtils.isEmpty(tBill.getId())){
            throw new ServiceException("账单主键ID不能为空");
        }
        String requestId = UUID.fastUUID().toString();
        String lockkey = CacheConstants.BILL_UPDATE_LOCK_KEY + tBill.getId();
        boolean isok = redisCache.trylockLoop(lockkey, requestId, 60);
        if (isok){
            try {
                TBill save = new TBill();
                TBill presist = getById(tBill.getId());
                //如果账单是已缴费状态，本方法不再进行更新账单
                if (presist.getPayFeesStatus().equals("3")){
                    throw new ServiceException("该账单已缴费完成");
                }
                switch (type){
                    // 仅更新除金额字段外的属性
                    case 1:
                    {
                        BeanUtils.copyProperties(tBill,save,ignorePro);
                    }
                    break;
                    // 计算并更新金额、存入违约金、已缴费金额会自动计算欠费，如计算出无欠费则会更新状态为已缴费
                    case 2:
                    {
                        BeanUtils.copyProperties(tBill,save);

                        // 处理应缴费 ，注意一般情况下不会修改该金额
                        if (tBill.getPayableFeesMoney()!=null){
                            presist.setPayableFeesMoney(presist.getPayableFeesMoney()!=null?presist.getPayableFeesMoney():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayableFeesMoney().add(tBill.getPayableFeesMoney());
                            save.setPayableFeesMoney(result);
                            //计算欠费 = 应缴费(新)+违约金-已缴费
                            BigDecimal outstand = save.getPayableFeesMoney()
                                    .add(presist.getPayableFeesPenalty())
                                    .subtract(presist.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                        }
                        //处理应缴违约金 ，不能和缴费金额一起传
                        if (tBill.getPayableFeesPenalty()!=null){
                            presist.setPayableFeesPenalty(presist.getPayableFeesPenalty()!=null?presist.getPayableFeesPenalty():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayableFeesPenalty().add(tBill.getPayableFeesPenalty());
                            save.setPayableFeesPenalty(result);
                            //计算欠费 = 应缴费+违约金（新）-已缴费
                            BigDecimal outstand = presist.getPayableFeesMoney()
                                    .add(save.getPayableFeesPenalty())
                                    .subtract(presist.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                        }
                        //处理缴费金额
                        if (tBill.getPayFeesMoney()!=null){
                            presist.setPayFeesMoney(presist.getPayFeesMoney()!=null?presist.getPayFeesMoney():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayFeesMoney().add(tBill.getPayFeesMoney());
                            save.setPayFeesMoney(result);
                            //缴费后的欠费 =(应缴费+违约金)-已缴费金额
                            BigDecimal outstand = save.getPayableFeesMoney()
                                    .add(presist.getPayableFeesPenalty())
                                    .subtract(save.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                            //抵扣金额就是缴费金额
                            save.setDeductionMoney(tBill.getPayableFeesMoney());
                            save.setPreOutstand(presist.getOutstandingMoney());
                            if (outstand.compareTo(BigDecimal.ZERO)<=0){
                                save.setPayFeesStatus("3");
                            }
                        }
                    }
                    break;

                }
                updateById(save);
                return save;
            }finally {
                redisCache.unlock(lockkey,requestId);
            }
        }
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean lockAndUpdateByAmountBatch(List<TBill> bills, BigDecimal amount, Consumer<TBill> consumer) {
        List<TBill> result = bills.stream().sorted(Comparator.comparing(TBill::getCreateTime))
                .collect(Collectors.toList());
        BigDecimal remain = amount;
        for (TBill bill : result) {
            //如果剩余金额小于账单欠费金额，则
            if (remain.compareTo(bill.getOutstandingMoney())<=0){
                TBill param = new TBill();
                param.setId(bill.getId());
                param.setPayFeesMoney(remain);
                TBill tBill = lockAndUpdateInfo(param, 2);
                if (consumer!=null){
                    consumer.accept(tBill);
                }
                break;
            }
            remain = remain.subtract(bill.getOutstandingMoney());
            TBill param = new TBill();
            param.setId(bill.getId());
            param.setPayFeesMoney(bill.getOutstandingMoney());
            TBill tBill = lockAndUpdateInfo(param, 2);
            if (consumer!=null){
                consumer.accept(tBill);
            }
        }
        return true;
    }
@@ -79,5 +214,101 @@
        }
    }

    @Override
    public boolean checkOfflinePay(OfflinePayCheckDto dto) {
        List<TBill> tBills = listByIds(dto.getBillIds());
        TBillConfirm confirm = tBillConfirmService.getById(dto.getConfirmId());
        lockAndUpdateByAmountBatch(tBills,dto.getAmount(),(bill)->{
            TFlowManagement save = new TFlowManagement();
            save.setPayType(3);
            save.setPayer(dto.getPayer());
            save.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
            save.setBankSerialNumber(dto.getBankSerilNum());
            save.setFlowType(2);
            save.setPaymentBillId(bill.getId());
            save.setDeductionMoney(bill.getDeductionMoney());
            save.setFlowMoney(dto.getAmount());
            save.setRemainingMoney(bill.getOutstandingMoney());
            save.setPreOutstand(bill.getPreOutstand());
            tFlowManagementService.save(save);
        });
        TBankFlow bankFlow = new TBankFlow();
        bankFlow.setPayType(3);
        bankFlow.setPayer(dto.getPayer());
        bankFlow.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
        bankFlow.setBankSerialNumber(dto.getBankSerilNum());
        bankFlow.setFlowMoney(dto.getAmount());
        bankFlow.setFlowStatus(1);
        tBankFlowService.save(bankFlow);
        return false;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void completePay(ChargeBillRequest billRequest) {
        String orderNo = billRequest.getMessage().getInfo().getInput1();
        String uuid = UUID.fastUUID().toString();
        boolean lock = redisCache.trylockLoop(CacheConstants.COMPLETE_PAY_LOCK_KEY + orderNo, uuid, 60);
        if (lock){
            TPayOrder order = tPayOrderService.getById(orderNo);
            if (order==null){
                throw new ServiceException("订单不存在");
            }
            if (StringUtils.isNotEmpty(order.getPayNo())){
                log.info("订单号已处理：{}",orderNo);
                return;
            }
            /**
             * 更新订单状态
             */
            TPayOrder save = new TPayOrder();
            save.setId(order.getId());
            save.setStatus(1);
            save.setPayNo(billRequest.getMessage().getInfo().getTraceNo());
            save.setPayType(billRequest.getMessage().getHead().getChannel());
            try {
                save.setPayTime(DateUtils.parseDate(billRequest.getMessage().getHead().getTimeStamp(),"yyyyMMddHHmmssSSS"));
            } catch (ParseException e) {
                throw new ServiceException("日期格式化错误");
            }
            save.setCallbackTime(new Date());
            BigDecimal payAmount = new BigDecimal(billRequest.getMessage().getInfo().getPayBillAmt());
            save.setActPayAmount(payAmount
                    .multiply(AmountConstant.b100).longValue());
            save.setStatus(1);
            save.setPayInfo(billRequest.getMessage().toString());
            tPayOrderService.updateById(save);
            /**
             * 更新账单状态
             */
            List<TOrderBill> orderBills = orderBillService.getByOrderNo(order.getId());
            List<TBill> bills = orderBills.stream().map(ob -> getById(ob.getBillId())).collect(Collectors.toList());
            lockAndUpdateByAmountBatch(bills,payAmount,(bill)->{
                TFlowManagement saveFlow = new TFlowManagement();
                saveFlow.setPayType(1);
                saveFlow.setPayer(order.getUserId());
                saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
                saveFlow.setBankSerialNumber(save.getPayNo());
                saveFlow.setFlowType(2);
                saveFlow.setPaymentBillId(bill.getId());
                saveFlow.setDeductionMoney(bill.getDeductionMoney());
                saveFlow.setFlowMoney(payAmount);
                saveFlow.setRemainingMoney(bill.getOutstandingMoney());
                saveFlow.setPreOutstand(bill.getPreOutstand());
                tFlowManagementService.save(saveFlow);
            });
            TBankFlow bankFlow = new TBankFlow();
            bankFlow.setPayType(1);
            bankFlow.setPayer(order.getUserId());
            bankFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
            bankFlow.setBankSerialNumber(save.getPayNo());
            bankFlow.setFlowMoney(payAmount);
            bankFlow.setFlowStatus(1);
            tBankFlowService.save(bankFlow);

        }

    }


}