code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
lifenlong
2021-07-18 13:43:34 +08:00
parent e0ca366431 a9c79eedd4
commit d4642d85dd
85 changed files with 193 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
package cn.lili.modules.base.entity.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.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;

6
framework/src/main/java/cn/lili/common/verification/service/impl/VerificationServiceImpl.java
View File

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

18
framework/src/main/java/cn/lili/modules/base/entity/vo/RedisVo.java
View File

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

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

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

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;

2
framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java
View File

@@ -16,7 +16,7 @@ import java.util.List;
public class GoodsParamsGroupVO implements Serializable {
private static final long serialVersionUID = 1450550797436233753L;
@ApiModelProperty("参数组关联的参数集合")
private List<GoodsParamsDTOVO> params;
private List<GoodsParamsVO> params;
@ApiModelProperty("参数组名称")
private String groupName;
@ApiModelProperty("参数组id")

2
framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsDTOVO.java → framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java
View File

@@ -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 选择项")

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;

10
framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java
View File

@@ -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<CategoryMapper, Category> i
* @param paramList 参数列表
* @return 拼装后的返回值
*/
private List<GoodsParamsGroupVO> convertParamList(List<CategoryParameterGroup> groupList, List<GoodsParamsDTOVO> paramList) {
Map<String, List<GoodsParamsDTOVO>> map = new HashMap<>(16);
for (GoodsParamsDTOVO param : paramList) {
private List<GoodsParamsGroupVO> convertParamList(List<CategoryParameterGroup> groupList, List<GoodsParamsVO> paramList) {
Map<String, List<GoodsParamsVO>> map = new HashMap<>(16);
for (GoodsParamsVO param : paramList) {
if (map.get(param.getGroupId()) != null) {
map.get(param.getGroupId()).add(param);
} else {
List<GoodsParamsDTOVO> list = new ArrayList<>();
List<GoodsParamsVO> list = new ArrayList<>();
list.add(param);
map.put(param.getGroupId(), list);
}

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

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

6
framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java
View File

@@ -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("系统");

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

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

9
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java
View File

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

29
framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java Normal file
View File

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

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

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

3
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.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;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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.*;

5
framework/src/main/java/cn/lili/modules/base/entity/dos/VerificationSource.java → framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java
View File

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

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

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.entity.enums.ClientTypeEnum;
import cn.lili.common.enums.ClientTypeEnum;
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
import lombok.Data;
import lombok.experimental.Accessors;

2
framework/src/main/java/cn/lili/modules/base/entity/enums/VerificationSourceEnum.java → framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java
View File

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

4
framework/src/main/java/cn/lili/modules/base/entity/vo/VerificationVO.java → framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java
View File

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

2
framework/src/main/java/cn/lili/modules/base/mapper/RegionMapper.java → framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java
View File

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

4
framework/src/main/java/cn/lili/modules/base/mapper/VerificationSourceMapper.java → framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java
View File

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

2
framework/src/main/java/cn/lili/modules/base/service/RegionService.java → framework/src/main/java/cn/lili/modules/system/service/RegionService.java
View File

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

6
framework/src/main/java/cn/lili/modules/base/service/VerificationSourceService.java → framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java
View File

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

6
framework/src/main/java/cn/lili/modules/base/serviceimpl/RegionServiceImpl.java → framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java
View File

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

13
framework/src/main/java/cn/lili/modules/base/serviceimpl/VerificationSourceServiceImpl.java → framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
View File

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