BY-Team
/
marketing-scrm
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改项目结构

Browse Source
main
bynt 4 months ago
parent b21b451f48
commit 5157bba8ac
106 changed files with 183 additions and 193 deletions
Show Stats Download Patch File Download Diff File

8
admin/src/main/java/com/baiye/modules/distribute/controller/AliPayController.java → admin/src/main/java/com/baiye/modules/scrm/controller/AliPayController.java
Unescape Escape View File

@ -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.distribute.entity.PayOrder;
import com.baiye.modules.distribute.service.AliPayService;
import com.baiye.modules.scrm.dto.AliPayPcDTO;
import com.baiye.modules.scrm.entity.PayOrder;
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;

8
admin/src/main/java/com/baiye/modules/distribute/controller/LoginEquipmentController.java → admin/src/main/java/com/baiye/modules/scrm/controller/LoginEquipmentController.java
Unescape Escape View File

@ -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.distribute.service.LoginEquipmentService;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.service.LoginEquipmentService;
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;

8
admin/src/main/java/com/baiye/modules/distribute/controller/PayOrderController.java → admin/src/main/java/com/baiye/modules/scrm/controller/PayOrderController.java
Unescape Escape View File

@ -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.distribute.service.PayOrderService;
import com.baiye.modules.distribute.vo.PayOrderVO;
import com.baiye.modules.scrm.qo.PayOrderQo;
import com.baiye.modules.scrm.service.PayOrderService;
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;

30
admin/src/main/java/com/baiye/modules/distribute/controller/WeChatController.java → admin/src/main/java/com/baiye/modules/scrm/controller/WeChatController.java
Unescape Escape View File

@ -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.distribute.dto.PushCodeDTO;
import com.baiye.modules.distribute.dto.WeChatAddFriendDTO;
import com.baiye.modules.distribute.dto.WeChatStatisticsDTO;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.service.WeChatService;
import com.baiye.modules.distribute.service.WechatFriendService;
import com.baiye.modules.distribute.vo.AccountStatisticsVO;
import com.baiye.modules.distribute.vo.AddFriendVo;
import com.baiye.modules.distribute.vo.StatisticsFriendVO;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.scrm.dto.CreateCodeDTO;
import com.baiye.modules.scrm.dto.PushCodeDTO;
import com.baiye.modules.scrm.dto.WeChatAddFriendDTO;
import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.service.WeChatService;
import com.baiye.modules.scrm.service.WechatFriendService;
import com.baiye.modules.scrm.vo.AccountStatisticsVO;
import com.baiye.modules.scrm.vo.AddFriendVo;
import com.baiye.modules.scrm.vo.StatisticsFriendVO;
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

4
admin/src/main/java/com/baiye/modules/distribute/controller/WechatCallbackController.java → admin/src/main/java/com/baiye/modules/scrm/controller/WechatCallbackController.java
Unescape Escape View File

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

6
admin/src/main/java/com/baiye/modules/distribute/converter/PayOrderConverter.java → admin/src/main/java/com/baiye/modules/scrm/converter/PayOrderConverter.java
Unescape Escape View File

@ -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.distribute.vo.PayOrderVO;
import com.baiye.modules.scrm.entity.PayOrder;
import com.baiye.modules.scrm.vo.PayOrderVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

6
admin/src/main/java/com/baiye/modules/distribute/converter/WeChatAccountConverter.java → admin/src/main/java/com/baiye/modules/scrm/converter/WeChatAccountConverter.java
Unescape Escape View File

@ -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.distribute.vo.WeChatAccountVO;
import com.baiye.modules.scrm.entity.WeChatAccount;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

2
admin/src/main/java/com/baiye/modules/distribute/dto/AliPayPcDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/AliPayPcDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/CreateCodeDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/CreateCodeDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/EquipmentDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/EquipmentDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/PushCodeDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/PushCodeDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAccountDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAccountDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/WeChatAddFriendDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/WeChatAddFriendDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/WeChatFriendDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/WeChatFriendDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/WeChatStatisticsDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/WeChatStatisticsDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/dto/WeChatUserLoginDTO.java → admin/src/main/java/com/baiye/modules/scrm/dto/WeChatUserLoginDTO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/ClueEntity.java → admin/src/main/java/com/baiye/modules/scrm/entity/ClueEntity.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/LoginEquipment.java → admin/src/main/java/com/baiye/modules/scrm/entity/LoginEquipment.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/PayOrder.java → admin/src/main/java/com/baiye/modules/scrm/entity/PayOrder.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/WeChatAccount.java → admin/src/main/java/com/baiye/modules/scrm/entity/WeChatAccount.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/WeChatEquipment.java → admin/src/main/java/com/baiye/modules/scrm/entity/WeChatEquipment.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/entity/WeChatFriedRecord.java → admin/src/main/java/com/baiye/modules/scrm/entity/WeChatFriedRecord.java
Unescape Escape View File

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

