From 6eaa3fec441392e59c411b1aed33fd643e15280c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:40:12 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index dd43535..996410a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -18,10 +18,7 @@
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.query.TInvoiceToBillQuery;
import com.ruoyi.system.service.*;
-import com.ruoyi.system.vo.TBillVO;
import com.taxi591.bankapi.dto.ChargeBillRequest;
-import com.tencentcloudapi.sms.v20190711.SmsClient;
-import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
@@ -31,12 +28,15 @@
import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
-import java.util.*;
-import java.util.stream.Collectors;
import java.math.BigDecimal;
import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
/**
* <p>
@@ -171,7 +171,7 @@
BigDecimal result = presist.getPayFeesMoney().add(tBill.getPayFeesMoney());
save.setPayFeesMoney(result);
//缴费后的欠费 =(应缴费+违约金)-已缴费金额
- BigDecimal outstand = save.getPayableFeesMoney()
+ BigDecimal outstand = presist.getPayableFeesMoney()
.add(presist.getPayableFeesPenalty())
.subtract(save.getPayFeesMoney());
save.setOutstandingMoney(outstand);
@@ -243,7 +243,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public boolean checkOfflinePay(OfflinePayCheckDto dto) {
- TBankFlow bankflow = tBankFlowService.getById(dto.getTBankFlow().getId());
+ TBankFlow bankflow = tBankFlowService.getById(dto.getFlowId());
TBillDto bill = getDetailByBillId(dto.getBillId());
if (bankflow.getRemainingMoney().compareTo(BigDecimal.ZERO)<=0){
throw new ServiceException("该流水已无可抵扣剩余金额");
@@ -259,8 +259,8 @@
TBill billSave = new TBill();
billSave.setId(bill.getId());
billSave.setPayFeesMoney(dto.getAmount());
- billSave.setBankSerialNumber(dto.getTBankFlow().getBankSerialNumber());
- billSave.setPayFeesTime(dto.getTBankFlow().getPayTime());
+ billSave.setBankSerialNumber(bankflow.getBankSerialNumber());
+ billSave.setPayFeesTime(bankflow.getPayTime());
billSave.setVoucher(dto.getVoucher());
billSave.setPayFeesType(2);
TBill back = lockAndUpdateInfo(billSave, 2);
@@ -275,8 +275,8 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
- save.setPayTime(dto.getTBankFlow().getPayTime());
- save.setBankSerialNumber(dto.getTBankFlow().getBankSerialNumber());
+ save.setPayTime(bankflow.getPayTime());
+ save.setBankSerialNumber(bankflow.getBankSerialNumber());
save.setFlowType(2);
save.setPaymentBillId(back.getId());
save.setDeductionMoney(back.getDeductionMoney());
@@ -452,7 +452,10 @@
TBill back = null;
TBankFlow bankflow = null;
if (dto.getPayType()==1){
- bankflow = tBankFlowService.getById(dto.getTBankFlow().getId());
+ if (StringUtils.isEmpty(dto.getFlowId())){
+ throw new ServiceException("银行流水不能为空");
+ }
+ bankflow = tBankFlowService.getById(dto.getFlowId());
TBillDto bill = getDetailByBillId(dto.getBillId());
if (bankflow.getRemainingMoney().compareTo(BigDecimal.ZERO)<=0){
throw new ServiceException("该流水已无可抵扣剩余金额");
@@ -469,8 +472,8 @@
TBill billSave = new TBill();
billSave.setId(bill.getId());
billSave.setPayFeesMoney(dto.getAmount());
- billSave.setBankSerialNumber(dto.getTBankFlow().getBankSerialNumber());
- billSave.setPayFeesTime(dto.getTBankFlow().getPayTime());
+ billSave.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
+ billSave.setPayFeesTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
billSave.setVoucher(dto.getVoucher());
billSave.setPayFeesType(2);
back = lockAndUpdateInfo(billSave, 2);
@@ -486,8 +489,8 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
- save.setPayTime(dto.getTBankFlow().getPayTime());
- save.setBankSerialNumber(dto.getTBankFlow().getBankSerialNumber());
+ save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
+ save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
save.setFlowType(dto.getPayType()==1?2:1);
save.setPaymentBillId(back.getId());
save.setDeductionMoney(back.getDeductionMoney());
--
Gitblit v1.7.1