|
|
@ -67,7 +67,8 @@ public class BillServiceImp implements BillService { |
|
|
BigDecimal orderAmount = new BigDecimal(0); |
|
|
BigDecimal orderAmount = new BigDecimal(0); |
|
|
List<String> billIdList = new ArrayList<>(); |
|
|
List<String> billIdList = new ArrayList<>(); |
|
|
for (SaleBill bill : billAmountList){ |
|
|
for (SaleBill bill : billAmountList){ |
|
|
if(bill.getPayAmount().compareTo(bill.getTotalAmount()) >= 0) |
|
|
BigDecimal payAmount = Optional.ofNullable(bill.getPayAmount()).orElse(BigDecimal.ZERO); |
|
|
|
|
|
if(payAmount.compareTo(bill.getTotalAmount()) >= 0) |
|
|
continue; |
|
|
continue; |
|
|
billIdList.add(bill.getId()); |
|
|
billIdList.add(bill.getId()); |
|
|
orderAmount = orderAmount.add(bill.getTotalAmount()); |
|
|
orderAmount = orderAmount.add(bill.getTotalAmount()); |
|
|
|