From 83a2ac0bbf44d550a4d0add970d14623298a8574 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 08 一月 2026 16:10:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index a6e152e..610786b 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -21,6 +21,7 @@
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
@@ -222,12 +223,15 @@
try {
// 鎵ц鏂囦欢杩佺Щ锛堜娇鐢ㄥ師瀛愭搷浣滅‘淇濆畨鍏ㄦ�э級
- Files.move(
- Paths.get(tempFile.getTempPath()),
- formalFilePath,
- StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.ATOMIC_MOVE
- );
+// Files.move(
+// Paths.get(tempFile.getTempPath()),
+// formalFilePath,
+// StandardCopyOption.REPLACE_EXISTING,
+// StandardCopyOption.ATOMIC_MOVE
+// );
+ // 鍘熷瓙绉诲姩澶辫触锛屼娇鐢ㄥ鍒�+鍒犻櫎
+ Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
+ Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
// 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
@@ -268,6 +272,8 @@
// 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼
if(subtract.compareTo(BigDecimal.ZERO) <= 0){
ticketRegistrationMapper.deleteById(ticketRegistrations.get(0));
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(new LambdaQueryWrapper<PaymentRegistration>().eq(PaymentRegistration::getTicketRegistrationId, ticketRegistrations.get(0).getId()));
}else if(subtract.compareTo(BigDecimal.ZERO) > 0){
ticketRegistrations.get(0).setInvoiceAmount(subtract);
ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
@@ -280,6 +286,8 @@
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
+ salesLedgerProduct.setTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getFutureTicketsAmount()));
+ salesLedgerProduct.setTicketsNum(salesLedgerProduct.getQuantity().subtract(salesLedgerProduct.getFutureTickets()));
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
@@ -366,6 +374,10 @@
ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size());
}
}
+ ticketRegistrationIPage.getRecords().forEach(item -> {
+ // 宸蹭粯娆鹃噾棰� == 寰呬粯娆鹃噾棰�
+ item.setStatusName(item.getPaymentAmountTotal().compareTo(item.getInvoiceAmount()) == 0 ? "宸插畬鎴愪粯娆�" : "鏈畬鎴愪粯娆�");
+ });
return ticketRegistrationIPage;
}
@@ -380,7 +392,7 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
purchaseLedgerDto.setProductData(salesLedgerProducts);
List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
- .eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue())
+ .eq(CommonFile::getType, FileNameType.PURCHASE.getValue())
.eq(CommonFile::getCommonId, id));
purchaseLedgerDto.setSalesLedgerFiles(commonFiles);
return purchaseLedgerDto;
--
Gitblit v1.9.3