|
|
@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.shop.business;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
+import com.ruoyi.business.service.IBusinessService;
|
|
|
import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
@@ -48,6 +49,7 @@ import java.util.Map;
|
|
|
public class BusinessDayBillController extends BaseController {
|
|
|
|
|
|
private final IBusinessDayBillService iBusinessDayBillService;
|
|
|
+ private final IBusinessService iBusinessService;
|
|
|
|
|
|
/**
|
|
|
* 平台分页查询商家日账单列表
|
|
|
@@ -168,7 +170,7 @@ public class BusinessDayBillController extends BaseController {
|
|
|
public R<BusinessDayBillVo> getChainBusinessStatistics(@Validated BusinessDayBillCountBo bo) {
|
|
|
if(ObjectUtil.isNull(bo.getBusinessId()))
|
|
|
{
|
|
|
- throw new RuntimeException("请选择连锁店");
|
|
|
+ bo.setChainBusinessIds(iBusinessService.queryBusinessIdsByBusinessId(getBusinessId(true)));
|
|
|
}
|
|
|
return R.ok(iBusinessDayBillService.getStatistics(bo));
|
|
|
}
|