From 917a88a4841da725db10a7a8cbaf22458abfa342 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 29 八月 2026 01:56:28 +0800
Subject: [PATCH] fix(srm): 修复简易版确认中标投标金额为空时系统异常
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
index f8ae67f..4865831 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/tender/SrmTenderProjectServiceImpl.java
@@ -7,6 +7,7 @@
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderCreateReqDTO;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderMaterialSaveReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPageReqVO;
import cn.iocoder.yudao.module.srm.controller.admin.tender.vo.SrmTenderProjectPartialUpdateReqVO;
@@ -18,6 +19,7 @@
import cn.iocoder.yudao.module.srm.enums.BidStatusEnum;
import cn.iocoder.yudao.module.srm.enums.ErrorCodeConstants;
import cn.iocoder.yudao.module.srm.enums.TenderStatusEnum;
+import cn.iocoder.yudao.module.srm.service.apply.SrmSupplierApplyService;
import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.starter.annotation.LogRecord;
@@ -41,6 +43,11 @@
@Slf4j
public class SrmTenderProjectServiceImpl implements SrmTenderProjectService {
+ /**
+ * 鎷涙爣椤圭洰璧勮川瑕佹眰闄勪欢鐨勪笟鍔¤褰曠被鍨嬶紝瀵瑰簲 {@link cn.iocoder.yudao.module.system.enums.storage.StorageRecordTypeEnum#SRM_TENDER_PROJECT}
+ */
+ public static final String TENDER_PROJECT_RECORD_TYPE = "srm_tender_project";
+
@Resource
private SrmTenderProjectMapper tenderProjectMapper;
@Resource
@@ -60,8 +67,13 @@
private MdmItemApi mdmItemApi;
@Resource
private ErpPurchaseOrderApi erpPurchaseOrderApi;
+ @Resource
+ private SrmSupplierApplyService supplierApplyService;
+ @Resource
+ private StorageAttachmentApi storageAttachmentApi;
@Override
+ @Transactional(rollbackFor = Exception.class)
public Long createTenderProject(SrmTenderProjectSaveReqVO createReqVO) {
SrmTenderProjectDO project = BeanUtils.toBean(createReqVO, SrmTenderProjectDO.class);
project.setTenderStatus(TenderStatusEnum.DRAFT.getCode());
@@ -69,10 +81,15 @@
project.setBiddingMode(tenderConfigService.getConfig().getDefaultBiddingMode());
}
tenderProjectMapper.insert(project);
+ // 缁戝畾璧勮川瑕佹眰闄勪欢
+ if (CollUtil.isNotEmpty(createReqVO.getBlobIds())) {
+ storageAttachmentApi.bindAttachments("file", TENDER_PROJECT_RECORD_TYPE, project.getId(), createReqVO.getBlobIds());
+ }
return project.getId();
}
@Override
+ @Transactional(rollbackFor = Exception.class)
@LogRecord(type = LOG_TENDER_TYPE, subType = LOG_TENDER_UPDATE_SUB_TYPE,
bizNo = "{{#updateReqVO.id}}", success = LOG_TENDER_UPDATE_SUCCESS)
public void updateTenderProject(SrmTenderProjectSaveReqVO updateReqVO) {
@@ -84,6 +101,8 @@
SrmTenderProjectDO updateObj = BeanUtils.toBean(updateReqVO, SrmTenderProjectDO.class);
updateObj.setTenderStatus(status); // 鐘舵�佷笉鍏佽鍓嶇浼犲叆瑕嗙洊
tenderProjectMapper.updateById(updateObj);
+ // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
+ storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
LogRecordContext.putVariable("tenderName", project.getTenderName());
LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
@@ -99,6 +118,8 @@
updateObj.setTenderDesc(updateReqVO.getTenderDesc());
updateObj.setQualificationRequirements(updateReqVO.getQualificationRequirements());
tenderProjectMapper.updateById(updateObj);
+ // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
+ storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
LogRecordContext.putVariable("tenderName", project.getTenderName());
LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
@@ -112,6 +133,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteTenderProject(Long id) {
SrmTenderProjectDO project = validateTenderExists(id);
if (!TenderStatusEnum.DRAFT.getCode().equals(project.getTenderStatus())) {
@@ -121,6 +143,8 @@
if (tenderBidMapper.countByTenderProjectId(id) > 0) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.TENDER_HAS_BIDS_CANNOT_DELETE);
}
+ // 鍒犻櫎璧勮川瑕佹眰闄勪欢
+ storageAttachmentApi.deleteAttachmentsByRecord(TENDER_PROJECT_RECORD_TYPE, id);
tenderMaterialMapper.deleteByTenderProjectId(id);
tenderProjectMapper.deleteById(id);
}
@@ -257,7 +281,8 @@
award.setBidId(bidId);
award.setAwardNo("SMP" + System.currentTimeMillis());
award.setAwardStatus(AwardStatusEnum.AWARDED.getCode());
- award.setAwardAmount(bid.getBidTotalAmount());
+ // 鎶曟爣閲戦涓虹┖鏃讹紝鍥為��鍒拌鎶曟爣涓嬫墍鏈夋姤浠蜂箣鍜岋紝閬垮厤 award_amount 涓虹┖瀵艰嚧鍏ュ簱澶辫触
+ award.setAwardAmount(resolveAwardAmount(bidId, bid.getBidTotalAmount()));
award.setAwardTime(LocalDateTime.now());
award.setApprovalTime(LocalDateTime.now());
bidAwardMapper.insert(award);
@@ -275,6 +300,20 @@
}
/**
+ * 瑙ｆ瀽涓爣閲戦锛氭姇鏍囬噾棰濅负绌烘椂锛屾眹鎬昏鎶曟爣涓嬫墍鏈夋姤浠�
+ */
+ private BigDecimal resolveAwardAmount(Long bidId, BigDecimal bidTotalAmount) {
+ if (bidTotalAmount != null) {
+ return bidTotalAmount;
+ }
+ List<SrmSupplierQuoteDO> quotes = supplierQuoteMapper.selectListByBidId(bidId);
+ return quotes.stream()
+ .map(SrmSupplierQuoteDO::getQuotePrice)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ /**
* 绠�鏄撴ā寮忥細鏍规嵁瀹氭爣淇℃伅鑷姩鐢熸垚閲囪喘璁㈠崟
*/
private void generatePurchaseOrderForSimple(SrmBidAwardDO award, SrmTenderProjectDO project) {
@@ -283,6 +322,9 @@
if (supplier == null) {
throw ServiceExceptionUtil.exception(ErrorCodeConstants.AWARD_SUPPLIER_NOT_SYNCED);
}
+
+ // 渚涘簲鍟嗘湭鍑嗗叆鍒欒嚜鍔ㄥ噯鍏ュ苟閫氳繃锛屼繚璇侀噰璐鍗曟祦绋嬪彲鐢�
+ supplierApplyService.ensureSupplierApproved(supplier.getId());
// 鏌ユ嫑鏍囩墿鏂�
List<SrmTenderMaterialDO> materials = tenderMaterialMapper
@@ -312,6 +354,7 @@
// 璁＄畻浠锋牸
BigDecimal totalQuoteAmount = quotes.stream()
.map(SrmSupplierQuoteDO::getQuotePrice)
+ .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal awardAmount = award.getAwardAmount() != null ? award.getAwardAmount() : totalQuoteAmount;
BigDecimal ratio = totalQuoteAmount.compareTo(BigDecimal.ZERO) > 0
@@ -325,17 +368,25 @@
if (quote == null) {
continue;
}
+ BigDecimal quotePrice = quote.getQuotePrice();
+ if (quotePrice == null) {
+ continue;
+ }
+ BigDecimal quantity = material.getQuantity();
+ if (quantity == null || quantity.compareTo(BigDecimal.ZERO) <= 0) {
+ continue;
+ }
MdmItemRespDTO mdmItem = itemMap.get(material.getProductId());
if (mdmItem == null) {
continue;
}
- BigDecimal materialTotal = quote.getQuotePrice().multiply(ratio);
- BigDecimal unitPrice = materialTotal.divide(material.getQuantity(), 4, RoundingMode.HALF_UP);
+ BigDecimal materialTotal = quotePrice.multiply(ratio);
+ BigDecimal unitPrice = materialTotal.divide(quantity, 4, RoundingMode.HALF_UP);
ErpPurchaseOrderCreateReqDTO.Item item = new ErpPurchaseOrderCreateReqDTO.Item();
item.setProductId(material.getProductId());
item.setProductUnitId(mdmItem.getUnitMeasureId());
item.setProductPrice(unitPrice);
- item.setCount(material.getQuantity());
+ item.setCount(quantity);
item.setTaxPercent(quote.getTaxRate());
item.setRemark("瀹氭爣缂栧彿: " + award.getAwardNo());
orderItems.add(item);
@@ -368,6 +419,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
@LogRecord(type = LOG_TENDER_TYPE, subType = LOG_TENDER_UPDATE_SUB_TYPE,
bizNo = "{{#updateReqVO.id}}", success = LOG_TENDER_UPDATE_SUCCESS)
public void updateTenderProjectPartial(SrmTenderProjectPartialUpdateReqVO updateReqVO) {
@@ -380,6 +432,8 @@
updateObj.setTenderDesc(updateReqVO.getTenderDesc());
updateObj.setQualificationRequirements(updateReqVO.getQualificationRequirements());
tenderProjectMapper.updateById(updateObj);
+ // 澧為噺鏇存柊璧勮川瑕佹眰闄勪欢
+ storageAttachmentApi.updateAttachments("file", TENDER_PROJECT_RECORD_TYPE, updateReqVO.getId(), updateReqVO.getBlobIds());
LogRecordContext.putVariable("tenderName", project.getTenderName());
LogRecordContext.putVariable("oldTenderDesc", project.getTenderDesc());
LogRecordContext.putVariable("newTenderDesc", updateReqVO.getTenderDesc());
--
Gitblit v1.9.3