diff --git a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java index c4b40b0e..65c5a391 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java @@ -10,7 +10,7 @@ import cn.lili.modules.promotion.entity.vos.CouponSearchParams; import cn.lili.modules.promotion.entity.vos.CouponVO; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index 3b056b97..fc2e7d3a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -6,7 +6,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.service.MemberAddressService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index c75fa25a..2c9d9b0c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -4,12 +4,13 @@ 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.goods.entity.vos.StoreGoodsLabelVO; import cn.lili.modules.store.entity.dto.StoreBankDTO; import cn.lili.modules.store.entity.dto.StoreCompanyDTO; import cn.lili.modules.store.entity.dto.StoreOtherInfoDTO; import cn.lili.modules.store.entity.vos.*; import cn.lili.modules.store.service.StoreDetailService; -import cn.lili.modules.store.service.StoreGoodsLabelService; +import cn.lili.modules.goods.service.StoreGoodsLabelService; import cn.lili.modules.store.service.StoreService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java index d6cb030f..5bf9cdf1 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java @@ -13,7 +13,7 @@ import cn.lili.modules.order.order.service.AfterSaleReasonService; import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.order.trade.entity.dos.AfterSaleLog; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java index 83cb51bf..4e945822 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java @@ -12,7 +12,7 @@ import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; import cn.lili.modules.order.order.entity.vo.OrderDetailVO; import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.service.OrderService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java index 2fb5f007..c05fd886 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderComplaintBuyerController.java @@ -13,7 +13,7 @@ import cn.lili.modules.order.order.entity.vo.OrderComplaintSearchParams; import cn.lili.modules.order.order.entity.vo.OrderComplaintVO; import cn.lili.modules.order.order.service.OrderComplaintCommunicationService; import cn.lili.modules.order.order.service.OrderComplaintService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index 8738bf0c..4f7afc51 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java @@ -30,8 +30,8 @@ import cn.lili.modules.member.service.GoodsCollectionService; import cn.lili.modules.search.entity.dos.EsGoodsIndex; import cn.lili.modules.search.service.EsGoodsIndexService; import cn.lili.modules.search.utils.EsIndexUtil; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; -import cn.lili.modules.store.service.StoreGoodsLabelService; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.service.StoreGoodsLabelService; import cn.lili.modules.store.service.StoreService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.GoodsTagsEnum; diff --git a/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java b/framework/src/main/java/cn/lili/common/security/OperationalJudgment.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java rename to framework/src/main/java/cn/lili/common/security/OperationalJudgment.java index d4cd0064..6cb7696e 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/OperationalJudgment.java +++ b/framework/src/main/java/cn/lili/common/security/OperationalJudgment.java @@ -1,4 +1,4 @@ -package cn.lili.modules.system.utils; +package cn.lili.common.security; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StoreGoodsLabel.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dos/StoreGoodsLabel.java index 0b03e1aa..2b079e43 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StoreGoodsLabel.java @@ -1,4 +1,4 @@ -package cn.lili.modules.store.entity.dos; +package cn.lili.modules.goods.entity.dos; import cn.lili.mybatis.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StoreGoodsLabelVO.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java rename to framework/src/main/java/cn/lili/modules/goods/entity/vos/StoreGoodsLabelVO.java index fd627c4b..5f0720e6 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StoreGoodsLabelVO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.store.entity.vos; +package cn.lili.modules.goods.entity.vos; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StoreGoodsLabelMapper.java similarity index 71% rename from framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java rename to framework/src/main/java/cn/lili/modules/goods/mapper/StoreGoodsLabelMapper.java index addd2591..81d1746f 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StoreGoodsLabelMapper.java @@ -1,6 +1,6 @@ -package cn.lili.modules.store.mapper; +package cn.lili.modules.goods.mapper; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java b/framework/src/main/java/cn/lili/modules/goods/service/StoreGoodsLabelService.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java rename to framework/src/main/java/cn/lili/modules/goods/service/StoreGoodsLabelService.java index dfd70af6..78d763be 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StoreGoodsLabelService.java @@ -1,7 +1,7 @@ -package cn.lili.modules.store.service; +package cn.lili.modules.goods.service; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; -import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java rename to framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java index 9ee94b41..d0967bd1 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lili.modules.store.serviceimpl; +package cn.lili.modules.goods.serviceimpl; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.cache.Cache; @@ -7,10 +7,10 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; -import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO; -import cn.lili.modules.store.mapper.StoreGoodsLabelMapper; -import cn.lili.modules.store.service.StoreGoodsLabelService; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO; +import cn.lili.modules.goods.mapper.StoreGoodsLabelMapper; +import cn.lili.modules.goods.service.StoreGoodsLabelService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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 c8c86a29..0c60b475 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 @@ -42,7 +42,7 @@ import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.modules.system.entity.dos.Logistics; import cn.lili.modules.system.entity.vo.Traces; import cn.lili.modules.system.service.LogisticsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import cn.lili.mybatis.util.PageUtil; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.AfterSaleTagsEnum; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java index bd857b65..d5c2eb06 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderComplaintServiceImpl.java @@ -23,7 +23,7 @@ import cn.lili.modules.order.order.service.OrderComplaintCommunicationService; import cn.lili.modules.order.order.service.OrderComplaintService; import cn.lili.modules.order.order.service.OrderItemService; import cn.lili.modules.order.order.service.OrderService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java index 735e8808..4e276210 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java @@ -15,7 +15,7 @@ import cn.lili.modules.order.order.service.OrderPriceService; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.payment.kit.plugin.bank.BankTransferPlugin; import cn.lili.modules.system.aspect.annotation.SystemLogPoint; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 d5c4e42f..e618988a 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 @@ -45,7 +45,7 @@ import cn.lili.modules.system.aspect.annotation.SystemLogPoint; import cn.lili.modules.system.entity.dos.Logistics; import cn.lili.modules.system.entity.vo.Traces; import cn.lili.modules.system.service.LogisticsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import cn.lili.mybatis.util.PageUtil; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.GoodsTagsEnum; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java index 7bead3dd..6143e19a 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java @@ -32,8 +32,8 @@ import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO; import cn.lili.modules.search.repository.EsGoodsIndexRepository; import cn.lili.modules.search.service.EsGoodsIndexService; import cn.lili.modules.search.service.EsGoodsSearchService; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; -import cn.lili.modules.store.service.StoreGoodsLabelService; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.service.StoreGoodsLabelService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.IterableUtil; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 2f02bea8..490526fd 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -10,7 +10,7 @@ import cn.lili.modules.goods.entity.dto.DraftGoodsDTO; import cn.lili.modules.goods.entity.dto.DraftGoodsSearchParams; import cn.lili.modules.goods.entity.vos.DraftGoodsVO; import cn.lili.modules.goods.service.DraftGoodsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java index 998ccae4..9baf8ca0 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java @@ -3,10 +3,10 @@ package cn.lili.controller.goods; import cn.lili.common.enums.ResultUtil; import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.store.entity.dos.StoreGoodsLabel; -import cn.lili.modules.store.entity.vos.StoreGoodsLabelVO; -import cn.lili.modules.store.service.StoreGoodsLabelService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.modules.goods.entity.dos.StoreGoodsLabel; +import cn.lili.modules.goods.entity.vos.StoreGoodsLabelVO; +import cn.lili.modules.goods.service.StoreGoodsLabelService; +import cn.lili.common.security.OperationalJudgment; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index a7635c57..5d9d8f35 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -16,7 +16,7 @@ import cn.lili.modules.goods.service.GoodsService; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.store.entity.dos.StoreDetail; import cn.lili.modules.store.service.StoreDetailService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java index 37d6646d..d64ab9b8 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java @@ -9,7 +9,7 @@ import cn.lili.common.vo.ResultMessage; import cn.lili.modules.goods.entity.dos.Studio; import cn.lili.modules.goods.entity.vos.StudioVO; import cn.lili.modules.goods.service.StudioService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java index 03fba82c..2dfb6d5d 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java @@ -9,7 +9,7 @@ import cn.lili.modules.distribution.entity.dto.DistributionGoodsSearchParams; import cn.lili.modules.distribution.entity.vos.DistributionGoodsVO; import cn.lili.modules.distribution.service.DistributionGoodsService; import cn.lili.modules.distribution.service.DistributionSelectedGoodsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java index 9e03b6e5..3270da52 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java @@ -12,7 +12,7 @@ import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import cn.lili.modules.promotion.entity.vos.CouponSearchParams; import cn.lili.modules.promotion.entity.vos.CouponVO; import cn.lili.modules.promotion.service.CouponService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java index 87a53b77..974af737 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java @@ -11,7 +11,7 @@ import cn.lili.modules.promotion.entity.dos.FullDiscount; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams; import cn.lili.modules.promotion.service.FullDiscountService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java index db489640..a676c1ea 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/PintuanStoreController.java @@ -14,7 +14,7 @@ import cn.lili.modules.promotion.entity.vos.PintuanVO; import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams; import cn.lili.modules.promotion.service.PintuanService; import cn.lili.modules.promotion.service.PromotionGoodsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java index 9b29e982..14f32197 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java @@ -11,7 +11,7 @@ import cn.lili.modules.promotion.entity.vos.SeckillSearchParams; import cn.lili.modules.promotion.entity.vos.SeckillVO; import cn.lili.modules.promotion.service.SeckillApplyService; import cn.lili.modules.promotion.service.SeckillService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java index 4f1e69c1..0d3c9c1e 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java @@ -5,7 +5,7 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.service.FreightTemplateService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java index 22bc6b36..48930caa 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java @@ -7,7 +7,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.store.entity.dos.StoreAddress; import cn.lili.modules.store.service.StoreAddressService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java index 8ae6745f..679b7636 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java @@ -9,7 +9,7 @@ import cn.lili.modules.message.entity.dos.StoreMessage; import cn.lili.modules.message.entity.enums.MessageStatusEnum; import cn.lili.modules.message.entity.vos.StoreMessageQueryVO; import cn.lili.modules.message.service.StoreMessageService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java index 5ff00da4..ffff571f 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java @@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.vo.AfterSaleVO; import cn.lili.modules.order.order.service.AfterSaleService; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import cn.lili.modules.system.entity.vo.Traces; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java index d430e600..7b6101f0 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java @@ -10,7 +10,7 @@ import cn.lili.modules.store.entity.dos.Bill; import cn.lili.modules.store.entity.dto.BillSearchParams; import cn.lili.modules.store.entity.vos.BillListVO; import cn.lili.modules.store.service.BillService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 166da7f5..3c320774 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dto.EvaluationQueryParams; import cn.lili.modules.member.entity.vo.MemberEvaluationListVO; import cn.lili.modules.member.entity.vo.MemberEvaluationVO; import cn.lili.modules.member.service.MemberEvaluationService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 3fd4ae10..2be516ae 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -10,7 +10,7 @@ import cn.lili.modules.order.order.entity.enums.CommunicationOwnerEnum; import cn.lili.modules.order.order.entity.vo.*; import cn.lili.modules.order.order.service.OrderComplaintCommunicationService; import cn.lili.modules.order.order.service.OrderComplaintService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java index acd8842a..eb10a898 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java @@ -5,7 +5,7 @@ import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.trade.entity.dos.OrderLog; import cn.lili.modules.order.trade.service.OrderLogService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index f62248c5..fe6cfec6 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -13,7 +13,7 @@ import cn.lili.modules.order.order.entity.vo.OrderSimpleVO; import cn.lili.modules.order.order.service.OrderPriceService; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.system.service.StoreLogisticsService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java index dc373ce5..25af43dc 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java @@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.dto.OrderReceiptDTO; import cn.lili.modules.order.order.entity.dto.ReceiptSearchParams; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.ReceiptService; -import cn.lili.modules.system.utils.OperationalJudgment; +import cn.lili.common.security.OperationalJudgment; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam;