|
@@ -113,7 +113,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
|
|
|
//进账金额
|
|
//进账金额
|
|
|
invAccountIncoice1.setPayoutMoney(new BigDecimal(invAccountIncoice1.getPayoutMoney()).add(new BigDecimal(payoutMoney)).toString());
|
|
invAccountIncoice1.setPayoutMoney(new BigDecimal(invAccountIncoice1.getPayoutMoney()).add(new BigDecimal(payoutMoney)).toString());
|
|
|
invAccountIncoice1.setNotPayoutMoney(new BigDecimal(invAccountIncoice1.getInvoiceMoney()).subtract(new BigDecimal(invAccountIncoice1.getPayoutMoney())).toString());
|
|
invAccountIncoice1.setNotPayoutMoney(new BigDecimal(invAccountIncoice1.getInvoiceMoney()).subtract(new BigDecimal(invAccountIncoice1.getPayoutMoney())).toString());
|
|
|
- invAccountIncoice1.setPayoutTime(invAccountIncoice.getPayoutTime());
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
if (invAccountIncoice1.getNotPayoutMoney().equals("0")) {
|
|
if (invAccountIncoice1.getNotPayoutMoney().equals("0")) {
|
|
|
invAccountIncoice1.setClearFlag("1");
|
|
invAccountIncoice1.setClearFlag("1");
|
|
@@ -329,9 +329,7 @@ public class InvAccountIncoiceServiceImpl extends ServiceImpl<InvAccountIncoiceM
|
|
|
|
|
|
|
|
//解决时间格式报错问题
|
|
//解决时间格式报错问题
|
|
|
invAccountIncoices.forEach(invAccountIncoice -> {
|
|
invAccountIncoices.forEach(invAccountIncoice -> {
|
|
|
- if (invAccountIncoice.getPayoutTime() != null) {
|
|
|
|
|
- invAccountIncoice.setPayoutDate(invAccountIncoice.getPayoutTime().toString());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if (invAccountIncoice.getInvoiceTime() != null) {
|
|
if (invAccountIncoice.getInvoiceTime() != null) {
|
|
|
invAccountIncoice.setInvoiceDate(invAccountIncoice.getInvoiceTime().toString());
|
|
invAccountIncoice.setInvoiceDate(invAccountIncoice.getInvoiceTime().toString());
|
|
|
}
|
|
}
|