|
@@ -392,7 +392,7 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
|
|
|
if (prePlatformBillOptional.isPresent()) {
|
|
if (prePlatformBillOptional.isPresent()) {
|
|
|
platformBill.setStartMoney(prePlatformBillOptional.get().getEndMoney());
|
|
platformBill.setStartMoney(prePlatformBillOptional.get().getEndMoney());
|
|
|
} else {
|
|
} else {
|
|
|
- platformBill.setStartMoney(sum(shopPlatformBills, PlatformBill::getShopBalance));
|
|
|
|
|
|
|
+ platformBill.setStartMoney(sum(shopPlatformBills, PlatformBill::getShopBalance).add(sum(riderPlatformBills, PlatformBill::getShopBalance)));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 期末金额 = 期初金额 + 当天收入 - 商家当天提现金额(已转账和待转账) - 骑手当天提现金额(已转账+待转账+已拒绝)
|
|
// 期末金额 = 期初金额 + 当天收入 - 商家当天提现金额(已转账和待转账) - 骑手当天提现金额(已转账+待转账+已拒绝)
|