|
|
|
@@ -159,7 +159,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
|
|
|
|
public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) { |
|
|
|
if (e.getReceivePay() != null) { |
|
|
|
if (e.getLatePayPrice() == null) e.setLatePayPrice(0L); |
|
|
|
if (e.getLatePayPrice() == null) { |
|
|
|
e.setLatePayPrice(0L); |
|
|
|
} |
|
|
|
BigDecimal servicePay; |
|
|
|
if (e.getServiceChargePay() != null) { |
|
|
|
servicePay = new BigDecimal(e.getServiceChargePay()); |
|
|
|
@@ -169,6 +171,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); |
|
|
|
e.setRealReceivePay(realReceivePay); |
|
|
|
e.setServiceChargePay(servicePay.intValue()); |
|
|
|
e.setOwe(realReceivePay - e.getPay()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@@ -1848,7 +1851,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Map<String, Object>> allDepositList(WxBillAll wxBillAll) { |
|
|
|
return wxBillAllMapper.allDepositList(wxBillAll); |
|
|
|
public List<WxBillAllVo> allDepositList(WxBillAll wxBillAll) { |
|
|
|
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); |
|
|
|
List<WxBillAllVo> wxBillAllVos = wxBillAllMapper.allDepositList(wxBillAll); |
|
|
|
wxBillAllVos.stream().forEach(e -> { |
|
|
|
cmputeTotalMoney(wxPayAccountBill, e); |
|
|
|
}); |
|
|
|
return wxBillAllVos; |
|
|
|
} |
|
|
|
} |