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

yupeng

2025-02-12 d83e8e364048387bfa5c4c1fd07002940abdf63f

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

 bankapi/pom.xml

@@ -32,33 +32,4 @@
            <version>${httpclient_version}</version>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>3.1.0</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>
</project>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java

@@ -23,8 +23,7 @@
    @PostMapping(value = "payCallback")
    public @ResponseBody String payCallback(HttpServletRequest request){
        CovertPayBackResult result = bankService.covertPayCallBack(request, (billRequest) -> {
            String orderno = billRequest.getMessage().getInfo().getInput1();

            tBillService.completePay(billRequest);
            return true;
        });
        return result.getBack();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java

@@ -4,12 +4,15 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,19 +34,28 @@
    @Autowired
    TBillService tBillService;

    @PreAuthorize("@ss.hasPermi('system:bill:list')")
    @PostMapping("list")
    @ApiOperation("分页查询账单列表")
    public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
        PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
        return R.ok(pageInfo);
    }

    @PreAuthorize("@ss.hasPermi('system:bill:add')")
    @PostMapping("add")
    @ApiOperation("新增账单")
    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
        tBillService.saveBill(bill);
        return R.ok();
    }


    @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
    @ApiOperation("确认线下缴费")
    @PostMapping("checkOfflinePay")
    public R checkOfflinePay(@Validated @RequestBody  OfflinePayCheckDto dto){
        tBillService.checkOfflinePay(dto);
        return R.ok();
    }


}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java

@@ -15,6 +15,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -48,23 +49,26 @@
        return R.ok(resp);
    }


    @ApiOperation(value = "线下支付")
    @PostMapping("offlinePay")
    @Transactional(rollbackFor = Exception.class)
    public R offlinePay(@Validated @RequestBody OfflinePayDto dto){
        List<TBill> tBills = tBillService.listByIds(dto.getBillIds());
        TBillConfirm confirm = new TBillConfirm();
        confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
        confirm.setVoucher(dto.getVoucher());
        confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
        tBillConfirmService.save(confirm);
        for (TBill tBill : tBills) {
            TBill save = new TBill();
            save.setId(tBill.getId());
            save.setPayFeesType(2);
            save.setVoucher(dto.getVoucher());
            save.setPayFeesStatus("2");
            tBillService.lockAndUpdateInfo(save);
            save.setConfirmId(confirm.getId());
            tBillService.lockAndUpdateInfo(save,1);
        }
        TBillConfirm confirm = new TBillConfirm();
        confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
        confirm.setVoucher(dto.getVoucher());
        confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
        tBillConfirmService.save(confirm);

        return R.ok();
    }


 ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java