13
admin/src/main/java/com/baiye/modules/distribute/mapper/LoginEquipmentMapper.java → admin/src/main/java/com/baiye/modules/scrm/mapper/LoginEquipmentMapper.java
Unescape Escape View File

@ -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.distribute.entity.WeChatAccount;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.entity.LoginEquipment;
import com.baiye.modules.scrm.entity.WeChatAccount;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
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;

10
admin/src/main/java/com/baiye/modules/distribute/mapper/PayOrderMapper.java → admin/src/main/java/com/baiye/modules/scrm/mapper/PayOrderMapper.java
Unescape Escape View File

@ -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.distribute.entity.PayOrder;
import com.baiye.modules.distribute.qo.PayOrderQo;
import com.baiye.modules.distribute.vo.PayOrderVO;
import com.baiye.modules.scrm.converter.PayOrderConverter;
import com.baiye.modules.scrm.entity.PayOrder;
import com.baiye.modules.scrm.qo.PayOrderQo;
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;

10
admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatAccountMapper.java → admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatAccountMapper.java
Unescape Escape View File

@ -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.distribute.entity.WeChatAccount;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.scrm.converter.WeChatAccountConverter;
import com.baiye.modules.scrm.entity.WeChatAccount;
import com.baiye.modules.scrm.qo.AccountQo;
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;

4
admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatEquipmentMapper.java → admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatEquipmentMapper.java
Unescape Escape View File

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

8
admin/src/main/java/com/baiye/modules/distribute/mapper/WeChatFriendMapper.java → admin/src/main/java/com/baiye/modules/scrm/mapper/WeChatFriendMapper.java
Unescape Escape View File

@ -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.distribute.vo.StatisticsFriendVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.entity.WeChatFriedRecord;
import com.baiye.modules.scrm.vo.StatisticsFriendVO;
import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
admin/src/main/java/com/baiye/modules/distribute/qo/AccountQo.java → admin/src/main/java/com/baiye/modules/scrm/qo/AccountQo.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/qo/PayOrderQo.java → admin/src/main/java/com/baiye/modules/scrm/qo/PayOrderQo.java
Unescape Escape View File

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

9
admin/src/main/java/com/baiye/modules/distribute/service/AliPayService.java → admin/src/main/java/com/baiye/modules/scrm/service/AliPayService.java
Unescape Escape View File

