|
@@ -1091,17 +1091,17 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
|
|
|
).collect(Collectors.toList());
|
|
).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
- BigDecimal shoukuan = new BigDecimal(0);
|
|
|
|
|
- BigDecimal xiaofei = new BigDecimal(0);
|
|
|
|
|
|
|
+ final BigDecimal[] shoukuan = {new BigDecimal(0)};
|
|
|
|
|
+ final BigDecimal[] xiaofei = {new BigDecimal(0)};
|
|
|
|
|
|
|
|
feeItems.forEach(c->{
|
|
feeItems.forEach(c->{
|
|
|
if(c.getFeeType().equals(1)) { // 收款
|
|
if(c.getFeeType().equals(1)) { // 收款
|
|
|
- shoukuan.add(c.getMoney());
|
|
|
|
|
|
|
+ shoukuan[0] = shoukuan[0].add(c.getMoney());
|
|
|
} else if(c.getFeeType().equals(2)) { // 消费
|
|
} else if(c.getFeeType().equals(2)) { // 消费
|
|
|
- xiaofei.add(c.getMoney());
|
|
|
|
|
|
|
+ xiaofei[0] = xiaofei[0].add(c.getMoney());
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- BigDecimal m = shoukuan .subtract(xiaofei);
|
|
|
|
|
|
|
+ BigDecimal m = shoukuan[0].subtract(xiaofei[0]);
|
|
|
settleFees.get(0).setMoney(m);
|
|
settleFees.get(0).setMoney(m);
|
|
|
if(m.doubleValue() < 0) settleFees.get(0).setCustorerOrderRemark("结账退款");
|
|
if(m.doubleValue() < 0) settleFees.get(0).setCustorerOrderRemark("结账退款");
|
|
|
else settleFees.get(0).setCustorerOrderRemark("结账收款");
|
|
else settleFees.get(0).setCustorerOrderRemark("结账收款");
|