From 24cc037ec375b9adfed7b4963b5eb1aadcd38209 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 18 Nov 2025 11:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nu/entity/CgdInfoEntity.java | 6 ++- .../impl/NuInvoicingCgdMainServiceImpl.java | 45 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java index f20e5e34..6c1caa04 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java @@ -118,7 +118,6 @@ public class CgdInfoEntity implements Serializable { private java.lang.String medicationName; - // 格式化getter方法 public String getProcurementPrice() { return procurementPrice != null ? @@ -129,4 +128,9 @@ public class CgdInfoEntity implements Serializable { return arrivalPrice != null ? arrivalPrice.setScale(2, BigDecimal.ROUND_HALF_UP).toString() : null; } + + public String getTotalPrice() { + return totalPrice != null ? + totalPrice.setScale(2, BigDecimal.ROUND_HALF_UP).toString() : null; + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index b64c50fb..09b98431 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1,6 +1,7 @@ package com.nu.modules.cgd.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -25,6 +26,7 @@ import com.nu.modules.nubaseinfo.entity.NuBaseInfo; import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper; import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.mapper.QgdInfoMapper; +import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; import org.apache.commons.lang.StringUtils; @@ -88,6 +90,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = cgdInfoMapper.queryCgdInfoList(page,queryWrapper); + getOpeMediaAddress(); + for (NuInvoicingCgdInfo cgdInfo : list){ + BigDecimal arrivalPrice = cgdInfo.getArrivalPrice(); + BigDecimal procurementPrice = cgdInfo.getProcurementPrice(); + BigDecimal totalPrice = new BigDecimal("0"); + if(arrivalPrice != null){ + totalPrice = arrivalPrice.multiply(new BigDecimal(cgdInfo.getPurchaseQuantity())); + }else{ + totalPrice = procurementPrice.multiply(new BigDecimal(cgdInfo.getPurchaseQuantity())); + } + cgdInfo.setTotalPrice(totalPrice); + + if (cgdInfo.getMaterialImg() != null){ + cgdInfo.setMaterialImg(getImageNetUrl(cgdInfo.getMaterialImg())); + } + } IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); entityPage.setRecords(BeanUtil.copyToList(list, CgdInfoEntity.class)); return entityPage; } + /** + * 获取管理平台静态资源路径 + * + * @return + */ + private void getOpeMediaAddress() { + if (serverNetUrl == null || serverNetUrl.equals("")) { + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if (json != null) { + String configValue = json.getString("configValue"); + if (!configValue.endsWith("/")) { + configValue += "/"; + } + serverNetUrl = configValue; + } + } + } + + private String getImageNetUrl(String imageUrl) { + + return serverNetUrl + imageUrl; + } @Override public void reviewPurchaseOrder(CgdMainEntity cgdMainEntity) { NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();