@ -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.distribute.entity.PayOrder;
import com.baiye.modules.distribute.entity.WeChatAccount;
import com.baiye.result.R;
import com.baiye.modules.scrm.dto.AliPayPcDTO;
import com.baiye.modules.scrm.entity.PayOrder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
/**

10
admin/src/main/java/com/baiye/modules/distribute/service/LoginEquipmentService.java → admin/src/main/java/com/baiye/modules/scrm/service/LoginEquipmentService.java
Unescape Escape View File

@ -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.distribute.qo.AccountQo;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.entity.LoginEquipment;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
import java.util.List;

8
admin/src/main/java/com/baiye/modules/distribute/service/PayOrderService.java → admin/src/main/java/com/baiye/modules/scrm/service/PayOrderService.java
Unescape Escape View File

@ -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.distribute.qo.PayOrderQo;
import com.baiye.modules.distribute.vo.PayOrderVO;
import com.baiye.modules.scrm.entity.PayOrder;
import com.baiye.modules.scrm.qo.PayOrderQo;
import com.baiye.modules.scrm.vo.PayOrderVO;
/**
* @author Enzo

20
admin/src/main/java/com/baiye/modules/distribute/service/WeChatService.java → admin/src/main/java/com/baiye/modules/scrm/service/WeChatService.java
Unescape Escape View File

@ -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.distribute.dto.PushCodeDTO;
import com.baiye.modules.distribute.dto.WeChatAddFriendDTO;
import com.baiye.modules.distribute.dto.WeChatUserLoginDTO;
import com.baiye.modules.distribute.entity.WeChatAccount;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.vo.AccountStatisticsVO;
import com.baiye.modules.distribute.vo.AddFriendVo;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.scrm.dto.CreateCodeDTO;
import com.baiye.modules.scrm.dto.PushCodeDTO;
import com.baiye.modules.scrm.dto.WeChatAddFriendDTO;
import com.baiye.modules.scrm.dto.WeChatUserLoginDTO;
import com.baiye.modules.scrm.entity.WeChatAccount;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.vo.AccountStatisticsVO;
import com.baiye.modules.scrm.vo.AddFriendVo;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
/**
* @author Enzo

2
admin/src/main/java/com/baiye/modules/distribute/service/WechatCallbackService.java → admin/src/main/java/com/baiye/modules/scrm/service/WechatCallbackService.java
Unescape Escape View File

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

12
admin/src/main/java/com/baiye/modules/distribute/service/WechatFriendService.java → admin/src/main/java/com/baiye/modules/scrm/service/WechatFriendService.java
Unescape Escape View File

@ -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.distribute.dto.WeChatStatisticsDTO;
import com.baiye.modules.distribute.entity.WeChatFriedRecord;
import com.baiye.modules.distribute.vo.AddFriendVo;
import com.baiye.modules.distribute.vo.StatisticsFriendVO;
import com.baiye.modules.scrm.dto.WeChatFriendDTO;
import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
import com.baiye.modules.scrm.entity.WeChatFriedRecord;
import com.baiye.modules.scrm.vo.AddFriendVo;
import com.baiye.modules.scrm.vo.StatisticsFriendVO;
import java.util.List;

14
admin/src/main/java/com/baiye/modules/distribute/service/impl/AliPayServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/AliPayServiceImpl.java
Unescape Escape View File

@ -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.distribute.entity.PayOrder;
import com.baiye.modules.distribute.mapper.PayOrderMapper;
import com.baiye.modules.distribute.service.AliPayService;
import com.baiye.modules.distribute.service.LoginEquipmentService;
import com.baiye.modules.distribute.service.WeChatService;
import com.baiye.modules.scrm.dto.AliPayPcDTO;
import com.baiye.modules.scrm.entity.PayOrder;
import com.baiye.modules.scrm.mapper.PayOrderMapper;
import com.baiye.modules.scrm.service.AliPayService;
import com.baiye.modules.scrm.service.LoginEquipmentService;
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;

16
admin/src/main/java/com/baiye/modules/distribute/service/impl/LoginEquipmentServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/LoginEquipmentServiceImpl.java
Unescape Escape View File

@ -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.distribute.entity.LoginEquipment;
import com.baiye.modules.distribute.mapper.LoginEquipmentMapper;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.service.LoginEquipmentService;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.dto.WeChatAccountDTO;
import com.baiye.modules.scrm.entity.LoginEquipment;
import com.baiye.modules.scrm.mapper.LoginEquipmentMapper;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.service.LoginEquipmentService;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
import com.baiye.result.WeChatResponse;
import com.baiye.security.util.SecurityUtils;
import com.baiye.system.properties.WeChatProperties;

12
admin/src/main/java/com/baiye/modules/distribute/service/impl/PayOrderServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/PayOrderServiceImpl.java
Unescape Escape View File

@ -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.distribute.mapper.PayOrderMapper;
import com.baiye.modules.distribute.qo.PayOrderQo;
import com.baiye.modules.distribute.service.PayOrderService;
import com.baiye.modules.distribute.vo.PayOrderVO;
import com.baiye.modules.scrm.entity.PayOrder;
import com.baiye.modules.scrm.mapper.PayOrderMapper;
import com.baiye.modules.scrm.qo.PayOrderQo;
import com.baiye.modules.scrm.service.PayOrderService;
import com.baiye.modules.scrm.vo.PayOrderVO;
import com.baiye.security.util.SecurityUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

30
admin/src/main/java/com/baiye/modules/distribute/service/impl/WeChatServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/WeChatServiceImpl.java
Unescape Escape View File

@ -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.distribute.entity.LoginEquipment;
import com.baiye.modules.distribute.entity.WeChatAccount;
import com.baiye.modules.distribute.entity.WeChatEquipment;
import com.baiye.modules.distribute.mapper.WeChatAccountMapper;
import com.baiye.modules.distribute.mapper.WeChatEquipmentMapper;
import com.baiye.modules.distribute.qo.AccountQo;
import com.baiye.modules.distribute.service.LoginEquipmentService;
import com.baiye.modules.distribute.service.WeChatService;
import com.baiye.modules.distribute.service.WechatFriendService;
import com.baiye.modules.distribute.vo.AccountStatisticsVO;
import com.baiye.modules.distribute.vo.AddFriendVo;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.dto.*;
import com.baiye.modules.scrm.entity.LoginEquipment;
import com.baiye.modules.scrm.entity.WeChatAccount;
import com.baiye.modules.scrm.entity.WeChatEquipment;
import com.baiye.modules.scrm.mapper.WeChatAccountMapper;
import com.baiye.modules.scrm.mapper.WeChatEquipmentMapper;
import com.baiye.modules.scrm.qo.AccountQo;
import com.baiye.modules.scrm.service.LoginEquipmentService;
import com.baiye.modules.scrm.service.WeChatService;
import com.baiye.modules.scrm.service.WechatFriendService;
import com.baiye.modules.scrm.vo.AccountStatisticsVO;
import com.baiye.modules.scrm.vo.AddFriendVo;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
import com.baiye.result.WeChatResponse;
import com.baiye.security.util.SecurityUtils;
import com.baiye.system.properties.WeChatProperties;

17
admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatCallbackServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatCallbackServiceImpl.java
Unescape Escape View File

@ -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.distribute.dto.WeChatUserLoginDTO;
import com.baiye.modules.distribute.entity.LoginEquipment;
import com.baiye.modules.distribute.entity.WeChatAccount;
import com.baiye.modules.distribute.service.LoginEquipmentService;
import com.baiye.modules.distribute.service.WeChatService;
import com.baiye.modules.distribute.service.WechatCallbackService;
import com.baiye.modules.distribute.service.WechatFriendService;
import com.baiye.modules.scrm.dto.WeChatFriendDTO;
import com.baiye.modules.scrm.dto.WeChatUserLoginDTO;
import com.baiye.modules.scrm.entity.LoginEquipment;
import com.baiye.modules.scrm.service.LoginEquipmentService;
import com.baiye.modules.scrm.service.WeChatService;
import com.baiye.modules.scrm.service.WechatCallbackService;
import com.baiye.modules.scrm.service.WechatFriendService;
import com.baiye.notify.event.StationNotifyPushEvent;
import com.baiye.notify.model.domain.AnnouncementNotifyInfo;
import com.baiye.result.WeChatResponse;

22
admin/src/main/java/com/baiye/modules/distribute/service/impl/WechatFriendServiceImpl.java → admin/src/main/java/com/baiye/modules/scrm/service/impl/WechatFriendServiceImpl.java
Unescape Escape View File

@ -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.distribute.dto.WeChatStatisticsDTO;
import com.baiye.modules.distribute.entity.WeChatFriedRecord;
import com.baiye.modules.distribute.mapper.LoginEquipmentMapper;
import com.baiye.modules.distribute.mapper.WeChatFriendMapper;
import com.baiye.modules.distribute.service.WechatFriendService;
import com.baiye.modules.distribute.vo.AddFriendVo;
import com.baiye.modules.distribute.vo.StatisticsFriendVO;
import com.baiye.modules.distribute.vo.WeChatAccountVO;
import com.baiye.modules.distribute.vo.WeChatAddFriendVo;
import com.baiye.modules.scrm.dto.WeChatFriendDTO;
import com.baiye.modules.scrm.dto.WeChatStatisticsDTO;
import com.baiye.modules.scrm.entity.WeChatFriedRecord;
import com.baiye.modules.scrm.mapper.LoginEquipmentMapper;
import com.baiye.modules.scrm.mapper.WeChatFriendMapper;
import com.baiye.modules.scrm.service.WechatFriendService;
import com.baiye.modules.scrm.vo.AddFriendVo;
import com.baiye.modules.scrm.vo.StatisticsFriendVO;
import com.baiye.modules.scrm.vo.WeChatAccountVO;
import com.baiye.modules.scrm.vo.WeChatAddFriendVo;
import com.baiye.security.util.SecurityUtils;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;

2
admin/src/main/java/com/baiye/modules/distribute/vo/AccountStatisticsVO.java → admin/src/main/java/com/baiye/modules/scrm/vo/AccountStatisticsVO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/vo/AddFriendVo.java → admin/src/main/java/com/baiye/modules/scrm/vo/AddFriendVo.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/vo/PayOrderVO.java → admin/src/main/java/com/baiye/modules/scrm/vo/PayOrderVO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/vo/StatisticsFriendVO.java → admin/src/main/java/com/baiye/modules/scrm/vo/StatisticsFriendVO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAccountVO.java → admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAccountVO.java
Unescape Escape View File

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

2
admin/src/main/java/com/baiye/modules/distribute/vo/WeChatAddFriendVo.java → admin/src/main/java/com/baiye/modules/scrm/vo/WeChatAddFriendVo.java
Unescape Escape View File

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

4
admin/src/main/java/com/baiye/schedule/AccountTask.java
Unescape Escape View File

@ -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.distribute.service.LoginEquipmentService;
import com.baiye.modules.scrm.entity.LoginEquipment;
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;

5
admin/src/main/java/com/baiye/schedule/DynamicController.java
Unescape Escape View File

@ -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 ElasticJobHandler elasticJobHandler;
private final ElasticJobHandler elasticJobHandler;
/**
* 创建动态定时任务

10
admin/src/main/resources/mapper/LoginEquipmentMapper.xml
Unescape Escape View File

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

6
admin/src/main/resources/mapper/WeChatFriendMapper.xml
Unescape Escape View File

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

2
marketing-scrm-admin/admin-websocket/.flattened-pom.xml
Unescape Escape View File

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

2
marketing-scrm-admin/admin-websocket/pom.xml
Unescape Escape View File

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

2
marketing-scrm-notify/distribute-notify-biz/pom.xml → marketing-scrm-notify/marketing-scrm-notify-biz/pom.xml
Unescape Escape View File

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

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/AnnouncementCloseEvent.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/NotifyPublishEvent.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/StationNotifyPushEvent.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/event/UserAnnouncementReadEvent.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/AbstractNotifyInfoHandler.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoDelegateHandler.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/NotifyInfoHandler.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementNotifyInfoHandler.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/handler/impl/AnnouncementPushMessage.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/AnnouncementLoginEventListener.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/listener/NotifyPublishEventListener.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/AnnouncementMapper.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/mapper/UserAnnouncementMapper.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/MailNotifyPusher.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPushExecutor.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/NotifyPusher.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/SmsNotifyPusher.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/push/StationNotifyPusher.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/AllRecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/RecipientHandler.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyOrganizationRecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyRoleRecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserRecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/recipient/SpecifyUserTypeRecipientFilter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/AnnouncementService.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/UserAnnouncementService.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/AnnouncementServiceImpl.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementEventListener.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/java/com/baiye/notify/service/impl/UserAnnouncementServiceImpl.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml → marketing-scrm-notify/marketing-scrm-notify-biz/src/main/resources/mapper/AnnouncementMapper.xml
Unescape Escape View File

4
marketing-scrm-notify/distribute-notify-controller/pom.xml → marketing-scrm-notify/marketing-scrm-notify-controller/pom.xml
Unescape Escape View File

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

0
marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java → marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/AnnouncementController.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java → marketing-scrm-notify/marketing-scrm-notify-controller/src/main/java/com/baiye/notify/controller/UserAnnouncementController.java
Unescape Escape View File

2
marketing-scrm-notify/distribute-notify-model/pom.xml → marketing-scrm-notify/marketing-scrm-notify-model/pom.xml
Unescape Escape View File

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

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/AnnouncementConverter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/NotifyInfoConverter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/converter/UserAnnouncementConverter.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/AnnouncementStatusEnum.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyChannelEnum.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/NotifyRecipientFilterTypeEnum.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/enums/UserAnnouncementStateEnum.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/AnnouncementNotifyInfo.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/domain/NotifyInfo.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/dto/AnnouncementDTO.java
Unescape Escape View File

0
marketing-scrm-notify/distribute-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java → marketing-scrm-notify/marketing-scrm-notify-model/src/main/java/com/baiye/notify/model/entity/Announcement.java
Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save