diff --git a/admin/pom.xml b/admin/pom.xml index e2b538db..e49afebf 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -6,7 +6,8 @@ cn.lili lili-shop-parent - 4.2.0 + ${revision} + ../pom.xml admin @@ -15,7 +16,7 @@ de.codecentric spring-boot-admin-starter-server - 2.3.1 + ${spring-boot-admin} org.springframework.boot 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/common-api/pom.xml b/common-api/pom.xml index 0faa13d3..816a88be 100644 --- a/common-api/pom.xml +++ b/common-api/pom.xml @@ -11,7 +11,6 @@ ../pom.xml - cn.lili common-api diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index 99f571e9..96a45dee 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -2,7 +2,7 @@ package cn.lili.controller.common; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.base.service.RegionService; +import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; import io.swagger.annotations.Api; 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/entity/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java rename to framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java index ba8de6ba..3a216470 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/enums/ClientTypeEnum.java +++ b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.entity.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 c61cc7ef..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.entity.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/common/verification/service/impl/VerificationServiceImpl.java b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java index 53a87813..023734a9 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java @@ -9,9 +9,9 @@ import cn.lili.common.verification.SliderImageUtil; import cn.lili.common.verification.enums.VerificationEnums; import cn.lili.common.verification.service.VerificationService; import cn.lili.common.vo.SerializableStream; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.vo.VerificationVO; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.vo.VerificationVO; +import cn.lili.modules.system.service.VerificationSourceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java b/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java deleted file mode 100644 index 638da988..00000000 --- a/framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.lili.modules.base.entity.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * REDIS VO - * @author Chopper - * @date 2020/12/2 17:50 - */ -@Data -@AllArgsConstructor -public class RedisVo { - - private String key; - - private String value; -} 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 e9aa36f5..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.entity.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 f149e30b..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.entity.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/goods/entity/vos/GoodsParamsGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java index 9202f953..18d0a9d5 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java @@ -16,7 +16,7 @@ import java.util.List; public class GoodsParamsGroupVO implements Serializable { private static final long serialVersionUID = 1450550797436233753L; @ApiModelProperty("参数组关联的参数集合") - private List params; + private List params; @ApiModelProperty("参数组名称") private String groupName; @ApiModelProperty("参数组id") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java rename to framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java index 64deda4f..8b9a41e4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java @@ -12,7 +12,7 @@ import lombok.Data; * @date 2020-02-26 23:24:13 */ @Data -public class GoodsParamsDTOVO extends GoodsParamsDTO { +public class GoodsParamsVO extends GoodsParamsDTO { private static final long serialVersionUID = -4904700751774005326L; @ApiModelProperty("1 输入项 2 选择项") 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/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index 93903d48..bc102fca 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -9,7 +9,7 @@ import cn.lili.modules.goods.entity.dos.Category; import cn.lili.modules.goods.entity.dos.CategoryParameterGroup; import cn.lili.modules.goods.entity.vos.CategoryVO; import cn.lili.modules.goods.entity.vos.GoodsParamsGroupVO; -import cn.lili.modules.goods.entity.vos.GoodsParamsDTOVO; +import cn.lili.modules.goods.entity.vos.GoodsParamsVO; import cn.lili.modules.goods.mapper.CategoryMapper; import cn.lili.modules.goods.service.CategoryService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -268,13 +268,13 @@ public class CategoryServiceImpl extends ServiceImpl i * @param paramList 参数列表 * @return 拼装后的返回值 */ - private List convertParamList(List groupList, List paramList) { - Map> map = new HashMap<>(16); - for (GoodsParamsDTOVO param : paramList) { + private List convertParamList(List groupList, List paramList) { + Map> map = new HashMap<>(16); + for (GoodsParamsVO param : paramList) { if (map.get(param.getGroupId()) != null) { map.get(param.getGroupId()).add(param); } else { - List list = new ArrayList<>(); + List list = new ArrayList<>(); list.add(param); map.put(param.getGroupId(), list); } 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 6253615d..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.entity.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 bce45f9b..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.entity.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/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java index 425fcb72..6699442f 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java @@ -3,6 +3,7 @@ package cn.lili.modules.member.entity.aop.interceptor; import cn.lili.common.utils.CurrencyUtil; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberPointsHistory; +import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.service.MemberPointsHistoryService; import cn.lili.modules.member.service.MemberService; import lombok.extern.slf4j.Slf4j; @@ -55,9 +56,10 @@ public class PointLogInterceptor { MemberPointsHistory memberPointsHistory = new MemberPointsHistory(); memberPointsHistory.setMemberId(member.getId()); memberPointsHistory.setMemberName(member.getUsername()); - memberPointsHistory.setPointType(type ? 1 : 0); + memberPointsHistory.setPointType(type ? PointTypeEnum.INCREASE.name() : PointTypeEnum.REDUCE.name()); + memberPointsHistory.setVariablePoint(point); - memberPointsHistory.setBeforePoint(new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue()); + memberPointsHistory.setBeforePoint(true ? new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue() : new Double(CurrencyUtil.add(member.getPoint(), point)).longValue()); memberPointsHistory.setPoint(member.getPoint()); memberPointsHistory.setContent(obj[3] == null ? "" : obj[3].toString()); memberPointsHistory.setCreateBy("系统"); 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 dab8b591..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,6 +1,7 @@ package cn.lili.modules.member.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.common.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -76,7 +77,7 @@ public class Member extends BaseEntity { private String storeId; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端") private String clientEnum; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java index 7b11e00b..8da788be 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java @@ -73,9 +73,10 @@ public class MemberPointsHistory { @ApiModelProperty(value = "content") private String content; - @Min(message = "最小值为0", value = 0) - @Max(message = "最大值为1", value = 1) - @ApiModelProperty(value = "消费积分类型，1为增加，0为消费") - private Integer pointType; + /** + * @see cn.lili.modules.member.entity.enums.PointTypeEnum + */ + @ApiModelProperty(value = "消费积分类型") + private String pointType; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java new file mode 100644 index 00000000..3f965ae5 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java @@ -0,0 +1,29 @@ +package cn.lili.modules.member.entity.enums; + +/** + * 积分类型枚举 + * + * @author Chopper + * @date 2021/3/20 10:44 + */ + +public enum PointTypeEnum { + /** + * 增加 + */ + INCREASE("增加"), + /** + * 减少 + */ + REDUCE("减少"); + + private String description; + + public String description() { + return description; + } + + PointTypeEnum(String description) { + this.description = description; + } +} 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 48fa1943..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.entity.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 3e4db127..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.entity.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 36fa901d..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.entity.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; @@ -14,7 +14,6 @@ import cn.lili.modules.system.entity.dto.connect.dto.WechatConnectSettingItem; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import com.google.gson.Gson; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; 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 f9babe15..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.entity.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 b965ce2d..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.entity.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 29c3cd9c..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,5 +1,6 @@ package cn.lili.modules.order.cart.entity.vo; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.order.cart.entity.dto.StoreRemarkDTO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -22,7 +23,7 @@ public class TradeParams implements Serializable { private String way; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端") private String client; 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 34566861..5361566f 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.entity.enums.ClientTypeEnum; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.goods.entity.enums.GoodsTypeEnum; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.enums.CartTypeEnum; 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 8e5b28cd..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.entity.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 b222a1ce..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.entity.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 b60afe60..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,6 +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.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -49,7 +50,7 @@ public class PageData extends BaseEntity { private String pageType; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String pageClientType; 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 62a8531e..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,6 +1,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.common.enums.ClientTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -26,7 +27,7 @@ public class Special extends BaseEntity { private String specialName; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "楼层对应连接端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String clientType; 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 98af786b..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,5 +1,6 @@ package cn.lili.modules.page.entity.dto; +import cn.lili.common.enums.ClientTypeEnum; import cn.lili.modules.page.entity.enums.PageEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,7 +26,7 @@ public class PageDataDTO { private String pageType; /** - * @see cn.lili.modules.base.entity.enums.ClientTypeEnum + * @see ClientTypeEnum */ @ApiModelProperty(value = "客户端类型", allowableValues = "PC,H5,WECHAT_MP,APP") private String pageClientType; 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 60a14f62..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.entity.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 3538385a..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.entity.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 126726a8..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.entity.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 6d6ff965..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.entity.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 0cecb039..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.entity.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/base/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java similarity index 85% rename from framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java rename to framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java index 77ac279f..9acdfb9a 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java @@ -1,6 +1,7 @@ -package cn.lili.modules.base.entity.dos; +package cn.lili.modules.system.entity.dos; import cn.lili.base.BaseEntity; +import cn.lili.modules.system.entity.enums.VerificationSourceEnum; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,7 +31,7 @@ public class VerificationSource extends BaseEntity { private String resource; /** - * @see cn.lili.modules.base.entity.enums.VerificationSourceEnum + * @see VerificationSourceEnum */ @ApiModelProperty(value = "验证码资源类型 SLIDER/SOURCE") private String type; 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 e5a512ea..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.entity.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 9897cf72..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.entity.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/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java similarity index 88% rename from framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java rename to framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java index e8557ed0..a107cf7f 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.entity.enums; +package cn.lili.modules.system.entity.enums; /** diff --git a/framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java similarity index 79% rename from framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java rename to framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java index df5a1bca..02633434 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java @@ -1,6 +1,6 @@ -package cn.lili.modules.base.entity.vo; +package cn.lili.modules.system.entity.vo; -import cn.lili.modules.base.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.dos.VerificationSource; import lombok.Data; import java.io.Serializable; diff --git a/framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java similarity index 86% rename from framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java rename to framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java index 9e1e5751..809f8fae 100644 --- a/framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.mapper; +package cn.lili.modules.system.mapper; import cn.lili.modules.system.entity.dos.Region; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java similarity index 70% rename from framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java rename to framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java index 23928931..13fa054f 100644 --- a/framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java @@ -1,6 +1,6 @@ -package cn.lili.modules.base.mapper; +package cn.lili.modules.system.mapper; -import cn.lili.modules.base.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.dos.VerificationSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/base/service/RegionService.java rename to framework/src/main/java/cn/lili/modules/system/service/RegionService.java index f66f5de9..dc71e82e 100644 --- a/framework/src/main/java/cn/lili/modules/base/service/RegionService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java @@ -1,4 +1,4 @@ -package cn.lili.modules.base.service; +package cn.lili.modules.system.service; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; diff --git a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java similarity index 79% rename from framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java rename to framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java index 1527f9b9..4dc5b478 100644 --- a/framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java @@ -1,8 +1,8 @@ -package cn.lili.modules.base.service; +package cn.lili.modules.system.service; import cn.lili.common.cache.CachePrefix; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.vo.VerificationVO; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.vo.VerificationVO; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java similarity index 98% rename from framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java rename to framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index 4ce4e765..896f8489 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -1,11 +1,11 @@ -package cn.lili.modules.base.serviceimpl; +package cn.lili.modules.system.serviceimpl; import cn.lili.common.cache.Cache; import cn.lili.common.utils.HttpClientUtils; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; -import cn.lili.modules.base.mapper.RegionMapper; -import cn.lili.modules.base.service.RegionService; +import cn.lili.modules.system.mapper.RegionMapper; +import cn.lili.modules.system.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import cn.lili.modules.system.entity.vo.RegionVO; import com.alibaba.fastjson.JSONArray; diff --git a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java similarity index 82% rename from framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java rename to framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java index 9a595b11..dd7f0b39 100644 --- a/framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java @@ -1,13 +1,12 @@ -package cn.lili.modules.base.serviceimpl; +package cn.lili.modules.system.serviceimpl; import cn.lili.common.cache.Cache; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.entity.enums.VerificationSourceEnum; -import cn.lili.modules.base.entity.vo.VerificationVO; -import cn.lili.modules.base.mapper.VerificationSourceMapper; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.entity.enums.VerificationSourceEnum; +import cn.lili.modules.system.entity.vo.VerificationVO; +import cn.lili.modules.system.mapper.VerificationSourceMapper; +import cn.lili.modules.system.service.VerificationSourceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; 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 0047d219..b677a291 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/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 5dcbe2e3..92f8a6ec 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -5,8 +5,8 @@ import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; -import cn.lili.modules.base.entity.dos.VerificationSource; -import cn.lili.modules.base.service.VerificationSourceService; +import cn.lili.modules.system.entity.dos.VerificationSource; +import cn.lili.modules.system.service.VerificationSourceService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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 003cab68..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,8 +2,8 @@ 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.base.service.RegionService; +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; import io.swagger.annotations.ApiImplicitParam; 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 7e9cc270..37c02320 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/pom.xml b/pom.xml index 6aadc57b..411f37da 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,7 @@ 4.3 2.3.0 1.2.2 + 2.3.1 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; diff --git a/socket-api/src/main/resources/application.yml b/socket-api/src/main/resources/application.yml deleted file mode 100644 index 4b502b6e..00000000 --- a/socket-api/src/main/resources/application.yml +++ /dev/null @@ -1,295 +0,0 @@ -server: - port: 8885 - servlet: - context-path: / - - tomcat: - uri-encoding: UTF-8 - threads: - min-spare: 50 - max: 1000 - -# 与Spring Boot 2一样，默认情况下，大多数端点都不通过http公开，我们公开了所有端点。对于生产，您应该仔细选择要公开的端点。 -management: - # health: - # elasticsearch: - # enabled: false - # datasource: - # enabled: false - endpoints: - web: - exposure: - include: '*' -spring: - # 要在其中注册的Spring Boot Admin Server的URL。 - boot: - admin: - client: - url: http://127.0.0.1:8000 - # mongodb - data: - mongodb: - host: 127.0.0.1 - port: 27017 - database: lilishop - username: root - password: lilishop - authentication-database: admin - # replica-set-name: mongoreplset - cache: - type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false - # Redis - redis: - host: 127.0.0.1 - port: 6379 - password: lilishop - lettuce: - pool: - # 连接池最大连接数（使用负值表示没有限制） 默认 8 - max-active: 200 - # 连接池最大阻塞等待时间（使用负值表示没有限制） 默认 -1 - max-wait: 20 - # 连接池中的最大空闲连接 默认 8 - max-idle: 10 - # 连接池中的最小空闲连接 默认 8 - min-idle: 8 - # 文件大小上传配置 - servlet: - multipart: - max-file-size: 20MB - max-request-size: 20MB - jackson: - time-zone: GMT+8 - serialization: - #关闭jackson 对json做解析 - fail-on-empty-beans: false - - shardingsphere: - datasource: - # 数据库名称，可自定义，可以为多个，以逗号隔开，每个在这里定义的库，都要在下面定义连接属性 - names: default-datasource - default-datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: lilishop - maxActive: 20 - initialSize: 5 - maxWait: 60000 - minIdle: 5 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - #是否缓存preparedStatement，也就是PSCache。在mysql下建议关闭。 PSCache对支持游标的数据库性能提升巨大，比如说oracle。 - poolPreparedStatements: false - #要启用PSCache，-1为关闭 必须配置大于0，当大于0时，poolPreparedStatements自动触发修改为true 可以把这个数值配置大一些，比如说100 - maxOpenPreparedStatements: -1 - #配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙 - filters: stat,wall,log4j2 - #通过connectProperties属性来打开mergeSql功能；慢SQL记录 - connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 - #合并多个DruidDataSource的监控数据 - useGlobalDataSourceStat: true - loginUsername: druid - loginPassword: druid - # sharding: - # default-data-source-name: default-datasource - # #需要拆分的表，可以设置多个 在 li_order 级别即可 - # tables: - # #需要进行分表的逻辑表名 - # li_order: - # #实际的表结点,下面代表的是li_order_为开头的所有表，如果能确定表的范围例如按月份分表，这里的写法是data2020.li_order_$->{2020..2021}_$->{01..12} 表示例如 li_order_2020_01 li_order_2020_03 li_order_2021_01 - # actual-data-nodes: data2020.li_order_$->{2019..2021}_$->{01..12} - # table-strategy: - # # 分表策略，根据创建日期 - # standard: - # sharding-column: create_time - # #分表策略 - # precise-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm - # #范围查询实现 - # range-algorithm-class-name: cn.lili.config.sharding.CreateTimeShardingTableAlgorithm - props: - #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭 - sql: - show: true - -# 忽略鉴权url -ignored: - urls: - - /editor-app/** - - /actuator** - - /actuator/** - - /MP_verify_qSyvBPhDsPdxvOhC.txt - - /weixin/** - - /source/** - - /buyer/mini-program/** - - /buyer/cashier/** - - /buyer/pageData/** - - /buyer/article/** - - /buyer/goods/** - - /buyer/category/** - - /buyer/shop/** - - /buyer/connect/** - - /buyer/members/smsLogin - - /buyer/members/refresh/* - - /buyer/members/refresh** - - /buyer/promotion/pintuan - - /buyer/promotion/seckill - - /buyer/memberEvaluation/**/goodsEvaluation - - /buyer/memberEvaluation/**/evaluationNumber - - /store/login/** - - /manager/user/login - - /manager/user/refresh/** - - /druid/** - - /swagger-ui.html - - /doc.html - - /swagger-resources/** - - /swagger/** - - /**/**.js - - /**/**.png - - /**/**.css - - /webjars/** - - /v2/api-docs - - /configuration/ui - - /boot-admin - statics: - - /**/*.js - - /**/*.css - - /**/*.png - - /**/*.ico - -# Swagger界面内容配置 -swagger: - title: lili API接口文档 - description: lili Api Documentation - version: 1.0.0 - termsOfServiceUrl: https://pickmall.cn - contact: - name: lili - url: https://pickmall.cn - email: admin@pickmall.com - -# Mybatis-plus -mybatis-plus: - mapper-locations: classpath*:mapper/*.xml - configuration: - #缓存开启 - cache-enabled: true - #日志 -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - -# 日志 -logging: - # 输出级别 - level: - cn.lili: info - # org.hibernate: debug - # org.springframework: debug - # org.springframework.data.mongodb.core: debug - file: - # 指定路径 - path: lili-logs - # 最大保存天数 - max-history: 7 - # 每个文件最大大小 - max-size: 5MB -#加密参数 -jasypt: - encryptor: - password: lili - -lili: - system: - isDemoSite: true - statistics: - # 在线人数统计 X 小时。这里设置48，即统计过去48小时每小时在线人数 - onlineMember: 48 - # 当前在线人数刷新时间间隔，单位秒，设置为600，则每10分钟刷新一次 - currentOnlineUpdate: 600 - #qq lbs 申请 - lbs: - key: 4BYBZ-7MT6S-PUAOA-6BNWL-FJUD7-UUFXT - sk: zhNKVrJK6UPOhqIjn8AQvG37b9sz6 - #域名 - domain: - pc: http://127.0.0.1:8888 - wap: http://127.0.0.1:8888 - seller: http://127.0.0.1:8888 - admin: http://127.0.0.1:8888 - #api地址 - api: - buyer: https://z171l91606.51mypc.cn/ - base: http://127.0.0.1:8888 - manager: http://127.0.0.1:8888 - seller: http://127.0.0.1:8888 - - # jwt 细节设定 - jwt-setting: - # token过期时间（分钟） - tokenExpireTime: 60 - - # 使用Spring @Cacheable注解失效时间 - cache: - # 过期时间 单位秒 永久不过期设为-1 - timeout: 1500 - #多线程配置 - thread: - corePoolSize: 5 - maxPoolSize: 50 - queueCapacity: 50 - data: - elasticsearch: - cluster-name: elasticsearch - cluster-nodes: 127.0.0.1:9200 - index: - number-of-replicas: 0 - number-of-shards: 3 - index-prefix: lili - schema: http - # account: - # username: elastic - # password: LiLiShopES - - rocketmq: - promotion-topic: lili_promotion_topic - promotion-group: lili_promotion_group - msg-ext-topic: lili_msg_topic - msg-ext-group: lili_msg_group - goods-topic: lili_goods_topic - goods-group: lili_goods_group - order-topic: lili_order_topic - order-group: lili_order_group - member-topic: lili_member_topic - member-group: lili_member_group - other-topic: lili_other_topic - other-group: lili_other_group - notice-topic: lili_notice_topic - notice-group: lili_notice_group - notice-send-topic: lili_send_notice_topic - notice-send-group: lili_send_notice_group -rocketmq: - name-server: 127.0.0.1:9876 - producer: - group: lili_group - send-message-timeout: 30000 - -xxl: - job: - admin: - addresses: http://127.0.0.1:9001/xxl-job-admin - executor: - appname: xxl-job-executor-lilishop - address: - ip: - port: 8891 - logpath: ./xxl-job/executor - logretentiondays: 7 \ No newline at end of file diff --git a/update-sql/version4.1to4.2.sql b/update-sql/version4.1to4.2.sql index c801755e..ee0c7839 100644 --- a/update-sql/version4.1to4.2.sql +++ b/update-sql/version4.1to4.2.sql @@ -9,4 +9,8 @@ ALTER TABLE li_article_category alter column sort set default 0; INSERT INTO `lilishop`.`li_menu`(`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `description`, `front_route`, `icon`, `level`, `name`, `parent_id`, `path`, `sort_order`, `title`, `front_component`) VALUES (1410862675914764290, 'admin', '2021-07-02 15:27:29', b'0', 'admin', '2021-07-02 15:27:45', 'null', 'distribution/distributionCash', '', 2, 'distributionCash', '1374173575405109248', 'distributionCash', 5.00, '分销提现', 'null'); /** 促销商品添加商品类型**/ -ALTER TABLE li_promotion_goods ADD goods_type varchar (200); \ No newline at end of file +ALTER TABLE li_promotion_goods ADD goods_type varchar (200); +/** 修改历史积分积分类型的字段类型 **/ +alter table li_member_points_history modify column point_type varchar(50); +update li_member_points_history set point_type = 'INCREASE' where point_type=1; +update li_member_points_history set point_type = 'REDUCE' where point_type=0; \ No newline at end of file