caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码规范问题处理，包结构调整。

Browse Source
This commit is contained in:
Chopper 2021-11-04 10:09:31 +08:00
parent ec020535e2
commit 6770f058d5
63 changed files with 125 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java
View File

@ -1,6 +1,6 @@
package cn.lili.timetask.handler.impl.statistics;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import cn.lili.modules.statistics.service.MemberStatisticsDataService;
import cn.lili.timetask.handler.EveryDayExecute;
import lombok.extern.slf4j.Slf4j;

2
consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java
View File

@ -4,7 +4,7 @@ import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.properties.StatisticsProperties;
import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
import cn.lili.timetask.handler.EveryHourExecute;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.convert.Convert;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.utils.BeanUtil;
import cn.lili.modules.statistics.model.dos.PlatformViewData;
import cn.lili.modules.statistics.entity.dos.PlatformViewData;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import cn.lili.timetask.handler.EveryDayExecute;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java
View File

@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.order.entity.vo.AfterSaleApplyVO;
import cn.lili.modules.order.order.entity.vo.AfterSaleSearchParams;
import cn.lili.modules.order.order.entity.vo.AfterSaleVO;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.system.entity.vo.Traces;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
View File

@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.system.entity.vo.Traces;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

2
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java
View File

@ -34,7 +34,7 @@ import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
import cn.lili.modules.payment.kit.RefundSupport;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
import cn.lili.modules.store.service.StoreDetailService;

3
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -16,7 +16,6 @@ import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.order.aop.OrderLogPoint;
@ -40,7 +39,7 @@ import cn.lili.modules.order.trade.service.OrderLogService;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
import cn.lili.modules.system.entity.dos.Logistics;

2
framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java → framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.dos;
package cn.lili.modules.statistics.entity.dos;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.TableName;

2
framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java → framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.dos;
package cn.lili.modules.statistics.entity.dos;
import cn.lili.mybatis.BaseIdEntity;
import com.baomidou.mybatisplus.annotation.TableName;

