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

代码结构优化，缩减。一个多次判定问题处理

Browse Source
This commit is contained in:
Chopper 2021-07-16 10:40:44 +08:00
parent ac5d04ddc2
commit a9c79eedd4
61 changed files with 105 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
View File

@ -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;

5
consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java
View File

@ -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;

2
consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java
View File

@ -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;

2
consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/base/enums/ClientTypeEnum.java → framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.base.enums;
package cn.lili.common.enums;
/**

2
framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Commodity.java → framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/dos/Studio.java → framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/dos/StudioCommodity.java → framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/dto/CommodityDTO.java → framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.broadcast.entity.dto;
package cn.lili.modules.goods.entity.dto;
import lombok.Data;

4
framework/src/main/java/cn/lili/modules/broadcast/entity/dto/GoodsInfo.java → framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/dto/SimpleCommodity.java → framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.broadcast.entity.dto;
package cn.lili.modules.goods.entity.dto;
import io.swagger.annotations.ApiModelProperty;

2
framework/src/main/java/cn/lili/modules/broadcast/entity/enums/StudioStatusEnum.java → framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java
View File

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

4
framework/src/main/java/cn/lili/modules/broadcast/entity/vos/CommodityVO.java → framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java
View File

@ -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;

6
framework/src/main/java/cn/lili/modules/broadcast/entity/vos/StudioVO.java → framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java
View File

@ -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;

6
framework/src/main/java/cn/lili/modules/broadcast/mapper/CommodityMapper.java → framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioCommodityMapper.java → framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java
View File

@ -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;
/**

4
framework/src/main/java/cn/lili/modules/broadcast/mapper/StudioMapper.java → framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java
View File

@ -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;
/**

6
framework/src/main/java/cn/lili/modules/broadcast/service/CommodityService.java → framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/broadcast/service/StudioCommodityService.java → framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java
View File

@ -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;
/**

6
framework/src/main/java/cn/lili/modules/broadcast/service/StudioService.java → framework/src/main/java/cn/lili/modules/goods/service/StudioService.java
View File

@ -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;

14
framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/CommodityServiceImpl.java → framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java
View File

@ -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;

8
framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioCommodityServiceImpl.java → framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java
View File

@ -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;

20
framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java → framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java
View File

@ -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;

10
framework/src/main/java/cn/lili/modules/broadcast/util/WechatLivePlayerUtil.java → framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/broadcast/util/WechatMediaUtil.java → framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMPMessageServiceImpl.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/message/serviceimpl/WechatMessageServiceImpl.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/message/util/WechatAccessTokenUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/message/util/WechatMpCodeUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/bank/BankTransferPlugin.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
View File

@ -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;

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

@ -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;

2
framework/src/main/java/cn/lili/modules/base/aspect/DemoInterceptor.java → framework/src/main/java/cn/lili/modules/system/aspect/DemoInterceptor.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/base/aspect/DemoSite.java → framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.base.aspect;
package cn.lili.modules.system.aspect;
import java.lang.annotation.*;

2
framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/system/entity/dto/payment/dto/PaymentSupportForm.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
View File

@ -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;

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

@ -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;

6
manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
View File

@ -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;

2
manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
View File

@ -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;

6
seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java
View File

@ -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;

6
seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java
View File

@ -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;