winter 1 год назад
Родитель
Сommit
8ade138163
2 измененных файлов: 25 добавлений и 2 удалений
  1. +21
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileDeposit.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java

+ 21
- 0
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<WxShop> shopList;
public List<Long> getShopIdList() {
if (null != shopList && shopList.size() > 0) {
List<Long> shopIdList = new ArrayList<Long>();
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;
}
}

+ 4
- 2
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<Long> 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;


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