From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 49 ++++++++-----------------------------------------
1 files changed, 8 insertions(+), 41 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index afb9a31..e4c6b89 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -1,24 +1,16 @@
package cn.iocoder.yudao.module.erp.service.finance;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.payment.ErpFinancePaymentSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentItemDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
-import cn.iocoder.yudao.module.erp.enums.common.ErpBizTypeEnum;
-import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInService;
-import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService;
import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
@@ -34,8 +26,6 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
-
-// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
/**
* ERP 浠樻鍗� Service 瀹炵幇绫�
@@ -58,10 +48,6 @@
private ErpSupplierService supplierService;
@Resource
private ErpAccountService accountService;
- @Resource
- private ErpPurchaseInService purchaseInService;
- @Resource
- private ErpPurchaseReturnService purchaseReturnService;
@Resource
private AdminUserApi adminUserApi;
@@ -159,28 +145,22 @@
private List<ErpFinancePaymentItemDO> validateFinancePaymentItems(
Long supplierId,
List<ErpFinancePaymentSaveReqVO.Item> list) {
+ // 閲囪喘鍏ュ簱/閫�璐у姛鑳藉凡绉婚櫎锛屾殏鏃跺彧鏀寔鎵嬪姩褰曞叆浠樻鏄庣粏
return convertList(list, o -> BeanUtils.toBean(o, ErpFinancePaymentItemDO.class, item -> {
- if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.PURCHASE_IN.getType())) {
- ErpPurchaseInDO purchaseIn = purchaseInService.validatePurchaseIn(item.getBizId());
- Assert.equals(purchaseIn.getSupplierId(), supplierId, "渚涘簲鍟嗗繀椤荤浉鍚�");
- item.setTotalPrice(purchaseIn.getTotalPrice()).setBizNo(purchaseIn.getNo());
- } else if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.PURCHASE_RETURN.getType())) {
- ErpPurchaseReturnDO purchaseReturn = purchaseReturnService.validatePurchaseReturn(item.getBizId());
- Assert.equals(purchaseReturn.getSupplierId(), supplierId, "渚涘簲鍟嗗繀椤荤浉鍚�");
- item.setTotalPrice(purchaseReturn.getTotalPrice().negate()).setBizNo(purchaseReturn.getNo());
- } else {
- throw new IllegalArgumentException("涓氬姟绫诲瀷涓嶆纭細" + item.getBizType());
+ if (item.getPaymentPrice() == null) {
+ item.setPaymentPrice(BigDecimal.ZERO);
+ }
+ if (item.getTotalPrice() == null) {
+ item.setTotalPrice(BigDecimal.ZERO);
}
}));
}
private void updateFinancePaymentItemList(Long id, List<ErpFinancePaymentItemDO> newList) {
- // 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
List<ErpFinancePaymentItemDO> oldList = financePaymentItemMapper.selectListByPaymentId(id);
- List<List<ErpFinancePaymentItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ List<List<ErpFinancePaymentItemDO>> diffList = diffList(oldList, newList,
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
- // 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
if (CollUtil.isNotEmpty(diffList.get(0))) {
diffList.get(0).forEach(o -> o.setPaymentId(id));
financePaymentItemMapper.insertBatch(diffList.get(0));
@@ -191,23 +171,10 @@
if (CollUtil.isNotEmpty(diffList.get(2))) {
financePaymentItemMapper.deleteByIds(convertList(diffList.get(2), ErpFinancePaymentItemDO::getId));
}
-
- // 绗笁姝ワ紝鏇存柊閲囪喘鍏ュ簱銆侀��璐х殑浠樻閲戦鎯呭喌
- updatePurchasePrice(CollectionUtils.newArrayList(diffList));
}
private void updatePurchasePrice(List<ErpFinancePaymentItemDO> paymentItems) {
- paymentItems.forEach(paymentItem -> {
- BigDecimal totalPaymentPrice = financePaymentItemMapper.selectPaymentPriceSumByBizIdAndBizType(
- paymentItem.getBizId(), paymentItem.getBizType());
- if (ErpBizTypeEnum.PURCHASE_IN.getType().equals(paymentItem.getBizType())) {
- purchaseInService.updatePurchaseInPaymentPrice(paymentItem.getBizId(), totalPaymentPrice);
- } else if (ErpBizTypeEnum.PURCHASE_RETURN.getType().equals(paymentItem.getBizType())) {
- purchaseReturnService.updatePurchaseReturnRefundPrice(paymentItem.getBizId(), totalPaymentPrice.negate());
- } else {
- throw new IllegalArgumentException("涓氬姟绫诲瀷涓嶆纭細" + paymentItem.getBizType());
- }
- });
+ // 閲囪喘鍏ュ簱/閫�璐у姛鑳藉凡绉婚櫎锛屼笉鍐嶆洿鏂板叧鑱斾笟鍔￠噾棰�
}
@Override
--
Gitblit v1.9.3