From a9c79eedd4c2cd3bc510e3184ed38a517ab0b3ee Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 16 Jul 2021 10:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=BC=A9=E5=87=8F=E3=80=82=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=88=A4=E5=AE=9A=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../other/broadcast/StudioController.java | 4 ++-- .../cn/lili/event/impl/PaymentExecute.java | 5 +---- .../impl/broadcast/BroadcastExecute.java | 2 +- .../BroadcastTimeTriggerExecutor.java | 2 +- .../base => common}/enums/ClientTypeEnum.java | 2 +- .../base/generate/MemberTokenGenerate.java | 2 +- .../serviceimpl/ConnectServiceImpl.java | 2 +- .../modules/connect/util/ConnectUtil.java | 2 +- .../entity/dos/Commodity.java | 2 +- .../entity/dos/Studio.java | 2 +- .../entity/dos/StudioCommodity.java | 2 +- .../entity/dto/CommodityDTO.java | 2 +- .../entity/dto/GoodsInfo.java | 4 ++-- .../entity/dto/SimpleCommodity.java | 2 +- .../entity/enums/StudioStatusEnum.java | 2 +- .../entity/vos/CommodityVO.java | 4 ++-- .../entity/vos/StudioVO.java | 6 +++--- .../mapper/CommodityMapper.java | 6 +++--- .../mapper/StudioCommodityMapper.java | 4 ++-- .../mapper/StudioMapper.java | 4 ++-- .../service/CommodityService.java | 6 +++--- .../service/StudioCommodityService.java | 4 ++-- .../service/StudioService.java | 6 +++--- .../serviceimpl/CommodityServiceImpl.java | 14 ++++++------- .../StudioCommodityServiceImpl.java | 8 ++++---- .../serviceimpl/StudioServiceImpl.java | 20 +++++++++---------- .../util/WechatLivePlayerUtil.java | 10 +++++----- .../util/WechatMediaUtil.java | 4 ++-- .../modules/member/entity/dos/Member.java | 2 +- .../WechatMPMessageServiceImpl.java | 2 +- .../serviceimpl/WechatMessageServiceImpl.java | 2 +- .../message/util/WechatAccessTokenUtil.java | 2 +- .../message/util/WechatMessageUtil.java | 2 +- .../message/util/WechatMpCodeUtil.java | 2 +- .../order/cart/entity/vo/TradeParams.java | 2 +- .../modules/order/order/entity/dos/Order.java | 2 +- .../order/order/entity/vo/OrderSimpleVO.java | 2 +- .../order/order/entity/vo/PaymentLog.java | 2 +- .../modules/page/entity/dos/PageData.java | 2 +- .../lili/modules/page/entity/dos/Special.java | 2 +- .../modules/page/entity/dto/PageDataDTO.java | 2 +- .../page/serviceimpl/PageDataServiceImpl.java | 2 +- .../modules/payment/kit/CashierSupport.java | 2 +- .../kit/plugin/bank/BankTransferPlugin.java | 2 +- .../kit/plugin/wechat/WechatPlugin.java | 2 +- .../PlatformViewDataServiceImpl.java | 2 +- .../aspect/DemoInterceptor.java | 2 +- .../{base => system}/aspect/DemoSite.java | 2 +- .../dto/payment/PaymentSupportSetting.java | 2 +- .../dto/payment/dto/PaymentSupportForm.java | 2 +- .../member/MemberManagerController.java | 2 +- .../other/PageDataManagerController.java | 2 +- .../broadcast/CommodityManagerController.java | 4 ++-- .../broadcast/StudioManagerController.java | 6 +++--- .../passport/AdminUserManagerController.java | 2 +- .../permission/MenuManagerController.java | 2 +- .../setting/RegionManagerController.java | 2 +- .../setting/SettingManagerController.java | 2 +- .../store/StoreManagerController.java | 2 +- .../broadcast/CommodityStoreController.java | 6 +++--- .../broadcast/StudioStoreController.java | 6 +++--- 61 files changed, 105 insertions(+), 108 deletions(-) rename framework/src/main/java/cn/lili/{modules/base => common}/enums/ClientTypeEnum.java (94%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dos/Commodity.java (97%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dos/Studio.java (98%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dos/StudioCommodity.java (96%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dto/CommodityDTO.java (90%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dto/GoodsInfo.java (91%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/dto/SimpleCommodity.java (88%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/enums/StudioStatusEnum.java (90%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/vos/CommodityVO.java (77%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/entity/vos/StudioVO.java (67%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/mapper/CommodityMapper.java (92%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/mapper/StudioCommodityMapper.java (69%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/mapper/StudioMapper.java (68%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/service/CommodityService.java (86%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/service/StudioCommodityService.java (69%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/service/StudioService.java (92%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/serviceimpl/CommodityServiceImpl.java (92%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/serviceimpl/StudioCommodityServiceImpl.java (60%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/serviceimpl/StudioServiceImpl.java (94%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/util/WechatLivePlayerUtil.java (96%) rename framework/src/main/java/cn/lili/modules/{broadcast => goods}/util/WechatMediaUtil.java (98%) rename framework/src/main/java/cn/lili/modules/{base => system}/aspect/DemoInterceptor.java (95%) rename framework/src/main/java/cn/lili/modules/{base => system}/aspect/DemoSite.java (85%) diff --git a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java index b0235aa2..23e37f8a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java @@ -3,8 +3,8 @@ package cn.lili.controller.other.broadcast; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.service.StudioService; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.service.StudioService; 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/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java index 6c3ed4e6..33819f7c 100644 --- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java @@ -36,10 +36,7 @@ public class PaymentExecute implements OrderStatusChangeEvent { switch (orderMessage.getNewStatus()) { case CANCELLED: Order order = orderService.getBySn(orderMessage.getOrderSn()); - //未付款不做处理 直接返回 - if (order.getPayStatus() == PayStatusEnum.UNPAID.name()) { - return; - } + //如果未付款，则不去要退回相关代码执行 if (order.getPayStatus().equals(PayStatusEnum.UNPAID.name())) { return; diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java index 9982d57d..3f3b5c70 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java @@ -1,6 +1,6 @@ package cn.lili.timetask.handler.impl.broadcast; -import cn.lili.modules.broadcast.service.CommodityService; +import cn.lili.modules.goods.service.CommodityService; 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/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java index d6088916..b421b129 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java @@ -3,7 +3,7 @@ package cn.lili.trigger.executor; import cn.hutool.json.JSONUtil; import cn.lili.common.delayqueue.BroadcastMessage; import cn.lili.common.trigger.model.TimeExecuteConstant; -import cn.lili.modules.broadcast.service.StudioService; +import cn.lili.modules.goods.service.StudioService; import cn.lili.trigger.TimeTriggerExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java rename to framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java index 44f26aee..3a216470 100644 --- a/framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java +++ b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.enums; +package cn.lili.common.enums; /** diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java index f74fd0dc..003c0db1 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java @@ -6,7 +6,7 @@ import cn.lili.common.token.Token; import cn.lili.common.token.TokenUtil; import cn.lili.common.token.base.AbstractTokenGenerate; import cn.lili.config.context.ThreadContextHolder; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index a7c1b80a..e54a3f8f 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -13,7 +13,7 @@ import cn.lili.common.token.base.generate.MemberTokenGenerate; import cn.lili.common.utils.CookieUtil; import cn.lili.common.utils.StringUtils; import cn.lili.config.context.ThreadContextHolder; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.dto.ConnectAuthUser; import cn.lili.modules.connect.entity.dto.WechatMPLoginParams; diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index a774e883..814a3e7b 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java @@ -10,7 +10,7 @@ import cn.lili.common.token.Token; import cn.lili.common.vo.ResultMessage; import cn.lili.config.properties.ApiProperties; import cn.lili.config.properties.DomainProperties; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.connect.config.AuthConfig; import cn.lili.modules.connect.config.ConnectAuthEnum; import cn.lili.modules.connect.entity.dto.AuthCallback; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java index ed0d840f..5d053995 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.dos; +package cn.lili.modules.goods.entity.dos; import cn.lili.base.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Studio.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Studio.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java index 2eebe3b5..90dcdd73 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Studio.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.dos; +package cn.lili.modules.goods.entity.dos; import cn.lili.base.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/StudioCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dos/StudioCommodity.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java index bc11e409..19c16c43 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dos/StudioCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.dos; +package cn.lili.modules.goods.entity.dos; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java similarity index 90% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java index 97b33027..daf86bd5 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.dto; +package cn.lili.modules.goods.entity.dto; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java similarity index 91% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java index 0328ae28..c43b04cd 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java @@ -1,7 +1,7 @@ -package cn.lili.modules.broadcast.entity.dto; +package cn.lili.modules.goods.entity.dto; import cn.lili.common.utils.BeanUtil; -import cn.lili.modules.broadcast.entity.dos.Commodity; +import cn.lili.modules.goods.entity.dos.Commodity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/SimpleCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/dto/SimpleCommodity.java rename to framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java index 0b24cc76..0e1bdecf 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/dto/SimpleCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.dto; +package cn.lili.modules.goods.entity.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java similarity index 90% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java rename to framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java index 3386c9e1..b3510524 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.entity.enums; +package cn.lili.modules.goods.entity.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/vos/CommodityVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java similarity index 77% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/vos/CommodityVO.java rename to framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java index 012ac5b0..3e3ff8d9 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/vos/CommodityVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java @@ -1,6 +1,6 @@ -package cn.lili.modules.broadcast.entity.vos; +package cn.lili.modules.goods.entity.vos; -import cn.lili.modules.broadcast.entity.dos.Commodity; +import cn.lili.modules.goods.entity.dos.Commodity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/entity/vos/StudioVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java similarity index 67% rename from framework/src/main/java/cn/lili/modules/broadcast/entity/vos/StudioVO.java rename to framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java index 9d207e44..8e69a784 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/entity/vos/StudioVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java @@ -1,7 +1,7 @@ -package cn.lili.modules.broadcast.entity.vos; +package cn.lili.modules.goods.entity.vos; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.dos.Studio; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.dos.Studio; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java similarity index 92% rename from framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java rename to framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java index 285627e4..a2d2f58f 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java @@ -1,7 +1,7 @@ -package cn.lili.modules.broadcast.mapper; +package cn.lili.modules.goods.mapper; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.vos.CommodityVO; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.vos.CommodityVO; 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/broadcast/mapper/StudioCommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java similarity index 69% rename from framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioCommodityMapper.java rename to framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java index 24f61928..32fa0e7c 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioCommodityMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java @@ -1,6 +1,6 @@ -package cn.lili.modules.broadcast.mapper; +package cn.lili.modules.goods.mapper; -import cn.lili.modules.broadcast.entity.dos.StudioCommodity; +import cn.lili.modules.goods.entity.dos.StudioCommodity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java similarity index 68% rename from framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioMapper.java rename to framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java index 37ed4740..de5c6522 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java @@ -1,6 +1,6 @@ -package cn.lili.modules.broadcast.mapper; +package cn.lili.modules.goods.mapper; -import cn.lili.modules.broadcast.entity.dos.Studio; +import cn.lili.modules.goods.entity.dos.Studio; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java similarity index 86% rename from framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java rename to framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java index ae6cb592..669215e5 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java @@ -1,8 +1,8 @@ -package cn.lili.modules.broadcast.service; +package cn.lili.modules.goods.service; import cn.lili.common.vo.PageVO; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.vos.CommodityVO; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.vos.CommodityVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/service/StudioCommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java similarity index 69% rename from framework/src/main/java/cn/lili/modules/broadcast/service/StudioCommodityService.java rename to framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java index 27321937..ced678fb 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/service/StudioCommodityService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java @@ -1,6 +1,6 @@ -package cn.lili.modules.broadcast.service; +package cn.lili.modules.goods.service; -import cn.lili.modules.broadcast.entity.dos.StudioCommodity; +import cn.lili.modules.goods.entity.dos.StudioCommodity; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/framework/src/main/java/cn/lili/modules/broadcast/service/StudioService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java similarity index 92% rename from framework/src/main/java/cn/lili/modules/broadcast/service/StudioService.java rename to framework/src/main/java/cn/lili/modules/goods/service/StudioService.java index 0acb351b..d102dd7a 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/service/StudioService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java @@ -1,9 +1,9 @@ -package cn.lili.modules.broadcast.service; +package cn.lili.modules.goods.service; import cn.lili.common.delayqueue.BroadcastMessage; import cn.lili.common.vo.PageVO; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.entity.vos.StudioVO; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.entity.vos.StudioVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java similarity index 92% rename from framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java rename to framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java index 9a277950..088ffc6b 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.serviceimpl; +package cn.lili.modules.goods.serviceimpl; import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONArray; @@ -10,12 +10,12 @@ import cn.lili.common.security.context.UserContext; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.dto.CommodityDTO; -import cn.lili.modules.broadcast.entity.vos.CommodityVO; -import cn.lili.modules.broadcast.mapper.CommodityMapper; -import cn.lili.modules.broadcast.service.CommodityService; -import cn.lili.modules.broadcast.util.WechatLivePlayerUtil; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.dto.CommodityDTO; +import cn.lili.modules.goods.entity.vos.CommodityVO; +import cn.lili.modules.goods.mapper.CommodityMapper; +import cn.lili.modules.goods.service.CommodityService; +import cn.lili.modules.goods.util.WechatLivePlayerUtil; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; import cn.lili.modules.goods.service.GoodsSkuService; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioCommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java similarity index 60% rename from framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioCommodityServiceImpl.java rename to framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java index a87c619a..8111b8c7 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioCommodityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java @@ -1,8 +1,8 @@ -package cn.lili.modules.broadcast.serviceimpl; +package cn.lili.modules.goods.serviceimpl; -import cn.lili.modules.broadcast.entity.dos.StudioCommodity; -import cn.lili.modules.broadcast.mapper.StudioCommodityMapper; -import cn.lili.modules.broadcast.service.StudioCommodityService; +import cn.lili.modules.goods.entity.dos.StudioCommodity; +import cn.lili.modules.goods.mapper.StudioCommodityMapper; +import cn.lili.modules.goods.service.StudioCommodityService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java similarity index 94% rename from framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java rename to framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java index 0cbc71e0..aa487b98 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lili.modules.broadcast.serviceimpl; +package cn.lili.modules.goods.serviceimpl; import cn.hutool.core.convert.Convert; import cn.hutool.json.JSONUtil; @@ -17,15 +17,15 @@ import cn.lili.common.utils.DateUtil; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.config.rocketmq.RocketmqCustomProperties; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.entity.dos.StudioCommodity; -import cn.lili.modules.broadcast.entity.enums.StudioStatusEnum; -import cn.lili.modules.broadcast.entity.vos.StudioVO; -import cn.lili.modules.broadcast.mapper.CommodityMapper; -import cn.lili.modules.broadcast.mapper.StudioMapper; -import cn.lili.modules.broadcast.service.StudioCommodityService; -import cn.lili.modules.broadcast.service.StudioService; -import cn.lili.modules.broadcast.util.WechatLivePlayerUtil; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.entity.dos.StudioCommodity; +import cn.lili.modules.goods.entity.enums.StudioStatusEnum; +import cn.lili.modules.goods.entity.vos.StudioVO; +import cn.lili.modules.goods.mapper.CommodityMapper; +import cn.lili.modules.goods.mapper.StudioMapper; +import cn.lili.modules.goods.service.StudioCommodityService; +import cn.lili.modules.goods.service.StudioService; +import cn.lili.modules.goods.util.WechatLivePlayerUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java rename to framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java index d982b318..7c19170f 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java @@ -1,11 +1,11 @@ -package cn.lili.modules.broadcast.util; +package cn.lili.modules.goods.util; import cn.hutool.json.JSONObject; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.entity.dto.GoodsInfo; +import cn.lili.common.enums.ClientTypeEnum; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.entity.dto.GoodsInfo; import cn.lili.modules.message.util.WechatAccessTokenUtil; import cn.lili.modules.system.utils.HttpUtils; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java rename to framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java index a4c12296..6053b7f3 100644 --- a/framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java @@ -1,9 +1,9 @@ -package cn.lili.modules.broadcast.util; +package cn.lili.modules.goods.util; import cn.hutool.json.JSONObject; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.message.util.WechatAccessTokenUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java index 73d3dc76..6b95367d 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java @@ -1,7 +1,7 @@ package cn.lili.modules.member.entity.dos; import cn.lili.base.BaseEntity; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java index 806e2c06..f9e9fee5 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.WechatMPMessage; import cn.lili.modules.message.entity.enums.WechatMessageItemEnums; import cn.lili.modules.message.mapper.WechatMPMessageMapper; diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java index 2281053a..7fa749c4 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.WechatMessage; import cn.lili.modules.message.entity.enums.WechatMessageItemEnums; import cn.lili.modules.message.mapper.WechatMessageMapper; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java index e6a38619..d4c6e15a 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java @@ -6,7 +6,7 @@ import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.connect.util.HttpUtils; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.connect.WechatConnectSetting; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java index ae3a4fc7..1c16343a 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java @@ -7,7 +7,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.DateUtil; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.enums.ConnectEnum; import cn.lili.modules.connect.service.ConnectService; diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java index b65e5ad1..ba93afa6 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java @@ -2,7 +2,7 @@ package cn.lili.modules.message.util; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.message.entity.dos.ShortLink; import cn.lili.modules.message.service.ShortLinkService; import com.alibaba.fastjson.JSON; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java index 59e7d9f7..a9cb3d00 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java @@ -1,6 +1,6 @@ package cn.lili.modules.order.cart.entity.vo; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.cart.entity.dto.StoreRemarkDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index dea2f29c..d936bca4 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -3,7 +3,7 @@ package cn.lili.modules.order.order.entity.dos; import cn.hutool.json.JSONUtil; import cn.lili.base.BaseEntity; import cn.lili.common.utils.BeanUtil; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.goods.entity.enums.GoodsTypeEnum; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index b36d0fec..1d6f9319 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.entity.vo; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.enums.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java index 6f733c0a..a38ca62a 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java @@ -1,7 +1,7 @@ package cn.lili.modules.order.order.entity.vo; import cn.lili.base.BaseEntity; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.enums.OrderTypeEnum; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java index 25f6fba6..fd30ba49 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java @@ -3,7 +3,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; import cn.lili.common.security.context.UserContext; import cn.lili.common.enums.SwitchEnum; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java index 371338ff..9381253a 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java @@ -1,7 +1,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; 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/page/entity/dto/PageDataDTO.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java index 2967140b..0bed2e74 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java @@ -1,6 +1,6 @@ package cn.lili.modules.page.entity.dto; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index 3bc89bfa..ceb0c659 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -5,7 +5,7 @@ import cn.lili.common.enums.SwitchEnum; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.dos.PageData; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.enums.PageEnum; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java index b7678f6b..742e4854 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java @@ -6,7 +6,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.SpringContextUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.enums.PaymentClientEnum; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java index c9b23757..29fd768a 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java @@ -1,6 +1,6 @@ package cn.lili.modules.payment.kit.plugin.bank; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.payment.entity.RefundLog; import cn.lili.modules.payment.kit.Payment; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index c3e4ef6a..ef603306 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -16,7 +16,7 @@ import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; import cn.lili.config.properties.ApiProperties; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.connect.entity.Connect; import cn.lili.modules.connect.entity.enums.ConnectEnum; import cn.lili.modules.connect.service.ConnectService; 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 4effefa4..7a2258c5 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 @@ -7,7 +7,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.CurrencyUtil; import cn.lili.config.properties.StatisticsProperties; -import cn.lili.modules.base.enums.ClientTypeEnum; +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; diff --git a/framework/src/main/java/cn/lili/modules/base/aspect/DemoInterceptor.java b/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/base/aspect/DemoInterceptor.java rename to framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java index b7d71308..ce0ffce7 100644 --- a/framework/src/main/java/cn/lili/modules/base/aspect/DemoInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.aspect; +package cn.lili.modules.system.aspect; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; diff --git a/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java b/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java similarity index 85% rename from framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java rename to framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java index c97d3eb1..eb2d8769 100644 --- a/framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.aspect; +package cn.lili.modules.system.aspect; import java.lang.annotation.*; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java index 60d492c7..ed86b3ee 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dto.payment; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm; import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java index 0b35f6e6..5da62134 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java @@ -1,6 +1,6 @@ package cn.lili.modules.system.entity.dto.payment.dto; -import cn.lili.modules.base.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import lombok.Data; import lombok.experimental.Accessors; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java index b63f405f..a42b9ea1 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO; import cn.lili.modules.member.entity.dto.MemberAddDTO; diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index 15c16d39..8c4ec943 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.other; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.page.entity.dos.PageData; import cn.lili.modules.page.entity.dto.PageDataDTO; import cn.lili.modules.page.entity.vos.PageDataListVO; diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java index 7c87b697..6b234cb3 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java @@ -3,8 +3,8 @@ package cn.lili.controller.other.broadcast; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.broadcast.entity.vos.CommodityVO; -import cn.lili.modules.broadcast.service.CommodityService; +import cn.lili.modules.goods.entity.vos.CommodityVO; +import cn.lili.modules.goods.service.CommodityService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java index d510874d..b2957046 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java @@ -5,9 +5,9 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.entity.vos.StudioVO; -import cn.lili.modules.broadcast.service.StudioService; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.entity.vos.StudioVO; +import cn.lili.modules.goods.service.StudioService; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index 9bc52024..ef8e3113 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -13,7 +13,7 @@ import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.permission.entity.dos.AdminUser; import cn.lili.modules.permission.entity.dto.AdminUserDTO; import cn.lili.modules.permission.entity.vo.AdminUserVO; diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index fb7e1bce..ba69cb2c 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.permission.entity.dos.Menu; import cn.lili.modules.permission.entity.dto.MenuSearchParams; import cn.lili.modules.permission.entity.vo.MenuVO; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 8355e098..dca3995d 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -2,7 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import io.swagger.annotations.Api; diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index 3f301f0f..5021c6d9 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.system.entity.dos.Setting; import cn.lili.modules.system.entity.dto.*; import cn.lili.modules.system.entity.dto.connect.QQConnectSetting; diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index 90f8412f..8726b138 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -3,7 +3,7 @@ package cn.lili.controller.store; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.aspect.DemoSite; +import cn.lili.modules.system.aspect.DemoSite; import cn.lili.modules.goods.entity.vos.CategoryVO; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO; diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java index 30cbb04b..caea7622 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java @@ -5,9 +5,9 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.broadcast.entity.dos.Commodity; -import cn.lili.modules.broadcast.entity.vos.CommodityVO; -import cn.lili.modules.broadcast.service.CommodityService; +import cn.lili.modules.goods.entity.dos.Commodity; +import cn.lili.modules.goods.entity.vos.CommodityVO; +import cn.lili.modules.goods.service.CommodityService; 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/broadcast/StudioStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java index 592aec0b..3049975e 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 @@ -5,9 +5,9 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.broadcast.entity.dos.Studio; -import cn.lili.modules.broadcast.entity.vos.StudioVO; -import cn.lili.modules.broadcast.service.StudioService; +import cn.lili.modules.goods.entity.dos.Studio; +import cn.lili.modules.goods.entity.vos.StudioVO; +import cn.lili.modules.goods.service.StudioService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam;