From 2db54f1292c5c1007e83cee13a389a771c946f0c Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 21 Aug 2019 12:00:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E8=AE=BE=E7=BD=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/common/ErrorCode.java | 5 +++++ .../WxMerchantPowerBillConfigServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 3c412a77b..19ad4739e 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -494,6 +494,11 @@ public enum ErrorCode{ */ PICTURE_SIZE_EXCEED(40001, "图片超过2M限制"), + /** + * 电费生成配置 + */ + POWER_BILL_CONFIGU_NOT_FOUND(50001, "未配置电费账单生成规则"), + ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java index 3da43867c..96b771a2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantPowerBillConfigServiceImpl.java @@ -7,8 +7,11 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantPowerBillConfig; +import com.iformall.domain.po.WxPowerBillAutoConfig; +import com.iformall.enums.EnumPowerBillBuildWay; import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantPowerBillConfigMapper; +import com.iformall.mapper.WxPowerBillAutoConfigMapper; import com.iformall.service.WxMerchantPowerBillConfigService; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; @@ -34,6 +37,10 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill @Autowired WxMerchantMapper wxMerchantMapper; + @Autowired + WxPowerBillAutoConfigMapper wxPowerBillAutoConfigMapper; + + @Override public PageInfo listAsPage(WxMerchantPowerBillConfig record, Integer pageIndex, Integer pageSize) { @@ -48,8 +55,19 @@ public class WxMerchantPowerBillConfigServiceImpl implements WxMerchantPowerBill @Override @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) public ResultData saveOrUpdate(WxMerchantPowerBillConfig config) { + Date date = new Date(); if (config.getId() == null) { + //按电表计费 从配置中拉取单价 + if (config.getBuildWay().equals(EnumPowerBillBuildWay.PRICE.getCode())) { + WxPowerBillAutoConfig wxPowerBillAutoConfig = new WxPowerBillAutoConfig(); + wxPowerBillAutoConfig.setTenantId(config.getTenantId()); + WxPowerBillAutoConfig powerBillAutoConfig = wxPowerBillAutoConfigMapper.selectOne(wxPowerBillAutoConfig); + if (powerBillAutoConfig == null) { + return new ResultData(ErrorCode.POWER_BILL_CONFIGU_NOT_FOUND); + } + config.setPrice(powerBillAutoConfig.getUnitPrice()); + } WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(config.getMerchantId()); if (wxMerchant == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);