|
|
|
@@ -522,7 +522,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
//生成预览账单(补录第二步,第三步走编辑) |
|
|
|
if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null |
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { |
|
|
|
&& !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) { |
|
|
|
wxBillRentMapper.deletePreviewBill(record); |
|
|
|
//重新生成 |
|
|
|
List<WxBillRent> resultList = buildRent(null, record, EnumIsPreview.YES.getCode(),true); |
|
|
|
@@ -3256,7 +3256,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
needPay = sumTradeDailyBySameMonthDay(bq, wxRentContract.getMerchantId(), |
|
|
|
br.getStarttime(), DateUtils.getTimeAfterDays(-1, br.getEndtime())); |
|
|
|
} |
|
|
|
|
|
|
|
needPay = new BigDecimal(needPay).multiply(new BigDecimal(wxRentContract.getPayRatio())) |
|
|
|
.divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).intValue(); |
|
|
|
if (needPay > br.getNeedPay()) { |
|
|
|
Long newPay = Long.parseLong(String.valueOf(needPay)); |
|
|
|
br.setNeedPay(newPay); |
|
|
|
|