修改项目结构

admin/src/main/java/com/baiye/modules/scrm/controller/AliPayController.java

@@ -1,9 +1,9 @@
-package com.baiye.modules.distribute.controller;
+package com.baiye.modules.scrm.controller;
 
 
-import com.baiye.modules.distribute.dto.AliPayPcDTO;
+import com.baiye.modules.scrm.dto.AliPayPcDTO;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.service.AliPayService;
+import com.baiye.modules.scrm.service.AliPayService;
 import com.baiye.result.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

admin/src/main/java/com/baiye/modules/scrm/controller/LoginEquipmentController.java

@@ -1,10 +1,10 @@
-package com.baiye.modules.distribute.controller;
+package com.baiye.modules.scrm.controller;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
 import com.baiye.result.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

admin/src/main/java/com/baiye/modules/scrm/controller/PayOrderController.java

@@ -1,10 +1,10 @@
-package com.baiye.modules.distribute.controller;
+package com.baiye.modules.scrm.controller;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
-import com.baiye.modules.distribute.qo.PayOrderQo;
+import com.baiye.modules.scrm.qo.PayOrderQo;
-import com.baiye.modules.distribute.service.PayOrderService;
+import com.baiye.modules.scrm.service.PayOrderService;
-import com.baiye.modules.distribute.vo.PayOrderVO;
+import com.baiye.modules.scrm.vo.PayOrderVO;
 import com.baiye.result.R;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

admin/src/main/java/com/baiye/modules/scrm/controller/WeChatController.java

@@ -1,33 +1,27 @@
-package com.baiye.modules.distribute.controller;
+package com.baiye.modules.scrm.controller;
 
-import cn.hutool.http.HttpUtil;
-import com.baiye.constant.WeChatRequestConstants;
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
-import com.baiye.modules.distribute.dto.CreateCodeDTO;
+import com.baiye.modules.scrm.dto.CreateCodeDTO;
-import com.baiye.modules.distribute.dto.PushCodeDTO;
+import com.baiye.modules.scrm.dto.PushCodeDTO;
-import com.baiye.modules.distribute.dto.WeChatAddFriendDTO;
+import com.baiye.modules.scrm.dto.WeChatAddFriendDTO;
-import com.baiye.modules.distribute.dto.WeChatStatisticsDTO;
+import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.service.WeChatService;
+import com.baiye.modules.scrm.service.WeChatService;
-import com.baiye.modules.distribute.service.WechatFriendService;
+import com.baiye.modules.scrm.service.WechatFriendService;
-import com.baiye.modules.distribute.vo.AccountStatisticsVO;
+import com.baiye.modules.scrm.vo.AccountStatisticsVO;
-import com.baiye.modules.distribute.vo.AddFriendVo;
+import com.baiye.modules.scrm.vo.AddFriendVo;
-import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.scrm.vo.StatisticsFriendVO;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
 import com.baiye.result.R;
 import com.baiye.security.util.SecurityUtils;
-import com.google.common.collect.Maps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author Enzo

admin/src/main/java/com/baiye/modules/scrm/controller/WechatCallbackController.java

@@ -1,7 +1,7 @@
-package com.baiye.modules.distribute.controller;
+package com.baiye.modules.scrm.controller;
 
 import cn.hutool.json.JSONUtil;
-import com.baiye.modules.distribute.service.WechatCallbackService;
+import com.baiye.modules.scrm.service.WechatCallbackService;
 import com.baiye.result.R;
 import com.baiye.result.WeChatResponse;
 import lombok.RequiredArgsConstructor;

admin/src/main/java/com/baiye/modules/scrm/converter/PayOrderConverter.java

@@ -1,7 +1,7 @@
-package com.baiye.modules.distribute.converter;
+package com.baiye.modules.scrm.converter;
 
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.vo.PayOrderVO;
+import com.baiye.modules.scrm.vo.PayOrderVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

admin/src/main/java/com/baiye/modules/scrm/converter/WeChatAccountConverter.java

@@ -1,7 +1,7 @@
-package com.baiye.modules.distribute.converter;
+package com.baiye.modules.scrm.converter;
 
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.entity.WeChatAccount;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

