From 7481c7a9d40f10935f09274a6bef9df4489e2744 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 29 Sep 2024 10:57:23 +0800 Subject: [PATCH] fix --- .../iformall/service/impl/WxEnergyServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index 7ab24c089..f9e0bd0bf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -825,12 +825,15 @@ public class WxEnergyServiceImpl implements WxEnergyService { if (null != record.getFormulaList() && record.getFormulaList().size() > 0 ) { record.setFormulaListStr(JSON.toJSONString(record.getFormulaList())); } - WxShop shop = wxShopService.getById(fessShop.getShopId()); - if (StringUtils.isBlank(shop.getPulicRate())) { - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数"); - } - wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea()); + String pulicRate = "1"; + if (fessShop.getIsPublic() == EnumYesOrNo.YES.getCode()) { + if (StringUtils.isBlank(shop.getPulicRate())) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数"); + } + pulicRate = shop.getPulicRate(); + } + wxEnergyHelper.testCalcute(record.getFormula(),pulicRate,shop.getOperationArea()); wxEnergyFeesShopMapper.updateById(record); }