diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java index 90ebd5782..5377ac6d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java @@ -90,6 +90,14 @@ public class WxEnergyMeterReading extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="表类型EnumEnergyMeterType",name="meterId") private Integer meterType; + @TableField(exist = false) + private String meterTypeName; + public String getMeterTypeName() { + if (null != meterType) { + return EnumEnergyMeterType.getEnum(meterType).getMessage(); + } + return null; + } @io.swagger.annotations.ApiModelProperty(value="表倍率",name="meterRate") private String meterRate; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java index 325b237be..8d5ed2060 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java @@ -20,5 +20,5 @@ public interface WxMallFloorMapper extends CommonMapper { String getAllPublicAreaSum(WxMallFloor record); - Map getBuildingPublicAreaSum(WxMallFloor record); + List getBuildingPublicAreaSum(WxMallFloor record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 57c42ed17..be6d9d978 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -759,7 +759,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD @Override public void deleteEnergyReadingBills(WxBillDaily wxBillDaily) { - wxBillDailyMapper.deleteEnergyReadingBills(wxBillDaily.getEnergyReadingCalcuteId(), wxBillDaily.getTenantId());; + wxBillDailyMapper.deleteEnergyReadingBills(wxBillDaily.getEnergyReadingCalcuteId(), wxBillDaily.getTenantId()); } } 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 8960db70d..6e9236634 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -893,7 +893,13 @@ public class WxEnergyServiceImpl implements WxEnergyService { try { //用户表账单 WxMerchant merchant = shopMerchantMap.get(mr.getShopId()); + if (null == merchant) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"铺位["+mr.getShopNumber()+"]未找到出租商户"); + } WxEnergyMeter meter = meterMap.get(mr.getMeterId()); + if (null == meter) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"表["+mr.getMeterName()+"]不存在"); + } WxShop shop = shopMap.get(mr.getShopId()); WxBillDaily userBill = mr.generateUserBill(record, merchant, user, meter); userBill.setEnergyFeesId(fees.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index 7e506b0af..b1ff649fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -94,7 +94,22 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { @Override public Map getBuildingPublicAreaSum(WxMallFloor record) { - return wxMallFloorMapper.getBuildingPublicAreaSum(record); + List buildingPulibAreaList = wxMallFloorMapper.getBuildingPublicAreaSum(record); + if (null != buildingPulibAreaList && buildingPulibAreaList.size() > 0 ) { + Map buildinMap = new HashMap(); + for (int i = 0 ; i < buildingPulibAreaList.size() ; i++) { + Map bup = buildingPulibAreaList.get(i); + BigDecimal are = (BigDecimal)bup.get("area"); + if (null != are) { + buildinMap.put((Long)bup.get("building_id"), are.toPlainString()); + }else { + buildinMap.put((Long)bup.get("building_id"), "0"); + } + + } + return buildinMap; + } + return null; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 86e4dbbea..d1f26d4d5 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -103,13 +103,13 @@