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

Merge remote-tracking branch 'origin/master'

Browse Source
master
bynt 12 months ago
parent ceb2b84f3e 4f2d0d4849
commit 7573432c5b
7 changed files with 76 additions and 13 deletions
Show Stats Download Patch File Download Diff File

6
ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/util/MobileUtil.java
Unescape Escape View File

@ -11,9 +11,9 @@ import java.util.regex.Pattern;
public class MobileUtil {
/**
* 中国电信号码格式验证 手机段： 133,149,153,173,177,180,181,189,191,199,1349,1410,1700,1701,1702,193
* 中国电信号码格式验证 手机段： 133,149,153,173,177,180,181,189,191,199,1349,1410,1700,1701,1702,193,===中国广电 192
**/
private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|49|53|7[37]|8[019]|9[139])\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
private static final String CHINA_TELECOM_PATTERN = "(?:^(?:\\+86)?1(?:33|92|49|53|7[37]|8[019]|9[139])\\d{8}$)|(?:^(?:\\+86)?1349\\d{7}$)|(?:^(?:\\+86)?1410\\d{7}$)|(?:^(?:\\+86)?170[0-2]\\d{7}$)";
/**
* 中国联通号码格式验证 手机段：130,131,132,145,146,155,156,166,171,175,176,185,186,1704,1707,1708,1709
@ -46,7 +46,7 @@ public class MobileUtil {
public static void main(String[] args) {
// String s = "/home/eladmin/mail/MM_20221125_2.zip";
// String filePath = s.substring(s.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
System.out.println( checkPhone("17269788988"));
System.out.println( checkPhone("19476767674"));
}
/**
* 中国移动手机号码校验

16
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/PayCombo.java
Unescape Escape View File

@ -83,4 +83,20 @@ public class PayCombo implements Serializable {
@ApiModelProperty(value = "微信添加权限")
private Boolean weChatFlag;
/**
* 创建默认
* @param id
* @return
*/
public PayCombo createDefaultCombo(Long id) {
this.setPackageName("0分钟/-30元/月");
this.setCallDuration(0);
this.setAmount(-30.00);
this.setPackageDay(365);
this.setStatus(0);
this.setBaseAmount(30.00);
this.setFatherTemplateId(id);
this.setWeChatFlag(false);
return this;
}
}

14
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/PayFatherTemplateService.java
Unescape Escape View File

