diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java index 7e945c5ed..3a68c2ff7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java @@ -1,14 +1,21 @@ package com.iformall.domain.po; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; + +import java.util.ArrayList; import java.util.Date; import java.util.List; +import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang3.StringUtils; + /** */ @TableName(value = "wx_rent_contract_agile_deposit") @@ -40,4 +47,18 @@ public class WxRentContractAgileDeposit extends TenantEntity { @TableField(exist = false) private List shopList; + public List getShopIdList() { + if (null != shopList && shopList.size() > 0) { + List shopIdList = new ArrayList(); + for (int i = 0; i < shopList.size(); i++) { + WxShop shop = shopList.get(i); + if (null != shop && null != shop.getId()) { + shopIdList.add(shop.getId()); + } + } + return shopIdList; + } + return null; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 6692526bb..4ad9af35c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -549,8 +549,10 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { for (int i = 0 ; i < depositList.size(); i++) { WxRentContractAgileDeposit deposit = depositList.get(i); WxEnergyFees fees = typeMap.get(deposit.getFeesId()); - for (int j = 0 ; j < shopIdList.size(); j++ ) { - Long sid = shopIdList.get(j); + + List depositShopIdList = deposit.getShopIdList(); + for (int j = 0 ; j < depositShopIdList.size(); j++ ) { + Long sid = depositShopIdList.get(j); BigDecimal shoprentArea = shopAreaRateMap.get(sid); BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxRentContract.getRentArea()),Constant.default_long_decimal_size,BigDecimal.ROUND_HALF_UP); String cusName = null;