|
|
|
@@ -511,14 +511,15 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
|
|
|
|
List<Long> shopIds = wxPropertyContract.shopIdsByShop(); |
|
|
|
Map<Long, BigDecimal> shopAreaRateMap = wxPropertyContract.getRentShopAreaRate(); |
|
|
|
Map<Long, BigDecimal> shopAreaRateMap = wxPropertyContract.getRentShopArea(); |
|
|
|
if (null == shopAreaRateMap) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"无店铺信息"); |
|
|
|
} |
|
|
|
|
|
|
|
for (int i = 0 ; i < shopIds.size(); i++) { |
|
|
|
Long shopId = shopIds.get(i); |
|
|
|
BigDecimal shoprate = shopAreaRateMap.get(shopId); |
|
|
|
BigDecimal shoprentArea = shopAreaRateMap.get(shopId); |
|
|
|
BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxPropertyContract.getRentArea()),wxPropertyContract.getDecimalSize(),BigDecimal.ROUND_HALF_UP); |
|
|
|
|
|
|
|
WxAllBill wxBillDeposit = new WxAllBill(); |
|
|
|
wxBillDeposit.setId(idWorker.nextId()); |
|
|
|
@@ -668,7 +669,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
} |
|
|
|
|
|
|
|
List<Long> shopIdList = wxPropertyContract.shopIdsByShop(); |
|
|
|
Map<Long, BigDecimal> shopAreaRateMap = wxPropertyContract.getRentShopAreaRate(); |
|
|
|
Map<Long, BigDecimal> shopAreaRateMap = wxPropertyContract.getRentShopArea(); |
|
|
|
if (null == shopAreaRateMap) { |
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"无店铺信息"); |
|
|
|
} |
|
|
|
@@ -821,7 +822,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
for (int g = 0 ; g < shopIdList.size(); g ++ ){ |
|
|
|
WxAllBill rs = new WxAllBill(); |
|
|
|
Long sid = shopIdList.get(g); |
|
|
|
BigDecimal shoprate = shopAreaRateMap.get(sid); |
|
|
|
BigDecimal shoprentArea = shopAreaRateMap.get(sid); |
|
|
|
BigDecimal shoprate = shoprentArea.divide(new BigDecimal(wxPropertyContract.getRentArea()),wxPropertyContract.getDecimalSize(),BigDecimal.ROUND_HALF_UP); |
|
|
|
|
|
|
|
try { |
|
|
|
BeanUtils.copyProperties(rs, rb); |
|
|
|
rs.setId(idWorker.nextId()); |
|
|
|
|