@@ -41,4 +41,10 @@
     * 登录账户密码错误次数 redis key
     */
    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";


    public static final String BILL_UPDATE_LOCK_KEY = "bill_update_lock:";


    public static final String COMPLETE_PAY_LOCK_KEY = "complete_pay_lock:";
}

 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -289,6 +289,35 @@
    }

    /**
     * 尝试加锁
     *
     * @param lockKey   锁的key
     * @param requestId 锁的持有者标识符（如UUID）
     * @param expireTime 锁的过期时间（秒）
     * @return 加锁成功返回true，否则返回false
     */
    public boolean trylockLoop(String lockKey, String requestId,long expireTime) {
        String lockKeyWithPrefix = LOCK_PREFIX + lockKey;
        // 使用SET命令的NX和PX选项来加锁
        Boolean result = false;
        int num = 50;
        while (num>0){
            result = redisTemplate.opsForValue().setIfAbsent(lockKeyWithPrefix, requestId, expireTime, TimeUnit.SECONDS);
            if (result){
                break;
            }
            try {
                TimeUnit.MILLISECONDS.sleep(200);
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
            num--;
        }
        return result;
    }


    /**
     * 解锁
     *
     * @param lockKey   锁的key

 ruoyi-system/pom.xml

@@ -74,7 +74,11 @@
            <groupId>org.apache.tomcat.embed</groupId>
            <artifactId>tomcat-embed-core</artifactId>
        </dependency>

        <dependency>
            <groupId>org.taxi591</groupId>
            <artifactId>bankapi</artifactId>
            <version>1.0.0-SNAPSHOT</version>
        </dependency>
    </dependencies>

</project>

 ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java

New file
@@ -0,0 +1,40 @@
package com.ruoyi.system.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
public class OfflinePayCheckDto implements Serializable {
    /**
     * 账单ID列表
     */
    @ApiModelProperty("账单ID列表，管理员处理后的")
    @NotEmpty(message = "账单列表不能为空")
    private List<String> billIds;
    @ApiModelProperty("实际支付金额")
    @NotNull(message = "实际支付金额不能为空")
    private BigDecimal amount;

    @ApiModelProperty("确认单ID")
    @NotNull(message = "确认单ID不能为空")
    private String confirmId;

    @ApiModelProperty("银行流水号，用于生成流水")
    @NotEmpty(message = "银行流水号不能为空")
    private String bankSerilNum;

    @ApiModelProperty("支付人")
    private String payer;
    @ApiModelProperty("支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime payTime;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java

@@ -9,6 +9,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -36,15 +37,15 @@

    @ApiModelProperty(value = "流水金额")
    @TableField("flow_money")
    private Double flowMoney;
    private BigDecimal flowMoney;

    @ApiModelProperty(value = "抵扣金额")
    @TableField("deduction_money")
    private Double deductionMoney;
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remaining_money")
    private Double remainingMoney;
    private BigDecimal remainingMoney;

    @ApiModelProperty(value = "支付时间")
    @TableField("pay_time")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java

@@ -18,6 +18,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
import springfox.documentation.annotations.ApiIgnore;

/**
 * <p>
@@ -106,5 +107,19 @@
    @TableField("voucher")
    private String voucher;

    @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
    @TableField("confirm_id")
    private String confirmId;

    /**
     * 抵扣金额
     */
    @TableField(exist = false)
    private BigDecimal deductionMoney;
    /**
     * 抵扣前欠费金额
     */
    @TableField(exist = false)
    private BigDecimal preOutstand;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java

@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
@@ -42,5 +44,14 @@
    @TableField("voucher")
    private String voucher;

    @ApiModelProperty(value = "用户ID")
    @TableField("user_id")
    private String userId;

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java

@@ -51,6 +51,10 @@
    @TableField("deduction_money")
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "抵扣前欠费金额")
    @TableField("pre_outstand")
    private BigDecimal preOutstand;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remaining_money")
    private BigDecimal remainingMoney;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java

@@ -11,6 +11,7 @@

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -58,7 +59,7 @@

    @ApiModelProperty(value = "支付时间")
    @TableField("pay_time")
    private LocalDateTime payTime;
    private Date payTime;

    @ApiModelProperty(value = "支付方式")
    @TableField("pay_type")
@@ -74,15 +75,12 @@

    @ApiModelProperty(value = "支付的回调时间")
    @TableField("callback_time")
    private LocalDateTime callbackTime;
    private Date callbackTime;

    @ApiModelProperty(value = "订单创建时间")
    @TableField("create_time")
    private LocalDateTime createTime;
    @ApiModelProperty(value = "订单状态：0.待支付  1.已支付")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "订单更新时间")
    @TableField("update_time")
    private LocalDateTime updateTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java

@@ -2,10 +2,17 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.taxi591.bankapi.dto.ChargeBillRequest;

import java.math.BigDecimal;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;

/**
 * <p>
@@ -19,7 +26,31 @@

    PageInfo<TBillDto> queryPage(TBillQuery query);

    Boolean lockAndUpdateInfo(TBill save);
    /**
     *
     * 更新类型  1.仅更新信息及状态 2.更新金额及状态
     * 为1时，仅更新非金额之外的信息及状态
     * 为2时，传入的金额，是需要增加或减少的金额，非计算后的金额
     * 当账单状态为已缴费后，不做任何更新
     * @param tBill
     * @param type
     * @return
     */
    TBill lockAndUpdateInfo(TBill tBill,Integer type);

    /**
     * 批量对账单进行金额的分配
     * @param billIds
     * @param amount 支付的总金额，元
     * @param consumer 处理完账单后的回调，参数是处理完成后，最新的bill信息
     * @return
     */
    Boolean lockAndUpdateByAmountBatch(List<TBill> billIds, BigDecimal amount, Consumer<TBill> consumer);


    void saveBill(TbillSaveDto bill);

    boolean checkOfflinePay(OfflinePayCheckDto dto);

    void completePay(ChargeBillRequest billRequest);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TOrderBill;

import java.util.List;

/**
 * <p>
 * 订单表与账单的关联表 服务类
@@ -13,4 +15,6 @@
 */
public interface TOrderBillService extends IService<TOrderBill> {

    List<TOrderBill> getByOrderNo(String orderNo);

}

 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);

        }

    }


}

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

@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TOrderBillMapper;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.model.TOrderBill;
import com.ruoyi.system.service.TOrderBillService;
import org.springframework.stereotype.Service;

import javax.validation.constraints.NotEmpty;
import java.util.List;

/**
 * <p>
@@ -17,4 +23,9 @@
@Service
public class TOrderBillServiceImpl extends ServiceImpl<TOrderBillMapper, TOrderBill> implements TOrderBillService {

    @Override
    public List<TOrderBill> getByOrderNo(@NotEmpty String orderNo) {
        return list(new LambdaQueryWrapper<TOrderBill>().eq(TOrderBill::getOrderNo,orderNo));

    }
}