|
|
@@ -124,8 +124,16 @@ public class AppShopController {
|
|
|
.or()
|
|
|
.eq(Bills::getPayStatus, AppConstant.BillPayStatus.已完结.name())));
|
|
|
|
|
|
+
|
|
|
+ BalanceAccountInfoVO balanceAccountInfoVO = appShopService.queryBalance(shopId);
|
|
|
+ //今日现金收益
|
|
|
+ BigDecimal todayBalance = Convert.toBigDecimal(balanceAccountInfoVO.getTodayNum());
|
|
|
+ //今日积分收益
|
|
|
+ BigDecimal todayPoint = this.getTodayPoint(shopId);
|
|
|
+ //渠道积分今日收益
|
|
|
+ BigDecimal todayChannel = this.getTodayCharge(shopId);
|
|
|
//今日营收
|
|
|
- BigDecimal todayCharge = this.todayRevenue(shopId);
|
|
|
+ BigDecimal todayCharge = BigDecimal.ZERO.add(todayBalance).add(todayPoint).add(todayChannel);
|
|
|
|
|
|
return R.data(
|
|
|
IndexVO.builder()
|
