商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/IndexController.java

@@ -94,6 +94,8 @@ public class IndexController extends BaseController {
             .endTime(DateUtil.endOfWeek(new Date()))
             .build();
         List<BusinessDayBillVo> businessDayBillVos = iBusinessDayBillService.queryList(build);
+        // 补全日期
+        businessDayBillVos = iBusinessDayBillService.completionDate(businessDayBillVos, build.getStartTime(), build.getEndTime());
         businessDayBillVos.forEach(BusinessDayBillVo::loadWeekValue);
         return R.ok( businessDayBillVos);
     }

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/IBusinessDayBillService.java

@@ -153,4 +153,13 @@ public interface IBusinessDayBillService {
      * @return 统计信息
      */
     TableDataInfo<BusinessSalesDetailVo> querySalesPageList(BusinessDayBillBo bo, PageQuery pageQuery);
+
+    /**
+     * 补全日期
+     * @param businessDayBillVos 统计参数
+     * @param start 开始时间
+     * @param end 结束时间
+     * @return 统计信息
+     */
+    List<BusinessDayBillVo> completionDate(List<BusinessDayBillVo> businessDayBillVos, Date start, Date end);
 }

ruoyi-business/src/main/java/com/ruoyi/businessDayBill/service/impl/BusinessDayBillServiceImpl.java

@@ -344,7 +344,32 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
 
     @Override
     public List<BusinessDayBillVo> onDay(BusinessDayBillCountBo build) {
-        return this.baseMapper.onDay(build);
+        List<BusinessDayBillVo> businessDayBillVos = this.baseMapper.onDay(build);
+        return completionDate(businessDayBillVos, build.getStartTime(), build.getEndTime());
+    }
+
+    @Override
+    public List<BusinessDayBillVo> completionDate(List<BusinessDayBillVo> businessDayBillVos, Date start, Date end) {
+        List<BusinessDayBillVo> dataList = new ArrayList<>();
+        while (start.compareTo(end)<=0) {
+            Date finalStart = start;
+            Optional<BusinessDayBillVo> first = businessDayBillVos.stream().filter(e -> e.getBillDay().equals(finalStart)).findFirst();
+            if (first.isPresent()) {
+                BusinessDayBillVo businessDayBillVo = first.get();
+                dataList.add(businessDayBillVo);
+            } else {
+                BusinessDayBillVo businessDayBillVo = new BusinessDayBillVo();
+                businessDayBillVo.setBillDay(start);
+                businessDayBillVo.setTodaySettlement(BigDecimal.ZERO);
+                businessDayBillVo.setOnlineOrderNum(0);
+                businessDayBillVo.setOnlineOrderAmount(BigDecimal.ZERO);
+                businessDayBillVo.setShopOrderNum(0);
+                businessDayBillVo.setShopOrderAmount(BigDecimal.ZERO);
+                dataList.add(businessDayBillVo);
+            }
+            start = DateUtil.offsetDay(start, 1);
+        }
+        return dataList;
     }
 
     @Override

ruoyi-shop/src/main/java/com/ruoyi/shop/merchant/domain/vo/MerchantCategoryVo.java

@@ -78,6 +78,7 @@ public class MerchantCategoryVo extends BaseVo {
     @ApiModelProperty("是否上架：0-下架，1-上架")
     private Boolean shelvedStatus;
 
+    @FilePathValue
     @ApiModelProperty("子级分类")
     private List<MerchantCategoryVo> childrenList;