From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index a32b6f6..d5875e3 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.AccountExpenseMapper;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.service.AccountExpenseService;
import com.ruoyi.basic.mapper.SupplierManageMapper;
@@ -17,18 +16,18 @@
import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
-import com.ruoyi.purchase.mapper.*;
+import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
+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;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.ReceiptPayment;
-import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
@@ -47,23 +46,16 @@
* @date 2025-05-15
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
public class PaymentRegistrationServiceImpl extends ServiceImpl<PaymentRegistrationMapper, PaymentRegistration> implements IPaymentRegistrationService {
- private PaymentRegistrationMapper paymentRegistrationMapper;
- private PurchaseLedgerMapper purchaseLedgerMapper;
-
- private SalesLedgerMapper salesLedgerMapper;
-
- private SupplierManageMapper supplierManageMapper;
-
- private SalesLedgerProductMapper salesLedgerProductMapper;
-
- private TicketRegistrationMapper ticketRegistrationMapper;
-
- private ProductRecordMapper productRecordMapper;
-
- private AccountExpenseService accountExpenseService;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+ private final SupplierManageMapper supplierManageMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+ private final TicketRegistrationMapper ticketRegistrationMapper;
+ private final ProductRecordMapper productRecordMapper;
+ private final AccountExpenseService accountExpenseService;
/**
* 鏌ヨ浠樻鐧昏
@@ -127,11 +119,12 @@
// 2. 澶勭悊璐︽埛鏀嚭
AccountExpense accountExpense = new AccountExpense();
accountExpense.setExpenseDate(purchaseLedger.getEntryDate());
- accountExpense.setExpenseType("0");
+ accountExpense.setExpenseType("4");
accountExpense.setSupplierName(purchaseLedger.getSupplierName());
accountExpense.setExpenseMoney(paymentRegistration.getCurrentPaymentAmount());
accountExpense.setExpenseDescribed("浠樻鏀嚭");
- accountExpense.setExpenseMethod("0");
+
+ accountExpense.setExpenseMethod(paymentRegistration.getPaymentMethod());
accountExpense.setBusinessId(paymentRegistration.getId());
accountExpense.setBusinessType(1);
accountExpense.setInputTime(new Date());
@@ -344,7 +337,6 @@
List<Long> supplierIds = suppliers.stream()
.map(SupplierManage::getId) // 鍏堣幏鍙朓nteger绫诲瀷鐨処D
.filter(Objects::nonNull) // 杩囨护鎺夊彲鑳界殑null鍊�
- .map(Integer::longValue) // 灏咺nteger杞崲涓篖ong
.collect(Collectors.toList());
// 鑾峰彇褰撴湀鐨勫紑濮嬪拰缁撴潫鏃ユ湡
--
Gitblit v1.9.3