Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
97f621bb8e
Se han modificado 6 ficheros con 34 adiciones y 5 borrados
  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 Ver fichero

@@ -90,6 +90,14 @@ public class WxEnergyMeterReading extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="表类型EnumEnergyMeterType",name="meterId") @io.swagger.annotations.ApiModelProperty(value="表类型EnumEnergyMeterType",name="meterId")
private Integer meterType; 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") @io.swagger.annotations.ApiModelProperty(value="表倍率",name="meterRate")
private String meterRate; private String meterRate;


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java Ver fichero

@@ -20,5 +20,5 @@ public interface WxMallFloorMapper extends CommonMapper<WxMallFloor, String> {
String getAllPublicAreaSum(WxMallFloor record); 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 Ver fichero

@@ -759,7 +759,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD


@Override @Override
public void deleteEnergyReadingBills(WxBillDaily wxBillDaily) { 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 Ver fichero

@@ -893,7 +893,13 @@ public class WxEnergyServiceImpl implements WxEnergyService {
try { try {
//用户表账单 //用户表账单
WxMerchant merchant = shopMerchantMap.get(mr.getShopId()); 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()); 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()); WxShop shop = shopMap.get(mr.getShopId());
WxBillDaily userBill = mr.generateUserBill(record, merchant, user, meter); WxBillDaily userBill = mr.generateUserBill(record, merchant, user, meter);
userBill.setEnergyFeesId(fees.getId()); userBill.setEnergyFeesId(fees.getId());


+ 16
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java Ver fichero

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


@Override @Override
public Map<Long, String> getBuildingPublicAreaSum(WxMallFloor record) { 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 @Override


+ 2
- 2
mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml Ver fichero

@@ -103,13 +103,13 @@
</select> </select>
<select id="getAllPublicAreaSum" parameterType="com.iformall.domain.po.WxMallFloor" resultType="string"> <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 from wx_mall_floor
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>
<select id="getBuildingPublicAreaSum" parameterType="com.iformall.domain.po.WxMallFloor" resultType="hashmap"> <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 from wx_mall_floor
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
group by building_id group by building_id


Cargando…
Cancelar
Guardar