winter 1 год назад
Родитель
Сommit
97f621bb8e
6 измененных файлов: 34 добавлений и 5 удалений
  1. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterReading.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  5. +16
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml

+ 8
- 0
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;


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java Просмотреть файл

@@ -20,5 +20,5 @@ public interface WxMallFloorMapper extends CommonMapper<WxMallFloor, String> {
String getAllPublicAreaSum(WxMallFloor record);
Map<Long, String> getBuildingPublicAreaSum(WxMallFloor record);
List<Map> getBuildingPublicAreaSum(WxMallFloor record);
}

+ 1
- 1
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());
}

}

+ 6
- 0
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());


+ 16
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java Просмотреть файл

@@ -94,7 +94,22 @@ public class WxMallFloorServiceImpl implements WxMallFloorService {

@Override
public Map<Long, String> getBuildingPublicAreaSum(WxMallFloor record) {
return wxMallFloorMapper.getBuildingPublicAreaSum(record);
List<Map> buildingPulibAreaList = wxMallFloorMapper.getBuildingPublicAreaSum(record);
if (null != buildingPulibAreaList && buildingPulibAreaList.size() > 0 ) {
Map<Long, String> buildinMap = new HashMap<Long, String>();
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


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml Просмотреть файл

@@ -103,13 +103,13 @@
</select>
<select id="getAllPublicAreaSum" parameterType="com.iformall.domain.po.WxMallFloor" resultType="string">
select sum((CAST(operating_area AS DECIMAL(20,4))) area
select sum(CAST(operating_area AS DECIMAL(20,4))) area
from wx_mall_floor
<include refid="dynamicWhereConditions"/>
</select>
<select id="getBuildingPublicAreaSum" parameterType="com.iformall.domain.po.WxMallFloor" resultType="hashmap">
select building_id, sum((CAST(operating_area AS DECIMAL(20,4))) area
select building_id, sum(CAST(operating_area AS DECIMAL(20,4))) area
from wx_mall_floor
<include refid="dynamicWhereConditions"/>
group by building_id


Загрузка…
Отмена
Сохранить