@ -4,30 +4,35 @@ import com.baiye.modules.platform.domain.PayFatherTemplate;
import com.baiye.modules.platform.service.dto.PayFatherTemplateQueryCriteria;
import org.springframework.data.domain.Pageable;
import java.util.Date;
import java.util.Set;
public interface PayFatherTemplateService {
/**
* 新增
*
* @param payFatherTemplate
*/
void add(PayFatherTemplate payFatherTemplate);
/**
* 修改状态
*
* @param payFatherTemplate
*/
void update(PayFatherTemplate payFatherTemplate);
/**
* 批量删除
*
* @param ids
*/
void del(Set<Long> ids);
/**
* 查询模板列表(分页,返回数据中插入了套餐信息)
*
* @param payFatherTemplateQueryCriteria
* @param pageable
* @return
@ -36,12 +41,14 @@ public interface PayFatherTemplateService {
/**
* 查询列表
*
* @return
*/
Object list();
/**
* 替换
*
* @param replaceId
* @return
*/
@ -49,8 +56,15 @@ public interface PayFatherTemplateService {
/**
* id查找模板
*
* @param fatherTemplateId
* @return
*/
PayFatherTemplate findById(Long fatherTemplateId);
/**
*
* 创建默认模板
*/
void addDefaultTemplate(String name, Long userId, Date endTime,Long companyId);
}

1
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java
Unescape Escape View File

@ -73,6 +73,7 @@ public class CompanyServiceImpl implements CompanyService {
companyDto.setCompanyType(byUserId.getCompanyType());
companyDto.setUserId(SecurityUtils.getCurrentUserId());
companyDto.setStatus(DefaultNumberConstants.ZERO_NUMBER);
companyDto.setTemplateId(byUserId.getTemplateId());
BeanUtil.copyProperties(companyDto, byUserId);
byUserId.setApplicationTime(DateUtil.date());
byUserId.setCompanyCode(byUserId.getCompanyName().trim());

32
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/PayFatherTemplateServiceImpl.java
Unescape Escape View File

@ -1,13 +1,17 @@
package com.baiye.modules.platform.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import com.baiye.constant.DefaultNumberConstants;
import com.baiye.exception.BadRequestException;
import com.baiye.modules.platform.domain.Company;
import com.baiye.modules.platform.domain.PayCombo;
import com.baiye.modules.platform.domain.PayComboUser;
import com.baiye.modules.platform.domain.PayFatherTemplate;
import com.baiye.modules.platform.repository.CompanyRepository;
import com.baiye.modules.platform.repository.PayComboRepository;
import com.baiye.modules.platform.repository.PayComboUserRepository;
import com.baiye.modules.platform.repository.PayFatherTemplateRepository;
import com.baiye.modules.platform.service.PayFatherTemplateService;
import com.baiye.modules.platform.service.dto.PayFatherTemplateQueryCriteria;
@ -22,6 +26,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -38,7 +43,7 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
private final PayFatherTemplateRepository payFatherTemplateRepository;
private final PayComboRepository payComboRepository;
private final CompanyRepository companyRepository;
private final PayComboUserRepository payComboUserRepository;
@Override
@Transactional(rollbackFor = Exception.class)
public void add(PayFatherTemplate payFatherTemplate) {
@ -124,4 +129,29 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
public PayFatherTemplate findById(Long fatherTemplateId) {
return payFatherTemplateRepository.findById(fatherTemplateId).orElseGet(PayFatherTemplate::new);
}
@Override
public void addDefaultTemplate(String name, Long userId, Date endTime, Long companyId) {
PayFatherTemplate payFatherTemplate = new PayFatherTemplate();
payFatherTemplate.setName(name);
payFatherTemplate.setStatus(DefaultNumberConstants.ZERO_NUMBER);
//添加父模板
Long fatherTemplateId = payFatherTemplateRepository.save(payFatherTemplate).getId();
PayCombo payCombo = new PayCombo().createDefaultCombo(fatherTemplateId);
//添加子模板
Long payComboId = payComboRepository.save(payCombo).getId();
PayComboUser payComboUser = new PayComboUser();
payComboUser.setUserId(userId);
payComboUser.setPayComboId(payComboId);
payComboUser.setBeginTime(DateUtil.date());
if (endTime == null) {
endTime = DateUtil.offset(DateUtil.date(), DateField.YEAR, 1);
}
payComboUser.setEndTime(endTime);
//绑定用户
payComboUserRepository.save(payComboUser);
//绑定公司
companyRepository.updateCompanyTemplateIdById(fatherTemplateId, companyId);
}
}

10
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/service/impl/QueryReportServiceImpl.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class QueryReportServiceImpl implements QueryReportService {
StatisticalReportDTO condition = getStatisticalReportDTO(s);
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
// TODO: 2022/5/6 0006 这里将统计今日的数据
// 这里将统计今日的数据
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
if (!betweenDays) {
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
@ -196,7 +196,7 @@ public class QueryReportServiceImpl implements QueryReportService {
List<TaskReport> taskReports = getTaskReport(condition.getBeginTime(), condition.getEndTime(), condition.getType(), condition.getIds());
List<TaskReport> list = new ArrayList<>();
// TODO: 2022/5/6 0006 这里将统计今日的数据
// 这里将统计今日的数据
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(condition.getEndTime()));
if (betweenDays) {
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTaskId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), condition.getIds());
@ -328,7 +328,7 @@ public class QueryReportServiceImpl implements QueryReportService {
}
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
// TODO: 2022/5/6 0006 这里将统计今日的数据
// 这里将统计今日的数据
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
if (betweenDays) {
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
@ -378,7 +378,7 @@ public class QueryReportServiceImpl implements QueryReportService {
}
List<UserReport> userReports = userReportRepository.queryAllByTimeAndTeamIds(beginTime, endTime, ids);
// TODO: 2022/5/6 0006 这里将统计今日的数据
// 这里将统计今日的数据
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
if (betweenDays) {
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndTeamId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), ids);
@ -559,7 +559,7 @@ public class QueryReportServiceImpl implements QueryReportService {
}
List<UserReport> userReports = userReportRepository.queryAllByTimeAndId(beginTime, endTime, memberId);
// TODO: 2022/5/6 0006 这里将统计今日的数据
// 这里将统计今日的数据
boolean betweenDays = DateTimeUtil.betweenByDay(DateUtil.date(), DateUtil.parseDate(endTime));
if (betweenDays) {
List<CallClueInfo> callClueInfos = callClueRepository.queryAllByTimeAndMemberId(DateUtil.beginOfDay(DateUtil.date()).toString(), DateUtil.date().toString(), memberId);

10
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
Unescape Escape View File

@ -120,7 +120,7 @@ public class UserServiceImpl implements UserService {
private final OrganizeRepository organizeRepository;
private final PayComboLogService payComboLogService;
private final PayFatherTemplateService payFatherTemplateService;
private final PayTemplateUserService payTemplateUserService;
private final OrganizeUserRepository organizeUserRepository;
@ -256,7 +256,7 @@ public class UserServiceImpl implements UserService {
flag = Boolean.TRUE;
break;
}
// TODO 创建渠道商
// 创建渠道商
if (channelId.equals(role.getId())) {
BeanUtil.copyProperties(userDTO, user);
user.setUsername(user.getUsername().trim());
@ -294,7 +294,7 @@ public class UserServiceImpl implements UserService {
user.setTurnCrmNum(20);
User userCreateResult = create(user);
//todo 如果是管理员 则创建任务
// 如果是管理员 则创建任务
if (flag) {
if (userDTO.getCompanyType() != null && userDTO.getCompanyType() == 1) {
//抖音（飞鱼）
@ -311,6 +311,8 @@ public class UserServiceImpl implements UserService {
}
//添加质量图
qualityScoreService.addDefault(userCreateResult.getId());
//todo 创建默认的支付模板 (因为这快业务已经不需要了，为了避免多余业务操作，默认创建一个)
payFatherTemplateService.addDefaultTemplate(userCreateResult.getUsername(),userCreateResult.getId(),userCreateResult.getExpirationTime(),companyId);
}
MultipartFile file = userDTO.getFile();
@ -444,7 +446,7 @@ public class UserServiceImpl implements UserService {
UserDto userDto = userMapper.toDto(user);
Set<Role> roles = user.getRoles();
for (Role role : roles) {
// TODO 修改管理员id
// 修改管理员id
if (businessConfig.getIds().contains(role.getId())) {
userDto.setIsManager(Boolean.TRUE);
}

Write Preview
Loading…
Cancel
Save