2
framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java → framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.dto;
package cn.lili.modules.statistics.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java → framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.dto;
package cn.lili.modules.statistics.entity.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java → framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.enums;
package cn.lili.modules.statistics.entity.enums;
/**
* 搜索类型

2
framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java → framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.enums;
package cn.lili.modules.statistics.entity.enums;
/**
* 统计查询

2
framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java → framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.enums;
package cn.lili.modules.statistics.entity.enums;
/**
* 时间类型

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

2
framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java → framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.statistics.model.vo;
package cn.lili.modules.statistics.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

4
framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java
View File

@ -1,8 +1,8 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

2
framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java
View File

@ -1,6 +1,6 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;

2
framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java
View File

@ -1,7 +1,7 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;

2
framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java
View File

@ -1,6 +1,6 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.statistics.model.dos.PlatformViewData;
import cn.lili.modules.statistics.entity.dos.PlatformViewData;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;

2
framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java
View File

@ -1,7 +1,7 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

4
framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java
View File

@ -1,8 +1,8 @@
package cn.lili.modules.statistics.mapper;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.StoreStatisticsDataVO;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

6
framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java
View File

@ -1,9 +1,9 @@
package cn.lili.modules.statistics.service;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

6
framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java
View File

@ -1,8 +1,8 @@
package cn.lili.modules.statistics.service;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.*;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.*;
import java.util.List;

4
framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java
View File

@ -1,7 +1,7 @@
package cn.lili.modules.statistics.service;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Date;

6
framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java
View File

@ -1,9 +1,9 @@
package cn.lili.modules.statistics.service;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OrderOverviewVO;
import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

8
framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java
View File

@ -1,10 +1,10 @@
package cn.lili.modules.statistics.service;
import cn.lili.modules.member.entity.vo.MemberDistributionVO;
import cn.lili.modules.statistics.model.dos.PlatformViewData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
import cn.lili.modules.statistics.model.vo.PlatformViewVO;
import cn.lili.modules.statistics.entity.dos.PlatformViewData;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

4
framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java
View File

@ -2,8 +2,8 @@ package cn.lili.modules.statistics.service;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

9
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java
View File

@ -4,17 +4,16 @@ import cn.lili.common.utils.StringUtils;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
import cn.lili.modules.statistics.mapper.GoodsStatisticsDataMapper;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.StatisticsQuery;
import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.StatisticsQuery;
import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;

8
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java
View File

@ -17,10 +17,10 @@ import cn.lili.modules.order.order.service.OrderComplaintService;
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
import cn.lili.modules.promotion.service.SeckillService;
import cn.lili.modules.statistics.mapper.StoreStatisticsDataMapper;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
import cn.lili.modules.statistics.model.vo.*;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.SearchTypeEnum;
import cn.lili.modules.statistics.entity.vo.*;
import cn.lili.modules.statistics.service.*;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import cn.lili.modules.store.entity.enums.BillStatusEnum;

6
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java
View File

@ -2,9 +2,9 @@ package cn.lili.modules.statistics.serviceimpl;
import cn.hutool.core.date.DateUtil;
import cn.lili.modules.statistics.mapper.MemberStatisticsDataMapper;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.SearchTypeEnum;
import cn.lili.modules.statistics.service.MemberStatisticsDataService;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

6
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java
View File

@ -12,9 +12,9 @@ import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.statistics.mapper.OrderStatisticsDataMapper;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OrderOverviewVO;
import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.service.OrderStatisticsDataService;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import cn.lili.modules.statistics.util.StatisticsDateUtil;

10
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java
View File

@ -11,11 +11,11 @@ import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.modules.member.entity.vo.MemberDistributionVO;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.statistics.mapper.PlatformViewDataMapper;
import cn.lili.modules.statistics.model.dos.PlatformViewData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
import cn.lili.modules.statistics.model.vo.PlatformViewVO;
import cn.lili.modules.statistics.entity.dos.PlatformViewData;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.SearchTypeEnum;
import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import cn.lili.modules.statistics.util.StatisticsDateUtil;
import cn.lili.modules.statistics.util.StatisticsSuffix;

6
framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java
View File

@ -7,9 +7,9 @@ import cn.lili.common.vo.PageVO;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
import cn.lili.modules.statistics.mapper.RefundOrderStatisticsDataMapper;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.TimeTypeEnum;
import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.TimeTypeEnum;
import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.service.RefundOrderStatisticsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

4
framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java
View File

@ -3,8 +3,8 @@ package cn.lili.modules.statistics.util;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.SearchTypeEnum;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.SearchTypeEnum;
import java.util.Calendar;
import java.util.Date;

2
framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java
View File

@ -1,6 +1,6 @@
package cn.lili.modules.system.mapper;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**

4
framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java → framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java
View File

@ -1,7 +1,7 @@
package cn.lili.modules.system.entity.dos;
package cn.lili.modules.verification.entity.dos;
import cn.lili.mybatis.BaseEntity;
import cn.lili.modules.system.entity.enums.VerificationSourceEnum;
import cn.lili.modules.verification.entity.enums.VerificationSourceEnum;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

4
framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java → framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java
View File

@ -1,6 +1,6 @@
package cn.lili.modules.system.entity.vo;
package cn.lili.modules.verification.entity.dto;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import lombok.Data;
import java.io.Serializable;

2
framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java → framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.system.entity.enums;
package cn.lili.modules.verification.entity.enums;
/**

6
framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java → framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java
View File

@ -1,8 +1,8 @@
package cn.lili.modules.system.service;
package cn.lili.modules.verification.service;
import cn.lili.cache.CachePrefix;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.system.entity.vo.VerificationDTO;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.dto.VerificationDTO;
import com.baomidou.mybatisplus.extension.service.IService;
/**

7
framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
View File

@ -7,9 +7,9 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.VerificationCodeProperties;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.SerializableStream;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.system.entity.vo.VerificationDTO;
import cn.lili.modules.system.service.VerificationSourceService;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.dto.VerificationDTO;
import cn.lili.modules.verification.service.VerificationSourceService;
import cn.lili.modules.verification.SliderImageUtil;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.List;

10
framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java → framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java
View File

@ -1,11 +1,11 @@
package cn.lili.modules.system.serviceimpl;
package cn.lili.modules.verification.service.impl;
import cn.lili.cache.Cache;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.system.entity.enums.VerificationSourceEnum;
import cn.lili.modules.system.entity.vo.VerificationDTO;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import cn.lili.modules.verification.entity.enums.VerificationSourceEnum;
import cn.lili.modules.verification.entity.dto.VerificationDTO;
import cn.lili.modules.system.mapper.VerificationSourceMapper;
import cn.lili.modules.system.service.VerificationSourceService;
import cn.lili.modules.verification.service.VerificationSourceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java
View File

@ -5,8 +5,8 @@ import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.system.entity.dos.VerificationSource;
import cn.lili.modules.system.service.VerificationSourceService;
import cn.lili.modules.verification.entity.dos.VerificationSource;
import cn.lili.modules.verification.service.VerificationSourceService;
import cn.lili.mybatis.util.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

6
manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java
View File

@ -2,9 +2,9 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.CategoryStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

14
manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java
View File

@ -2,13 +2,13 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.enums.StatisticsQuery;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.IndexNoticeVO;
import cn.lili.modules.statistics.model.vo.IndexStatisticsVO;
import cn.lili.modules.statistics.model.vo.StoreStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.enums.StatisticsQuery;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.IndexNoticeVO;
import cn.lili.modules.statistics.entity.vo.IndexStatisticsVO;
import cn.lili.modules.statistics.entity.vo.StoreStatisticsDataVO;
import cn.lili.modules.statistics.service.IndexStatisticsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

4
manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java
View File

@ -2,8 +2,8 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dos.MemberStatisticsData;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.dos.MemberStatisticsData;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.service.MemberStatisticsDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

6
manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java
View File

@ -7,9 +7,9 @@ import cn.lili.modules.order.order.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OrderOverviewVO;
import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.service.OrderStatisticsDataService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

4
manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java
View File

@ -3,8 +3,8 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.service.RefundOrderStatisticsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

6
manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java
View File

@ -3,9 +3,9 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.entity.vo.MemberDistributionVO;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OnlineMemberVO;
import cn.lili.modules.statistics.model.vo.PlatformViewVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OnlineMemberVO;
import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

4
seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java
View File

@ -3,8 +3,8 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

6
seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java
View File

@ -3,9 +3,9 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.model.vo.StoreIndexStatisticsVO;
import cn.lili.modules.statistics.entity.dto.GoodsStatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.GoodsStatisticsDataVO;
import cn.lili.modules.statistics.entity.vo.StoreIndexStatisticsVO;
import cn.lili.modules.statistics.service.GoodsStatisticsDataService;
import cn.lili.modules.statistics.service.IndexStatisticsService;
import io.swagger.annotations.Api;

6
seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java
View File

@ -8,9 +8,9 @@ import cn.lili.modules.order.order.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
import cn.lili.modules.order.order.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.OrderOverviewVO;
import cn.lili.modules.statistics.model.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.OrderOverviewVO;
import cn.lili.modules.statistics.entity.vo.OrderStatisticsDataVO;
import cn.lili.modules.statistics.service.OrderStatisticsDataService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

4
seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java
View File

@ -4,8 +4,8 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.RefundOrderStatisticsDataVO;
import cn.lili.modules.statistics.service.RefundOrderStatisticsService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;

4
seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java
View File

@ -3,8 +3,8 @@ package cn.lili.controller.statistics;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.model.vo.PlatformViewVO;
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
import cn.lili.modules.statistics.entity.vo.PlatformViewVO;
import cn.lili.modules.statistics.service.PlatformViewDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;