dd

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -8,6 +8,8 @@ import com.ruoyi.business.domain.Business;
 import com.ruoyi.business.domain.bo.BusinessBo;
 import com.ruoyi.business.domain.vo.BusinessVo;
 import com.ruoyi.business.service.IBusinessService;
+import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
 import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -336,9 +338,10 @@ public class BusinessController extends BaseController {
         bo.setParentBusinessId(getBusinessId( true));
         TableDataInfo<BusinessVo> businessVoTableDataInfo = iBusinessService.partnerPage(bo, pageQuery);
         businessVoTableDataInfo.getRows().forEach(businessVo -> {
-//            businessVo.setValidQueueCount(subsidyQueueService.validQueueCount(businessVo.getBusinessId(),false).intValue());
-//            businessVo.setSurplusQueueMoney(subsidyQueueService.getSurplusQueueMoneStatistics(businessVo.getBusinessId()));
-//            businessVo.setTotalSaleAmount(businessDayBillService.getActualReceivePayment(businessVo.getBusinessId()));
+            BusinessDayBillCountBo businessDayBillCountBo = new BusinessDayBillCountBo();
+            businessDayBillCountBo.setBusinessId(businessVo.getBusinessId());
+            BusinessDayBillVo statistics = businessDayBillService.getStatistics(businessDayBillCountBo);
+            businessVo.setStatistics(statistics);
         });
         return businessVoTableDataInfo;
     }

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessVo.java

@@ -4,6 +4,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.business.enums.BusinessType;
+import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelBooleanConvert;
 import com.ruoyi.common.convert.ExcelEnumConvert;
@@ -414,18 +415,8 @@ public class BusinessVo extends BaseVo {
     private BusinessSettlementVo settlementInfo;
 
 
-    /**
-     * 排队数量
-     */
-    @ApiModelProperty(value = "排队数量")
-    private Integer validQueueCount;
-
-    //剩余排队金额
-    @ApiModelProperty(value = "剩余排队金额")
-    private BigDecimal surplusQueueMoney;
 
-    //累计经营额
-    @ApiModelProperty(value = "累计经营额")
-    private BigDecimal totalSaleAmount;
+    @ApiModelProperty(value = "商家日账单统统计")
+    private BusinessDayBillVo statistics;
 
 }