admin/src/main/java/com/baiye/modules/scrm/dto/AliPayPcDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

admin/src/main/java/com/baiye/modules/scrm/dto/CreateCodeDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/dto/EquipmentDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.*;
 

admin/src/main/java/com/baiye/modules/scrm/dto/PushCodeDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAccountDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAddFriendDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.*;
 

admin/src/main/java/com/baiye/modules/scrm/dto/WeChatFriendDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

admin/src/main/java/com/baiye/modules/scrm/dto/WeChatStatisticsDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;

admin/src/main/java/com/baiye/modules/scrm/dto/WeChatUserLoginDTO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.dto;
+package com.baiye.modules.scrm.dto;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/entity/ClueEntity.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import com.baiye.entity.LogicDeletedBaseEntity;
 import com.baiye.extend.mybatis.plus.alias.TableAlias;

admin/src/main/java/com/baiye/modules/scrm/entity/LoginEquipment.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import com.baiye.entity.BaseEntity;
 import com.baiye.extend.mybatis.plus.alias.TableAlias;

admin/src/main/java/com/baiye/modules/scrm/entity/PayOrder.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import cn.hutool.core.date.DatePattern;
 import com.baiye.entity.BaseEntity;

admin/src/main/java/com/baiye/modules/scrm/entity/WeChatAccount.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import com.baiye.entity.LogicDeletedBaseEntity;
 import com.baiye.extend.mybatis.plus.alias.TableAlias;

admin/src/main/java/com/baiye/modules/scrm/entity/WeChatEquipment.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import com.baiye.extend.mybatis.plus.alias.TableAlias;
 import com.baomidou.mybatisplus.annotation.IdType;

admin/src/main/java/com/baiye/modules/scrm/entity/WeChatFriedRecord.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.entity;
+package com.baiye.modules.scrm.entity;
 
 import com.baiye.extend.mybatis.plus.alias.TableAlias;
 import com.baomidou.mybatisplus.annotation.TableId;

admin/src/main/java/com/baiye/modules/scrm/mapper/LoginEquipmentMapper.java

@@ -1,17 +1,16 @@
-package com.baiye.modules.distribute.mapper;
+package com.baiye.modules.scrm.mapper;
 
 import cn.hutool.core.date.DateTime;
-import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.entity.WeChatAccount;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.apache.ibatis.annotations.Mapper;

admin/src/main/java/com/baiye/modules/scrm/mapper/PayOrderMapper.java

@@ -1,14 +1,14 @@
-package com.baiye.modules.distribute.mapper;
+package com.baiye.modules.scrm.mapper;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.converter.PayOrderConverter;
+import com.baiye.modules.scrm.converter.PayOrderConverter;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.qo.PayOrderQo;
+import com.baiye.modules.scrm.qo.PayOrderQo;
-import com.baiye.modules.distribute.vo.PayOrderVO;
+import com.baiye.modules.scrm.vo.PayOrderVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.apache.ibatis.annotations.Mapper;

admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatAccountMapper.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.mapper;
+package com.baiye.modules.scrm.mapper;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baiye.constant.DefaultNumberConstants;
@@ -7,10 +7,10 @@ import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.converter.WeChatAccountConverter;
+import com.baiye.modules.scrm.converter.WeChatAccountConverter;
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.entity.WeChatAccount;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatEquipmentMapper.java

@@ -1,8 +1,8 @@
-package com.baiye.modules.distribute.mapper;
+package com.baiye.modules.scrm.mapper;
 
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.entity.WeChatEquipment;
+import com.baiye.modules.scrm.entity.WeChatEquipment;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatFriendMapper.java

@@ -1,11 +1,11 @@
-package com.baiye.modules.distribute.mapper;
+package com.baiye.modules.scrm.mapper;
 
 import cn.hutool.core.date.DateTime;
 import com.baiye.extend.mybatis.plus.mapper.ExtendMapper;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.entity.WeChatFriedRecord;
+import com.baiye.modules.scrm.entity.WeChatFriedRecord;
-import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.scrm.vo.StatisticsFriendVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

admin/src/main/java/com/baiye/modules/scrm/qo/AccountQo.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.qo;
+package com.baiye.modules.scrm.qo;
 
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;

