diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java index c939a334..63b43f2b 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java @@ -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; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index 0dec275b..f9731ad4 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java @@ -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; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java index edd45045..3821f8b6 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java index 96975954..6af2ebe2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index 1e6d27da..4fb1d04c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index dd9d2453..b524f877 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 8d3d890a..089eba5e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java index 7cb076dc..39e90891 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/MemberStatisticsData.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java index 9b38fd3a..04d92765 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dos/PlatformViewData.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java index c898b278..f666faba 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/GoodsStatisticsQueryParam.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java index fec5ce06..37b985e8 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/dto/StatisticsQueryParam.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java similarity index 81% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java index 22850d5b..a7854cc2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/SearchTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/SearchTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 搜索类型 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java similarity index 78% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java index bf001aa2..68aee0d6 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/StatisticsQuery.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/StatisticsQuery.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 统计查询 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java similarity index 81% rename from framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java index 8b131641..abc94b1e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/enums/TimeTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/enums/TimeTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.statistics.model.enums; +package cn.lili.modules.statistics.entity.enums; /** * 时间类型 diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java index 5377e040..bcc41996 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/CategoryStatisticsDataVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java index 88082f48..e8cad939 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/GoodsStatisticsDataVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java index e2a1e8c2..56b3f0f5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexNoticeVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java index a7a6b068..e449bd9e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/IndexStatisticsVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java similarity index 90% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java index 3ab00e7b..fc66d9da 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OnlineMemberVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java index abe916d8..ce3dbf16 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderOverviewVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java index 8c699cf4..c349d471 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/OrderStatisticsDataVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java index bd1c92c5..2e8486bc 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java index 5d620e59..2920ae03 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/RefundOrderStatisticsDataVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java index 4d282829..f4b013f0 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreIndexStatisticsVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java rename to framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java index 8b90f6e0..88f99211 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/StoreStatisticsDataVO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java index e06c36f2..226e253d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java index f0eb3ce1..685fd906 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java index 7843c21f..69948a49 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java index 2efa59b9..3109b05f 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java index 11e3d76e..e4843c19 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java index 6521fee0..825bbd83 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java index 48ba024c..0752a97c 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java index 1a50bcd5..427a1d89 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java index 8ec5fcb2..5cfb280f 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java index de9488b1..cdc192f5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java index 9f306eab..526ccdb4 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java index c41c1c1b..685e27c9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index 68177182..3f101189 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index bdea438a..eab152e7 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java index d6b3fc89..e79dae22 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java index 21661218..12d1187b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index d45c5136..3dcf50e1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java index 1d5dc682..f07a887b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java index cd1bd333..8161765d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java +++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java index f11b3bde..3a87e8c2 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java similarity index 86% rename from framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java rename to framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java index 975665d6..affce14c 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/dos/VerificationSource.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java b/framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java similarity index 77% rename from framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java rename to framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java index bb29b8cc..65b2f2f9 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationDTO.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/dto/VerificationDTO.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java similarity index 87% rename from framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java rename to framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java index 43617de3..0994c089 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java +++ b/framework/src/main/java/cn/lili/modules/verification/entity/enums/VerificationSourceEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.entity.enums; +package cn.lili.modules.verification.entity.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java similarity index 76% rename from framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java rename to framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java index cde7dfe8..32946b21 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/VerificationSourceService.java @@ -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; /** diff --git a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java index 7694f0f2..c5449bc6 100644 --- a/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java similarity index 85% rename from framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java rename to framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java index 516ffe38..003ae352 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/verification/service/impl/VerificationSourceServiceImpl.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 133aeae3..15ea88f4 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java index 25a144e6..21325245 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index f663344b..7ee8eef8 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java index 234018ef..84af4758 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java index a6d3128c..de151751 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index 52cfe67c..36dab0da 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -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; diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java index 78e09198..67847cce 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java @@ -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; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java index 39006872..e89475e7 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java @@ -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; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java index 56cf0bfc..8187062b 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java @@ -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; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java index 7353f7bb..1875ac11 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java @@ -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; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index 479c32ff..0619e9bd 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -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; diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java index 3e1128c6..6ecd7480 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java @@ -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;