| @@ -184,7 +184,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||
| String price = ""; | |||
| String message = ""; | |||
| if(record.getServiceChargePayUpdate() != null){ | |||
| wxBillDaily.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); | |||
| Double l = Double.valueOf(record.getServiceChargePayUpdate())*100; | |||
| wxBillDaily.setServiceChargePay(l.intValue()); | |||
| }else{ | |||
| Long addpay = wxBillDaily.getPay(); | |||
| wxBillDaily.setPayDate(record.getPayDate()); | |||
| @@ -346,7 +347,23 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||
| @Override | |||
| public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDaily record) { | |||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); | |||
| List<WxBillDaily> billDailyList = wxBillDailyMapper.queryBillDailyList(record); | |||
| billDailyList.stream().forEach(e->{ | |||
| //手续费 = 合同应收+手续费+滞纳金 | |||
| if(e.getReceivePay() != null){ | |||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | |||
| BigDecimal servicePay; | |||
| if(e.getServiceChargePay() != null){ | |||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||
| }else{ | |||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||
| } | |||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | |||
| e.setRealReceivePay(realReceivePay); | |||
| e.setServiceChargePay(servicePay.intValue()); | |||
| } | |||
| }); | |||
| List<WxBillDailyExportVo> datalist = new ArrayList<>(); | |||
| WxBillDailyExportVo wxBillDailyExportVo; | |||
| for (int i = 0, size = billDailyList.size(); i < size; i++) { | |||
| @@ -179,7 +179,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService | |||
| String message = ""; | |||
| String price = ""; | |||
| if(record.getServiceChargePayUpdate() != null){ | |||
| wxBillOtherDeposit.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); | |||
| Double l = Double.valueOf(record.getServiceChargePayUpdate())*100; | |||
| wxBillOtherDeposit.setServiceChargePay(l.intValue()); | |||
| }else{ | |||
| Long addpay = wxBillOtherDeposit.getPay(); | |||
| wxBillOtherDeposit.setPayDate(record.getPayDate()); | |||
| @@ -180,7 +180,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { | |||
| String message = ""; | |||
| String price = ""; | |||
| if(record.getServiceChargePayUpdate() != null){ | |||
| wxBillOther.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); | |||
| Double l = Double.valueOf(record.getServiceChargePayUpdate())*100; | |||
| wxBillOther.setServiceChargePay(l.intValue()); | |||
| }else{ | |||
| Long addpay = wxBillOther.getPay(); | |||
| wxBillOther.setPayDate(record.getPayDate()); | |||
| @@ -161,7 +161,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||
| String message = ""; | |||
| String price = ""; | |||
| if(record.getServiceChargePayUpdate() != null){ | |||
| property.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); | |||
| Double l = Double.valueOf(record.getServiceChargePayUpdate())*100; | |||
| property.setServiceChargePay(l.intValue()); | |||
| }else{ | |||
| Long addpay = property.getPay(); | |||
| property.setRevenue(record.getRevenue()); | |||
| @@ -325,9 +326,25 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||
| @Override | |||
| public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillProperty wxBillProperty) { | |||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillProperty.getTenantId()); | |||
| String billName = wxBillProperty.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺物业账单" : "多经点位物业账单"; | |||
| List<WxBillProperty> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); | |||
| billPropertyList.stream().forEach(e->{ | |||
| //手续费 = 合同应收+手续费+滞纳金 | |||
| if(e.getReceivePay() != null){ | |||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | |||
| BigDecimal servicePay; | |||
| if(e.getServiceChargePay() != null){ | |||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||
| }else{ | |||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||
| } | |||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | |||
| e.setRealReceivePay(realReceivePay); | |||
| e.setServiceChargePay(servicePay.intValue()); | |||
| } | |||
| }); | |||
| Map<Long, List<WxBillProperty>> collect = billPropertyList.parallelStream() | |||
| .collect(Collectors.groupingBy(WxBillProperty::getMerchantId)); | |||
| Set<Map.Entry<Long, List<WxBillProperty>>> entries = collect.entrySet(); | |||
| @@ -165,7 +165,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| String price = ""; | |||
| String message =""; | |||
| if(record.getServiceChargePayUpdate() != null){ | |||
| wxBillRent.setServiceChargePay(Integer.parseInt(record.getServiceChargePayUpdate()) * 100); | |||
| Double l = Double.valueOf(record.getServiceChargePayUpdate())*100; | |||
| wxBillRent.setServiceChargePay(l.intValue()); | |||
| }else{ | |||
| Long addpay = wxBillRent.getPay(); | |||
| wxBillRent.setRevenue(record.getRevenue()); | |||
| @@ -438,8 +439,25 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||
| @Override | |||
| public void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillRent wxBillRent) { | |||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillRent.getTenantId()); | |||
| String billName = wxBillRent.getRentShopType().equals(EnumRentShopType.SHOP.getCode()) ? "商铺租金账单" : "多经点位租金账单"; | |||
| List<WxBillRent> billRentList = wxBillRentMapper.queryBillRentList(wxBillRent); | |||
| billRentList.stream().forEach(e->{ | |||
| //手续费 = 合同应收+手续费+滞纳金 | |||
| if(e.getReceivePay() != null){ | |||
| if(e.getLatePayPrice() == null) e.setLatePayPrice(0l); | |||
| BigDecimal servicePay; | |||
| if(e.getServiceChargePay() != null){ | |||
| servicePay = new BigDecimal(e.getServiceChargePay()); | |||
| }else{ | |||
| servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); | |||
| } | |||
| Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); | |||
| e.setRealReceivePay(realReceivePay); | |||
| e.setServiceChargePay(servicePay.intValue()); | |||
| } | |||
| }); | |||
| Map<Long, List<WxBillRent>> collect = billRentList.parallelStream() | |||
| .collect(Collectors.groupingBy(WxBillRent::getMerchantId)); | |||
| Set<Map.Entry<Long, List<WxBillRent>>> entries = collect.entrySet(); | |||