admin/src/main/java/com/baiye/modules/scrm/qo/PayOrderQo.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.qo;
+package com.baiye.modules.scrm.qo;
 
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;

admin/src/main/java/com/baiye/modules/scrm/service/AliPayService.java

@@ -1,14 +1,11 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 
 import com.baiye.extend.mybatis.plus.service.ExtendService;
-import com.baiye.modules.distribute.dto.AliPayPcDTO;
+import com.baiye.modules.scrm.dto.AliPayPcDTO;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.entity.WeChatAccount;
-import com.baiye.result.R;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**

admin/src/main/java/com/baiye/modules/scrm/service/LoginEquipmentService.java

@@ -1,12 +1,12 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 
 import java.util.List;
 

admin/src/main/java/com/baiye/modules/scrm/service/PayOrderService.java

@@ -1,11 +1,11 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.qo.PayOrderQo;
+import com.baiye.modules.scrm.qo.PayOrderQo;
-import com.baiye.modules.distribute.vo.PayOrderVO;
+import com.baiye.modules.scrm.vo.PayOrderVO;
 
 /**
  * @author Enzo

admin/src/main/java/com/baiye/modules/scrm/service/WeChatService.java

@@ -1,17 +1,17 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
-import com.baiye.modules.distribute.dto.CreateCodeDTO;
+import com.baiye.modules.scrm.dto.CreateCodeDTO;
-import com.baiye.modules.distribute.dto.PushCodeDTO;
+import com.baiye.modules.scrm.dto.PushCodeDTO;
-import com.baiye.modules.distribute.dto.WeChatAddFriendDTO;
+import com.baiye.modules.scrm.dto.WeChatAddFriendDTO;
-import com.baiye.modules.distribute.dto.WeChatUserLoginDTO;
+import com.baiye.modules.scrm.dto.WeChatUserLoginDTO;
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.entity.WeChatAccount;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.vo.AccountStatisticsVO;
+import com.baiye.modules.scrm.vo.AccountStatisticsVO;
-import com.baiye.modules.distribute.vo.AddFriendVo;
+import com.baiye.modules.scrm.vo.AddFriendVo;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
 
 /**
  * @author Enzo

admin/src/main/java/com/baiye/modules/scrm/service/WechatCallbackService.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 import com.baiye.result.WeChatResponse;
 

admin/src/main/java/com/baiye/modules/scrm/service/WechatFriendService.java

@@ -1,12 +1,12 @@
-package com.baiye.modules.distribute.service;
+package com.baiye.modules.scrm.service;
 
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.ExtendService;
-import com.baiye.modules.distribute.dto.WeChatFriendDTO;
+import com.baiye.modules.scrm.dto.WeChatFriendDTO;
-import com.baiye.modules.distribute.dto.WeChatStatisticsDTO;
+import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
-import com.baiye.modules.distribute.entity.WeChatFriedRecord;
+import com.baiye.modules.scrm.entity.WeChatFriedRecord;
-import com.baiye.modules.distribute.vo.AddFriendVo;
+import com.baiye.modules.scrm.vo.AddFriendVo;
-import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.scrm.vo.StatisticsFriendVO;
 
 import java.util.List;
 

admin/src/main/java/com/baiye/modules/scrm/service/impl/AliPayServiceImpl.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
@@ -15,12 +15,12 @@ import com.baiye.constant.PayConstants;
 import com.baiye.constant.enums.ResponseCode;
 import com.baiye.exception.BadRequestException;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
-import com.baiye.modules.distribute.dto.AliPayPcDTO;
+import com.baiye.modules.scrm.dto.AliPayPcDTO;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.mapper.PayOrderMapper;
+import com.baiye.modules.scrm.mapper.PayOrderMapper;
-import com.baiye.modules.distribute.service.AliPayService;
+import com.baiye.modules.scrm.service.AliPayService;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
-import com.baiye.modules.distribute.service.WeChatService;
+import com.baiye.modules.scrm.service.WeChatService;
 import com.baiye.security.util.SecurityUtils;
 import com.baiye.system.properties.AliPayProperties;
 import com.google.common.collect.Maps;

admin/src/main/java/com/baiye/modules/scrm/service/impl/LoginEquipmentServiceImpl.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
@@ -12,13 +12,13 @@ import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.dto.WeChatAccountDTO;
+import com.baiye.modules.scrm.dto.WeChatAccountDTO;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.mapper.LoginEquipmentMapper;
+import com.baiye.modules.scrm.mapper.LoginEquipmentMapper;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 import com.baiye.result.WeChatResponse;
 import com.baiye.security.util.SecurityUtils;
 import com.baiye.system.properties.WeChatProperties;

admin/src/main/java/com/baiye/modules/scrm/service/impl/PayOrderServiceImpl.java

@@ -1,13 +1,13 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import com.baiye.domain.PageParam;
 import com.baiye.domain.PageResult;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
-import com.baiye.modules.distribute.entity.PayOrder;
+import com.baiye.modules.scrm.entity.PayOrder;
-import com.baiye.modules.distribute.mapper.PayOrderMapper;
+import com.baiye.modules.scrm.mapper.PayOrderMapper;
-import com.baiye.modules.distribute.qo.PayOrderQo;
+import com.baiye.modules.scrm.qo.PayOrderQo;
-import com.baiye.modules.distribute.service.PayOrderService;
+import com.baiye.modules.scrm.service.PayOrderService;
-import com.baiye.modules.distribute.vo.PayOrderVO;
+import com.baiye.modules.scrm.vo.PayOrderVO;
 import com.baiye.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

admin/src/main/java/com/baiye/modules/scrm/service/impl/WeChatServiceImpl.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
@@ -19,20 +19,20 @@ import com.baiye.domain.PageResult;
 import com.baiye.enums.PackageEnum;
 import com.baiye.exception.BadRequestException;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
-import com.baiye.modules.distribute.dto.*;
+import com.baiye.modules.scrm.dto.*;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.entity.WeChatAccount;
-import com.baiye.modules.distribute.entity.WeChatEquipment;
+import com.baiye.modules.scrm.entity.WeChatEquipment;
-import com.baiye.modules.distribute.mapper.WeChatAccountMapper;
+import com.baiye.modules.scrm.mapper.WeChatAccountMapper;
-import com.baiye.modules.distribute.mapper.WeChatEquipmentMapper;
+import com.baiye.modules.scrm.mapper.WeChatEquipmentMapper;
-import com.baiye.modules.distribute.qo.AccountQo;
+import com.baiye.modules.scrm.qo.AccountQo;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
-import com.baiye.modules.distribute.service.WeChatService;
+import com.baiye.modules.scrm.service.WeChatService;
-import com.baiye.modules.distribute.service.WechatFriendService;
+import com.baiye.modules.scrm.service.WechatFriendService;
-import com.baiye.modules.distribute.vo.AccountStatisticsVO;
+import com.baiye.modules.scrm.vo.AccountStatisticsVO;
-import com.baiye.modules.distribute.vo.AddFriendVo;
+import com.baiye.modules.scrm.vo.AddFriendVo;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 import com.baiye.result.WeChatResponse;
 import com.baiye.security.util.SecurityUtils;
 import com.baiye.system.properties.WeChatProperties;

admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatCallbackServiceImpl.java

@@ -1,17 +1,16 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.constant.WechatCallbackConstant;
-import com.baiye.modules.distribute.dto.WeChatFriendDTO;
+import com.baiye.modules.scrm.dto.WeChatFriendDTO;
-import com.baiye.modules.distribute.dto.WeChatUserLoginDTO;
+import com.baiye.modules.scrm.dto.WeChatUserLoginDTO;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.entity.WeChatAccount;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.WeChatService;
-import com.baiye.modules.distribute.service.WeChatService;
+import com.baiye.modules.scrm.service.WechatCallbackService;
-import com.baiye.modules.distribute.service.WechatCallbackService;
+import com.baiye.modules.scrm.service.WechatFriendService;
-import com.baiye.modules.distribute.service.WechatFriendService;
 import com.baiye.notify.event.StationNotifyPushEvent;
 import com.baiye.notify.model.domain.AnnouncementNotifyInfo;
 import com.baiye.result.WeChatResponse;

admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatFriendServiceImpl.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.service.impl;
+package com.baiye.modules.scrm.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -10,16 +10,16 @@ import com.baiye.domain.PageResult;
 import com.baiye.enums.StatisticsEnum;
 import com.baiye.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import com.baiye.extend.mybatis.plus.toolkit.WrappersX;
-import com.baiye.modules.distribute.dto.WeChatFriendDTO;
+import com.baiye.modules.scrm.dto.WeChatFriendDTO;
-import com.baiye.modules.distribute.dto.WeChatStatisticsDTO;
+import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
-import com.baiye.modules.distribute.entity.WeChatFriedRecord;
+import com.baiye.modules.scrm.entity.WeChatFriedRecord;
-import com.baiye.modules.distribute.mapper.LoginEquipmentMapper;
+import com.baiye.modules.scrm.mapper.LoginEquipmentMapper;
-import com.baiye.modules.distribute.mapper.WeChatFriendMapper;
+import com.baiye.modules.scrm.mapper.WeChatFriendMapper;
-import com.baiye.modules.distribute.service.WechatFriendService;
+import com.baiye.modules.scrm.service.WechatFriendService;
-import com.baiye.modules.distribute.vo.AddFriendVo;
+import com.baiye.modules.scrm.vo.AddFriendVo;
-import com.baiye.modules.distribute.vo.StatisticsFriendVO;
+import com.baiye.modules.scrm.vo.StatisticsFriendVO;
-import com.baiye.modules.distribute.vo.WeChatAccountVO;
+import com.baiye.modules.scrm.vo.WeChatAccountVO;
-import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
+import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
 import com.baiye.security.util.SecurityUtils;
 import com.google.common.collect.Lists;
 import lombok.RequiredArgsConstructor;

admin/src/main/java/com/baiye/modules/scrm/vo/AccountStatisticsVO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/vo/AddFriendVo.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import com.baiye.constant.DefaultNumberConstants;
 import lombok.*;

admin/src/main/java/com/baiye/modules/scrm/vo/PayOrderVO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.annotation.JsonFormat;

admin/src/main/java/com/baiye/modules/scrm/vo/StatisticsFriendVO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAccountVO.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAddFriendVo.java

@@ -1,4 +1,4 @@
-package com.baiye.modules.distribute.vo;
+package com.baiye.modules.scrm.vo;
 
 import lombok.Data;
 

admin/src/main/java/com/baiye/schedule/AccountTask.java

@@ -6,8 +6,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.constant.WeChatRequestConstants;
-import com.baiye.modules.distribute.entity.LoginEquipment;
+import com.baiye.modules.scrm.entity.LoginEquipment;
-import com.baiye.modules.distribute.service.LoginEquipmentService;
+import com.baiye.modules.scrm.service.LoginEquipmentService;
 import com.baiye.system.properties.WeChatProperties;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;

admin/src/main/java/com/baiye/schedule/DynamicController.java

@@ -3,6 +3,7 @@ package com.baiye.schedule;
 import com.baiye.common.job.handler.ElasticJobHandler;
 import com.baiye.result.R;
 import com.baiye.schedule.handler.DynamicJob;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,10 +21,10 @@ import java.util.Objects;
 @Slf4j
 @RestController
 @RequestMapping("/dynamic")
+@RequiredArgsConstructor
 public class DynamicController {
 
-    @Autowired
+    private final ElasticJobHandler elasticJobHandler;
-    private ElasticJobHandler elasticJobHandler;
 
     /**
      * 创建动态定时任务

admin/src/main/resources/mapper/LoginEquipmentMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.baiye.modules.distribute.mapper.LoginEquipmentMapper">
+<mapper namespace="com.baiye.modules.scrm.mapper.LoginEquipmentMapper">
 	<sql id="Base_Alias_Column_List">
 			wa.username,
 			wa.nickname,
@@ -22,7 +22,7 @@
 			le.expiration_time
 	</sql>
 
-	<select id="selectByPage" resultType="com.baiye.modules.distribute.vo.WeChatAccountVO">
+	<select id="selectByPage" resultType="com.baiye.modules.scrm.vo.WeChatAccountVO">
         SELECT
         <include refid="Base_Alias_Column_List"/>
         FROM
@@ -47,7 +47,7 @@
         order by le.id desc
     </select>
 
-	<select id="queryByDate" resultType="com.baiye.modules.distribute.vo.WeChatAddFriendVo">
+	<select id="queryByDate" resultType="com.baiye.modules.scrm.vo.WeChatAddFriendVo">
         SELECT DATE_FORMAT(f.create_time, '%m-%d') dayStr
         , count(1) as  num
         , add_friend_type
@@ -59,7 +59,7 @@
         ORDER BY dayStr
     </select>
 
-	<select id="queryByUserId" resultType="com.baiye.modules.distribute.vo.WeChatAccountVO">
+	<select id="queryByUserId" resultType="com.baiye.modules.scrm.vo.WeChatAccountVO">
         SELECT
         <include refid="Base_Alias_Column_List"/>
         FROM
@@ -68,7 +68,7 @@
         LEFT join tb_wechat_account wa on wa.id = we.account_id
         where le.user_id = #{userId}
     </select>
-    <select id="findEquipmentByAccountId" resultType="com.baiye.modules.distribute.vo.WeChatAccountVO">
+    <select id="findEquipmentByAccountId" resultType="com.baiye.modules.scrm.vo.WeChatAccountVO">
         SELECT
         <include refid="Base_Alias_Column_List"/>
         FROM

admin/src/main/resources/mapper/WeChatFriendMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.baiye.modules.distribute.mapper.WeChatFriendMapper">
+<mapper namespace="com.baiye.modules.scrm.mapper.WeChatFriendMapper">
 
-    <select id="queryByDate" resultType="com.baiye.modules.distribute.vo.StatisticsFriendVO">
+    <select id="queryByDate" resultType="com.baiye.modules.scrm.vo.StatisticsFriendVO">
 
         SELECT
         add_friend_type,
@@ -15,7 +15,7 @@
         add_friend_type
     </select>
 
-    <select id="queryByUserList" resultType="com.baiye.modules.distribute.vo.WeChatAddFriendVo">
+    <select id="queryByUserList" resultType="com.baiye.modules.scrm.vo.WeChatAddFriendVo">
         SELECT DATE_FORMAT(create_time, '%m-%d') dayStr
         , count(1) as num
         , add_friend_type

marketing-scrm-admin/admin-websocket/.flattened-pom.xml

@@ -23,7 +23,7 @@
     </dependency>
     <dependency>
       <groupId>com.baiye</groupId>
-      <artifactId>distribute-notify-biz</artifactId>
+      <artifactId>marketing-scrm-notify-biz</artifactId>
       <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>

marketing-scrm-admin/admin-websocket/pom.xml

@@ -23,7 +23,7 @@
 
 		<dependency>
 			<groupId>com.baiye</groupId>
-			<artifactId>distribute-notify-biz</artifactId>
+			<artifactId>marketing-scrm-notify-biz</artifactId>
 			<version>1.0.0</version>
 			<scope>compile</scope>
 		</dependency>

marketing-scrm-notify/marketing-scrm-notify-biz/pom.xml

@@ -17,7 +17,7 @@
 
 		<dependency>
 			<groupId>com.baiye</groupId>
-			<artifactId>distribute-notify-model</artifactId>
+			<artifactId>marketing-scrm-notify-model</artifactId>
 			 <version>${revision}</version>
 		</dependency>
 

marketing-scrm-notify/marketing-scrm-notify-controller/pom.xml

@@ -18,8 +18,8 @@
 
 		<dependency>
 			<groupId>com.baiye</groupId>
-			<artifactId>distribute-notify-biz</artifactId>
+			<artifactId>marketing-scrm-notify-biz</artifactId>
-			 <version>${revision}</version>
+			 <version>1.0.0</version>
 		</dependency>
 
 	</dependencies>

marketing-scrm-notify/marketing-scrm-notify-model/pom.xml

@@ -7,7 +7,7 @@
 		 <version>${revision}</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>distribute-notify-model</artifactId>
+	<artifactId>marketing-scrm-notify-model</artifactId>
 
 	<dependencies>
 		<dependency>