商家结算卡信息

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

@@ -124,8 +124,8 @@ public class IndexController extends BaseController {
     @GetMapping("/platform-on-on-year")
     public R<List<BusinessDayBillVo>> platformOnYear() {
         BusinessDayBillCountBo build = new BusinessDayBillCountBo();
-        build.setStartTime(DateUtil.beginOfWeek(new Date()));
-        build.setEndTime(DateUtil.endOfWeek(new Date()));
+        build.setStartTime(DateUtil.beginOfYear(new Date()));
+        build.setEndTime(DateUtil.endOfYear(new Date()));
         List<BusinessDayBillVo> businessDayBillVos = iBusinessDayBillService.onYear(build);
         return R.ok( businessDayBillVos);
     }

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

@@ -3,32 +3,31 @@ package com.ruoyi.businessDayBill.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alipay.api.domain.MaterialUnit;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
 import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 import com.ruoyi.business.domain.Business;
 import com.ruoyi.business.domain.OnLineOrderProperties;
 import com.ruoyi.business.service.IBusinessService;
+import com.ruoyi.businessDayBill.domain.BusinessDayBill;
+import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillChangeBo;
 import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillCountBo;
+import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
 import com.ruoyi.businessDayBill.domain.vo.BusinessSalesDetailVo;
+import com.ruoyi.businessDayBill.exception.BusinessDayBillExceptionEnum;
+import com.ruoyi.businessDayBill.mapper.BusinessDayBillMapper;
+import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.MathUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.ruoyi.businessDayBill.domain.bo.BusinessDayBillBo;
-import com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo;
-import com.ruoyi.businessDayBill.domain.BusinessDayBill;
-import com.ruoyi.businessDayBill.mapper.BusinessDayBillMapper;
-import com.ruoyi.businessDayBill.service.IBusinessDayBillService;
-import com.ruoyi.businessDayBill.exception.BusinessDayBillExceptionEnum;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -317,7 +316,30 @@ public class BusinessDayBillServiceImpl implements IBusinessDayBillService {
 
     @Override
     public List<BusinessDayBillVo> onYear(BusinessDayBillCountBo bo) {
-        return this.baseMapper.onYear(bo);
+        List<BusinessDayBillVo> businessDayBillVos = this.baseMapper.onYear(bo);
+        List<BusinessDayBillVo> dataList = new ArrayList<>();
+        Date now = new Date();
+        for (int i = 1; i <= 12; i++) {
+            String month = String.format("%s-%02d", DateUtil.format(now, "yyyy"), i);
+            Optional<BusinessDayBillVo> first = businessDayBillVos.stream()
+                .filter(e -> e.getYearMonthValue().equals(month))
+                .findFirst();
+            if (first.isPresent()) {
+                BusinessDayBillVo businessDayBillVo = first.get();
+                businessDayBillVo.setYearMonthValue(i + "月");
+                dataList.add(businessDayBillVo);
+            } else {
+                BusinessDayBillVo businessDayBillVo = new BusinessDayBillVo();
+                businessDayBillVo.setYearMonthValue(i + "月");
+                businessDayBillVo.setTodaySettlement(BigDecimal.ZERO);
+                businessDayBillVo.setOnlineOrderNum(0);
+                businessDayBillVo.setOnlineOrderAmount(BigDecimal.ZERO);
+                businessDayBillVo.setShopOrderNum(0);
+                businessDayBillVo.setShopOrderAmount(BigDecimal.ZERO);
+                dataList.add(businessDayBillVo);
+            }
+        }
+        return dataList;
     }
 
     @Override

ruoyi-business/src/main/resources/mapper/businessDayBill/BusinessDayBillMapper.xml

@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY year_month_value
+        order by year_month_value
     </select>
 
     <select id="onDay" resultType="com.ruoyi.businessDayBill.domain.vo.BusinessDayBillVo">

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserBo.java

@@ -134,4 +134,9 @@ public class UserBo extends BaseEntity {
 
     @ApiModelProperty("商家主键")
     private Long businessId;
+
+    /**
+     * 注册日期
+     */
+    private Date createDay;
 }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -737,11 +737,8 @@ public class UserServiceImpl implements IUserService {
     @Override
     public List<UserStatisticsVo> queryUserStatisticsList(Long businessId, Date startTime, Date endTime) {
         // 往前查询最近七日
-        Date endDay = new Date();
-        DateTime startDay = DateUtil.offsetDay(endDay, -7);
-
-        String start = DateUtil.format(startDay, "yyyy-MM-dd");
-        String end = DateUtil.format(endDay, "yyyy-MM-dd");
+        String start = DateUtil.format(startTime, "yyyy-MM-dd");
+        String end = DateUtil.format(endTime, "yyyy-MM-dd");
         List<UserStatisticsVo> list = this.baseMapper.queryUserStatisticsList(businessId, start, end);
 
         // 七天的日期