Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 61938e0d 61938e0dba2414d5dfbcb9152c6b6068e14c878d by xianghan
Options

1.同步future

2 parents 463c7342 b760b79e
Inline Side-by-side
Showing 133 changed files with 199 additions and 275 deletions
...@@ -23,16 +23,10 @@ ...@@ -23,16 +23,10 @@
23 23
24 <dependency> 24 <dependency>
25 <groupId>com.topdraw</groupId> 25 <groupId>com.topdraw</groupId>
26 <artifactId>cronos-system</artifactId> 26 <artifactId>core-service</artifactId>
27 <version>${cronos.version}</version> 27 <version>1.0.0</version>
28 </dependency> 28 </dependency>
29 29
30 <!--<dependency>
31 <groupId>com.topdraw</groupId>
32 <artifactId>code-generator</artifactId>
33 <version>3.1.0</version>
34 </dependency>
35 -->
36 <dependency> 30 <dependency>
37 <groupId>org.springframework.boot</groupId> 31 <groupId>org.springframework.boot</groupId>
38 <artifactId>spring-boot-starter-cache</artifactId> 32 <artifactId>spring-boot-starter-cache</artifactId>
......
1 package com.topdraw; 1 package com.topdraw;
2 2
3 3
4 import com.topdraw.utils.SpringContextHolder; 4 import com.topdraw.base.modules.utils.SpringContextHolder;
5 import org.springframework.boot.SpringApplication; 5 import org.springframework.boot.SpringApplication;
6 import org.springframework.boot.autoconfigure.SpringBootApplication; 6 import org.springframework.boot.autoconfigure.SpringBootApplication;
7 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; 7 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
......
1 package com.topdraw.business.module.contact.vis.rest; 1 package com.topdraw.business.module.contact.vis.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO; 6 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
5 import com.topdraw.common.ResultInfo;
6 import com.topdraw.business.module.contact.vis.domain.ActivityAddress; 7 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
7 import com.topdraw.business.module.contact.vis.service.ActivityAddressService; 8 import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
8 import com.topdraw.exception.BadRequestException;
9 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
10 import org.apache.commons.lang3.StringUtils; 10 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.util.Assert;
13 import org.springframework.validation.annotation.Validated; 12 import org.springframework.validation.annotation.Validated;
14 import org.springframework.web.bind.annotation.*; 13 import org.springframework.web.bind.annotation.*;
15 import io.swagger.annotations.*; 14 import io.swagger.annotations.*;
......
1 package com.topdraw.business.module.contact.vis.service.impl; 1 package com.topdraw.business.module.contact.vis.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.contact.vis.domain.ActivityAddress; 4 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
4 import com.topdraw.util.TimestampUtil; 5 import com.topdraw.util.TimestampUtil;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.contact.vis.repository.ActivityAddressRepository; 6 import com.topdraw.business.module.contact.vis.repository.ActivityAddressRepository;
7 import com.topdraw.business.module.contact.vis.service.ActivityAddressService; 7 import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
8 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO; 8 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
9 import com.topdraw.business.module.contact.vis.service.mapper.ActivityAddressMapper; 9 import com.topdraw.business.module.contact.vis.service.mapper.ActivityAddressMapper;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.cache.annotation.CachePut;
12 import org.springframework.cache.annotation.Cacheable;
13 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
14 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
15 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
......
1 package com.topdraw.business.module.contact.vis.service.mapper; 1 package com.topdraw.business.module.contact.vis.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.contact.vis.domain.ActivityAddress; 4 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
5 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO; 5 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.coupon.history.service.impl; 1 package com.topdraw.business.module.coupon.history.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.coupon.history.domain.CouponHistory; 4 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import com.topdraw.business.module.coupon.history.domain.CouponHistoryBuilder; 5 import com.topdraw.business.module.coupon.history.domain.CouponHistoryBuilder;
5 import com.topdraw.util.LocalDateTimeUtil; 6 import com.topdraw.util.LocalDateTimeUtil;
6 import com.topdraw.utils.ValidationUtil;
7 import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository; 7 import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository;
8 import com.topdraw.business.module.coupon.history.service.CouponHistoryService; 8 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
9 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO; 9 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
...@@ -13,11 +13,7 @@ import org.springframework.stereotype.Service; ...@@ -13,11 +13,7 @@ import org.springframework.stereotype.Service;
13 import org.springframework.transaction.annotation.Propagation; 13 import org.springframework.transaction.annotation.Propagation;
14 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
15 15
16 import java.sql.Date;
17 import java.time.LocalDate;
18 import java.time.LocalDateTime; 16 import java.time.LocalDateTime;
19 import java.time.ZoneId;
20 import java.time.ZonedDateTime;
21 17
22 /** 18 /**
23 * @author XiangHan 19 * @author XiangHan
......
1 package com.topdraw.business.module.coupon.history.service.mapper; 1 package com.topdraw.business.module.coupon.history.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.coupon.history.domain.CouponHistory; 4 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
5 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO; 5 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
...@@ -7,13 +7,13 @@ import com.topdraw.business.module.coupon.repository.CouponRepository; ...@@ -7,13 +7,13 @@ import com.topdraw.business.module.coupon.repository.CouponRepository;
7 import com.topdraw.business.module.coupon.service.CouponService; 7 import com.topdraw.business.module.coupon.service.CouponService;
8 import com.topdraw.business.module.coupon.service.dto.CouponDTO; 8 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
9 import com.topdraw.business.module.coupon.service.mapper.CouponMapper; 9 import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.cache.annotation.Cacheable; 12 import org.springframework.cache.annotation.Cacheable;
12 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
13 import org.springframework.transaction.annotation.Propagation; 14 import org.springframework.transaction.annotation.Propagation;
14 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
15 import org.springframework.util.Assert; 16 import org.springframework.util.Assert;
16 import com.topdraw.utils.StringUtils;
17 17
18 18
19 /** 19 /**
......
1 package com.topdraw.business.module.coupon.service.mapper; 1 package com.topdraw.business.module.coupon.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.coupon.domain.Coupon; 4 import com.topdraw.business.module.coupon.domain.Coupon;
5 import com.topdraw.business.module.coupon.service.dto.CouponDTO; 5 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.exp.detail.service.impl; 1 package com.topdraw.business.module.exp.detail.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.exp.detail.domain.ExpDetail; 5 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
4 import com.topdraw.business.module.exp.detail.domain.ExpDetailBuilder; 6 import com.topdraw.business.module.exp.detail.domain.ExpDetailBuilder;
5 import com.topdraw.utils.RedisUtils;
6 import com.topdraw.utils.ValidationUtil;
7 import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository; 7 import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository;
8 import com.topdraw.business.module.exp.detail.service.ExpDetailService; 8 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
9 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO; 9 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
10 import com.topdraw.business.module.exp.detail.service.mapper.ExpDetailMapper; 10 import com.topdraw.business.module.exp.detail.service.mapper.ExpDetailMapper;
11 import org.apache.commons.lang3.StringUtils;
11 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
13 import org.springframework.transaction.annotation.Propagation; 14 import org.springframework.transaction.annotation.Propagation;
14 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
15 import org.springframework.dao.EmptyResultDataAccessException; 16 import org.springframework.dao.EmptyResultDataAccessException;
16 import org.springframework.util.Assert; 17 import org.springframework.util.Assert;
17 import com.topdraw.utils.StringUtils;
18 18
19 19
20 /** 20 /**
......
1 package com.topdraw.business.module.exp.detail.service.mapper; 1 package com.topdraw.business.module.exp.detail.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.exp.detail.domain.ExpDetail; 4 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
5 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO; 5 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.exp.history.service.impl; 1 package com.topdraw.business.module.exp.history.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.exp.history.domain.ExpHistory; 4 import com.topdraw.business.module.exp.history.domain.ExpHistory;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.exp.history.repository.ExpHistoryRepository; 5 import com.topdraw.business.module.exp.history.repository.ExpHistoryRepository;
6 import com.topdraw.business.module.exp.history.service.ExpHistoryService; 6 import com.topdraw.business.module.exp.history.service.ExpHistoryService;
7 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO; 7 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
8 import com.topdraw.business.module.exp.history.service.mapper.ExpHistoryMapper; 8 import com.topdraw.business.module.exp.history.service.mapper.ExpHistoryMapper;
9 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
12 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
13 import com.topdraw.utils.StringUtils;
14 14
15 15
16 /** 16 /**
......
1 package com.topdraw.business.module.exp.history.service.mapper; 1 package com.topdraw.business.module.exp.history.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.exp.history.domain.ExpHistory; 4 import com.topdraw.business.module.exp.history.domain.ExpHistory;
5 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO; 5 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.address.rest; 1 package com.topdraw.business.module.member.address.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
5 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO; 7 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
7 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
8 import com.topdraw.business.process.service.member.MemberAddressOperationService; 8 import com.topdraw.business.process.service.member.MemberAddressOperationService;
9 import com.topdraw.common.ResultInfo;
10 import com.topdraw.business.module.member.address.domain.MemberAddress; 9 import com.topdraw.business.module.member.address.domain.MemberAddress;
11 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
12 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.module.member.address.service.impl; 1 package com.topdraw.business.module.member.address.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.address.domain.MemberAddress; 5 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import com.topdraw.business.module.member.address.domain.MemberAddressBuilder; 6 import com.topdraw.business.module.member.address.domain.MemberAddressBuilder;
5 import com.topdraw.business.module.member.service.MemberService; 7 import com.topdraw.business.module.member.service.MemberService;
6 import com.topdraw.business.module.member.service.dto.MemberDTO; 8 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.utils.RedisUtils;
8 import com.topdraw.utils.ValidationUtil;
9 import com.topdraw.business.module.member.address.repository.MemberAddressRepository; 9 import com.topdraw.business.module.member.address.repository.MemberAddressRepository;
10 import com.topdraw.business.module.member.address.service.MemberAddressService; 10 import com.topdraw.business.module.member.address.service.MemberAddressService;
11 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; 11 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
......
1 package com.topdraw.business.module.member.address.service.mapper; 1 package com.topdraw.business.module.member.address.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.address.domain.MemberAddress; 4 import com.topdraw.business.module.member.address.domain.MemberAddress;
5 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; 5 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.group.service.impl; 1 package com.topdraw.business.module.member.group.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.group.domain.Group; 4 import com.topdraw.business.module.member.group.domain.Group;
4 import com.topdraw.business.module.member.group.repository.GroupRepository; 5 import com.topdraw.business.module.member.group.repository.GroupRepository;
5 import com.topdraw.business.module.member.group.service.GroupService; 6 import com.topdraw.business.module.member.group.service.GroupService;
6 import com.topdraw.business.module.member.group.service.dto.GroupDTO; 7 import com.topdraw.business.module.member.group.service.dto.GroupDTO;
7 import com.topdraw.business.module.member.group.service.mapper.GroupMapper; 8 import com.topdraw.business.module.member.group.service.mapper.GroupMapper;
8 import com.topdraw.utils.*; 9 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.member.group.service.impl; 1 package com.topdraw.business.module.member.group.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.group.domain.MemberGroup; 4 import com.topdraw.business.module.member.group.domain.MemberGroup;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.member.group.repository.MemberGroupRepository; 5 import com.topdraw.business.module.member.group.repository.MemberGroupRepository;
6 import com.topdraw.business.module.member.group.service.MemberGroupService; 6 import com.topdraw.business.module.member.group.service.MemberGroupService;
7 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO; 7 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
......
1 package com.topdraw.business.module.member.group.service.mapper; 1 package com.topdraw.business.module.member.group.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.group.domain.Group; 4 import com.topdraw.business.module.member.group.domain.Group;
5 import com.topdraw.business.module.member.group.service.dto.GroupDTO; 5 import com.topdraw.business.module.member.group.service.dto.GroupDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.group.service.mapper; 1 package com.topdraw.business.module.member.group.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.group.domain.MemberGroup; 4 import com.topdraw.business.module.member.group.domain.MemberGroup;
5 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO; 5 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.level.service.impl; 1 package com.topdraw.business.module.member.level.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.level.domain.MemberLevel; 4 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import com.topdraw.business.RedisKeyConstants; 5 import com.topdraw.business.RedisKeyConstants;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.member.level.repository.MemberLevelRepository; 6 import com.topdraw.business.module.member.level.repository.MemberLevelRepository;
7 import com.topdraw.business.module.member.level.service.MemberLevelService; 7 import com.topdraw.business.module.member.level.service.MemberLevelService;
8 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO; 8 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
9 import com.topdraw.business.module.member.level.service.mapper.MemberLevelMapper; 9 import com.topdraw.business.module.member.level.service.mapper.MemberLevelMapper;
10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.cache.annotation.Cacheable; 12 import org.springframework.cache.annotation.Cacheable;
12 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
13 import org.springframework.transaction.annotation.Propagation; 14 import org.springframework.transaction.annotation.Propagation;
14 import org.springframework.transaction.annotation.Transactional; 15 import org.springframework.transaction.annotation.Transactional;
15 import com.topdraw.utils.StringUtils;
16 16
17 /** 17 /**
18 * @author XiangHan 18 * @author XiangHan
......
1 package com.topdraw.business.module.member.level.service.mapper; 1 package com.topdraw.business.module.member.level.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.level.domain.MemberLevel; 4 import com.topdraw.business.module.member.level.domain.MemberLevel;
5 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO; 5 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.profile.rest; 1 package com.topdraw.business.module.member.profile.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
5 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 7 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
7 import com.topdraw.business.process.service.member.MemberProfileOperationService; 8 import com.topdraw.business.process.service.member.MemberProfileOperationService;
8 import com.topdraw.common.ResultInfo;
9 import com.topdraw.business.module.member.profile.domain.MemberProfile; 9 import com.topdraw.business.module.member.profile.domain.MemberProfile;
10 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.module.member.profile.service.impl; 1 package com.topdraw.business.module.member.profile.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.module.member.profile.domain.MemberProfile; 6 import com.topdraw.business.module.member.profile.domain.MemberProfile;
5 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder; 7 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder;
6 import com.topdraw.business.module.member.service.MemberService; 8 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 9 import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.util.Base64Util;
9 import com.topdraw.util.RegexUtil; 10 import com.topdraw.util.RegexUtil;
10 import com.topdraw.utils.RedisUtils;
11 import com.topdraw.utils.ValidationUtil;
12 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository; 11 import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
13 import com.topdraw.business.module.member.profile.service.MemberProfileService; 12 import com.topdraw.business.module.member.profile.service.MemberProfileService;
14 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 13 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
......
1 package com.topdraw.business.module.member.profile.service.mapper; 1 package com.topdraw.business.module.member.profile.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.profile.domain.MemberProfile; 4 import com.topdraw.business.module.member.profile.domain.MemberProfile;
5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.relatedinfo.rest; 1 package com.topdraw.business.module.member.relatedinfo.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
5 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO; 7 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
7 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService; 8 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
8 import com.topdraw.common.ResultInfo;
9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
10 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.module.member.relatedinfo.service.impl; 1 package com.topdraw.business.module.member.relatedinfo.service.impl;
2 2
3 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.base.modules.utils.RedisUtils;
5 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 7 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfoBuilder; 8 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfoBuilder;
6 import com.topdraw.business.module.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.exception.BadRequestException;
9 import com.topdraw.exception.GlobeExceptionMsg; 11 import com.topdraw.exception.GlobeExceptionMsg;
10 import com.topdraw.util.Base64Util; 12 import com.topdraw.util.Base64Util;
11 import com.topdraw.utils.RedisUtils;
12 import com.topdraw.utils.ValidationUtil;
13 import com.topdraw.business.module.member.relatedinfo.repository.MemberRelatedInfoRepository; 13 import com.topdraw.business.module.member.relatedinfo.repository.MemberRelatedInfoRepository;
14 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService; 14 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
15 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 15 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
......
1 package com.topdraw.business.module.member.relatedinfo.service.mapper; 1 package com.topdraw.business.module.member.relatedinfo.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.rest; 1 package com.topdraw.business.module.member.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
5 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.domain.Member; 7 import com.topdraw.business.module.member.domain.Member;
...@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.service.dto.MemberDTO; ...@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.business.module.user.iptv.domain.UserTv; 9 import com.topdraw.business.module.user.iptv.domain.UserTv;
9 import com.topdraw.business.process.service.member.MemberOperationService; 10 import com.topdraw.business.process.service.member.MemberOperationService;
10 import com.topdraw.business.process.service.UserOperationService; 11 import com.topdraw.business.process.service.UserOperationService;
11 import com.topdraw.common.ResultInfo;
12 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiOperation; 13 import io.swagger.annotations.ApiOperation;
14 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
...@@ -19,7 +19,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -19,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
19 import org.springframework.web.bind.annotation.*; 19 import org.springframework.web.bind.annotation.*;
20 20
21 import java.util.List; 21 import java.util.List;
22 import java.util.Objects;
23 22
24 /** 23 /**
25 * @author XiangHan 24 * @author XiangHan
......
...@@ -2,6 +2,8 @@ package com.topdraw.business.module.member.service.impl; ...@@ -2,6 +2,8 @@ package com.topdraw.business.module.member.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.base.modules.exception.BadRequestException;
6 import com.topdraw.base.modules.utils.RedisUtils;
5 import com.topdraw.business.module.member.domain.Member; 7 import com.topdraw.business.module.member.domain.Member;
6 import com.topdraw.business.module.member.domain.MemberBuilder; 8 import com.topdraw.business.module.member.domain.MemberBuilder;
7 import com.topdraw.business.module.member.domain.MemberSimple; 9 import com.topdraw.business.module.member.domain.MemberSimple;
...@@ -16,9 +18,7 @@ import com.topdraw.business.module.member.service.dto.MemberSimpleDTO; ...@@ -16,9 +18,7 @@ import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
16 import com.topdraw.business.module.member.service.mapper.MemberMapper; 18 import com.topdraw.business.module.member.service.mapper.MemberMapper;
17 import com.topdraw.business.module.member.service.mapper.MemberSimpleMapper; 19 import com.topdraw.business.module.member.service.mapper.MemberSimpleMapper;
18 import com.topdraw.business.RedisKeyConstants; 20 import com.topdraw.business.RedisKeyConstants;
19 import com.topdraw.exception.BadRequestException;
20 import com.topdraw.exception.GlobeExceptionMsg; 21 import com.topdraw.exception.GlobeExceptionMsg;
21 import com.topdraw.utils.RedisUtils;
22 import lombok.extern.slf4j.Slf4j; 22 import lombok.extern.slf4j.Slf4j;
23 import org.apache.commons.lang3.StringUtils; 23 import org.apache.commons.lang3.StringUtils;
24 import org.springframework.beans.BeanUtils; 24 import org.springframework.beans.BeanUtils;
......
1 package com.topdraw.business.module.member.service.mapper; 1 package com.topdraw.business.module.member.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.service.dto.MemberDTO; 5 import com.topdraw.business.module.member.service.dto.MemberDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.service.mapper; 1 package com.topdraw.business.module.member.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.domain.MemberSimple; 4 import com.topdraw.business.module.member.domain.MemberSimple;
5 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO; 5 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.member.viphistory.service.impl; 1 package com.topdraw.business.module.member.viphistory.service.impl;
2 2
3 3
4 import com.topdraw.aspect.AsyncMqSend; 4 import com.topdraw.base.modules.utils.ValidationUtil;
5 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
6 import com.topdraw.business.module.member.service.MemberService; 6 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 7 import com.topdraw.business.module.member.service.dto.MemberDTO;
...@@ -12,7 +12,6 @@ import com.topdraw.business.module.member.viphistory.service.MemberVipHistorySer ...@@ -12,7 +12,6 @@ import com.topdraw.business.module.member.viphistory.service.MemberVipHistorySer
12 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO; 12 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
13 import com.topdraw.business.module.member.viphistory.service.mapper.MemberVipHistoryMapper; 13 import com.topdraw.business.module.member.viphistory.service.mapper.MemberVipHistoryMapper;
14 import com.topdraw.util.TimestampUtil; 14 import com.topdraw.util.TimestampUtil;
15 import com.topdraw.utils.ValidationUtil;
16 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
17 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
18 import org.springframework.dao.EmptyResultDataAccessException; 17 import org.springframework.dao.EmptyResultDataAccessException;
...@@ -90,8 +89,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService { ...@@ -90,8 +89,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
90 @Override 89 @Override
91 public MemberVipHistory findByTime(Long memberId, Timestamp nowTime) { 90 public MemberVipHistory findByTime(Long memberId, Timestamp nowTime) {
92 LocalDateTime localDateTime = TimestampUtil.timestamp2LocalDateTime(nowTime); 91 LocalDateTime localDateTime = TimestampUtil.timestamp2LocalDateTime(nowTime);
93 MemberVipHistory memberVipHistory = this.memberVipHistoryRepository.findByTime(memberId, localDateTime).orElseGet(MemberVipHistory::new); 92 return this.memberVipHistoryRepository.findByTime(memberId, localDateTime).orElseGet(MemberVipHistory::new);
94 return memberVipHistory;
95 } 93 }
96 94
97 private MemberDTO checkMember(MemberVipHistory resources){ 95 private MemberDTO checkMember(MemberVipHistory resources){
......
1 package com.topdraw.business.module.member.viphistory.service.mapper; 1 package com.topdraw.business.module.member.viphistory.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory; 4 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO; 5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.points.available.service.dto; 1 package com.topdraw.business.module.points.available.service.dto;
2 2
3 import com.topdraw.base.modules.annotation.Query;
3 import lombok.Data; 4 import lombok.Data;
4 import com.topdraw.annotation.Query;
5 5
6 import java.sql.Timestamp; 6 import java.sql.Timestamp;
7 7
......
1 package com.topdraw.business.module.points.available.service.impl; 1 package com.topdraw.business.module.points.available.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.points.available.domain.PointsAvailable; 5 import com.topdraw.business.module.points.available.domain.PointsAvailable;
4 import com.topdraw.utils.RedisUtils;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.points.available.repository.PointsAvailableRepository; 6 import com.topdraw.business.module.points.available.repository.PointsAvailableRepository;
7 import com.topdraw.business.module.points.available.service.PointsAvailableService; 7 import com.topdraw.business.module.points.available.service.PointsAvailableService;
8 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO; 8 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
9 import com.topdraw.business.module.points.available.service.mapper.PointsAvailableMapper; 9 import com.topdraw.business.module.points.available.service.mapper.PointsAvailableMapper;
10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
12 import org.springframework.transaction.annotation.Propagation; 13 import org.springframework.transaction.annotation.Propagation;
13 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
14 import org.springframework.dao.EmptyResultDataAccessException; 15 import org.springframework.dao.EmptyResultDataAccessException;
15 import org.springframework.util.Assert; 16 import org.springframework.util.Assert;
16 import com.topdraw.utils.StringUtils;
17 17
18 import java.sql.Timestamp; 18 import java.sql.Timestamp;
19 import java.time.LocalDateTime;
20 import java.util.*; 19 import java.util.*;
21 20
22 /** 21 /**
......
1 package com.topdraw.business.module.points.available.service.mapper; 1 package com.topdraw.business.module.points.available.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.points.available.domain.PointsAvailable; 4 import com.topdraw.business.module.points.available.domain.PointsAvailable;
5 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO; 5 import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.points.detail.detailhistory.service.impl; 1 package com.topdraw.business.module.points.detail.detailhistory.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory; 4 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.points.detail.detailhistory.repository.PointsDetailHistoryRepository; 5 import com.topdraw.business.module.points.detail.detailhistory.repository.PointsDetailHistoryRepository;
6 import com.topdraw.business.module.points.detail.detailhistory.service.PointsDetailHistoryService; 6 import com.topdraw.business.module.points.detail.detailhistory.service.PointsDetailHistoryService;
7 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO; 7 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
8 import com.topdraw.business.module.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper; 8 import com.topdraw.business.module.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper;
9 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
12 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
13 import org.springframework.dao.EmptyResultDataAccessException; 14 import org.springframework.dao.EmptyResultDataAccessException;
14 import org.springframework.util.Assert; 15 import org.springframework.util.Assert;
15 import com.topdraw.utils.StringUtils;
16 16
17 /** 17 /**
18 * @author XiangHan 18 * @author XiangHan
......
1 package com.topdraw.business.module.points.detail.detailhistory.service.mapper; 1 package com.topdraw.business.module.points.detail.detailhistory.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory; 4 import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
5 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO; 5 import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.points.detail.service.impl; 1 package com.topdraw.business.module.points.detail.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.points.detail.domain.PointsDetail; 4 import com.topdraw.business.module.points.detail.domain.PointsDetail;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.points.detail.repository.PointsDetailRepository; 5 import com.topdraw.business.module.points.detail.repository.PointsDetailRepository;
6 import com.topdraw.business.module.points.detail.service.PointsDetailService; 6 import com.topdraw.business.module.points.detail.service.PointsDetailService;
7 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO; 7 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO;
8 import com.topdraw.business.module.points.detail.service.mapper.PointsDetailMapper; 8 import com.topdraw.business.module.points.detail.service.mapper.PointsDetailMapper;
9 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
12 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
13 import org.springframework.dao.EmptyResultDataAccessException; 14 import org.springframework.dao.EmptyResultDataAccessException;
14 import org.springframework.util.Assert; 15 import org.springframework.util.Assert;
15 import com.topdraw.utils.StringUtils;
16 16
17 import java.util.List; 17 import java.util.List;
18 import java.util.Objects; 18 import java.util.Objects;
......
1 package com.topdraw.business.module.points.detail.service.mapper; 1 package com.topdraw.business.module.points.detail.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.points.detail.domain.PointsDetail; 4 import com.topdraw.business.module.points.detail.domain.PointsDetail;
5 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO; 5 import com.topdraw.business.module.points.detail.service.dto.PointsDetailDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.points.service.impl; 1 package com.topdraw.business.module.points.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.points.domain.Points; 5 import com.topdraw.business.module.points.domain.Points;
4 import com.topdraw.utils.RedisUtils;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.points.repository.PointsRepository; 6 import com.topdraw.business.module.points.repository.PointsRepository;
7 import com.topdraw.business.module.points.service.PointsService; 7 import com.topdraw.business.module.points.service.PointsService;
8 import com.topdraw.business.module.points.service.dto.PointsDTO; 8 import com.topdraw.business.module.points.service.dto.PointsDTO;
......
1 package com.topdraw.business.module.points.service.mapper; 1 package com.topdraw.business.module.points.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.points.domain.Points; 4 import com.topdraw.business.module.points.domain.Points;
5 import com.topdraw.business.module.points.service.dto.PointsDTO; 5 import com.topdraw.business.module.points.service.dto.PointsDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.rights.history.service.dto; 1 package com.topdraw.business.module.rights.history.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.base.modules.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 import java.sql.Timestamp; 6 import java.sql.Timestamp;
......
1 package com.topdraw.business.module.rights.history.service.impl; 1 package com.topdraw.business.module.rights.history.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.member.service.MemberService; 4 import com.topdraw.business.module.member.service.MemberService;
4 import com.topdraw.business.module.member.service.dto.MemberDTO; 5 import com.topdraw.business.module.member.service.dto.MemberDTO;
5 import com.topdraw.business.module.rights.history.domain.RightsHistory; 6 import com.topdraw.business.module.rights.history.domain.RightsHistory;
6 import com.topdraw.utils.ValidationUtil;
7 import com.topdraw.business.module.rights.history.repository.RightsHistoryRepository; 7 import com.topdraw.business.module.rights.history.repository.RightsHistoryRepository;
8 import com.topdraw.business.module.rights.history.service.RightsHistoryService; 8 import com.topdraw.business.module.rights.history.service.RightsHistoryService;
9 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO; 9 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO;
10 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryQueryCriteria;
11 import com.topdraw.business.module.rights.history.service.mapper.RightsHistoryMapper; 10 import com.topdraw.business.module.rights.history.service.mapper.RightsHistoryMapper;
12 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
...@@ -37,8 +36,7 @@ public class RightsHistoryServiceImpl implements RightsHistoryService { ...@@ -37,8 +36,7 @@ public class RightsHistoryServiceImpl implements RightsHistoryService {
37 @Override 36 @Override
38 public List<RightsHistoryDTO> findByMemberIdOrMemberCode(Long memberId, String memberCode) { 37 public List<RightsHistoryDTO> findByMemberIdOrMemberCode(Long memberId, String memberCode) {
39 MemberDTO memberDTO = this.memberService.checkMember(memberId, memberCode); 38 MemberDTO memberDTO = this.memberService.checkMember(memberId, memberCode);
40 List<RightsHistoryDTO> rightsHistoryDTOList = this.rightsHistoryRepository.findByMemberId(memberDTO.getId()); 39 return this.rightsHistoryRepository.findByMemberId(memberDTO.getId());
41 return rightsHistoryDTOList;
42 } 40 }
43 41
44 @Override 42 @Override
......
1 package com.topdraw.business.module.rights.history.service.mapper; 1 package com.topdraw.business.module.rights.history.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.rights.history.domain.RightsHistory; 4 import com.topdraw.business.module.rights.history.domain.RightsHistory;
5 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO; 5 import com.topdraw.business.module.rights.history.service.dto.RightsHistoryDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.rights.permanentrights.service.impl; 1 package com.topdraw.business.module.rights.permanentrights.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights; 4 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.rights.permanentrights.repository.PermanentRightsRepository; 5 import com.topdraw.business.module.rights.permanentrights.repository.PermanentRightsRepository;
6 import com.topdraw.business.module.rights.permanentrights.service.PermanentRightsService; 6 import com.topdraw.business.module.rights.permanentrights.service.PermanentRightsService;
7 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO; 7 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO;
8 import com.topdraw.business.module.rights.permanentrights.service.mapper.PermanentRightsMapper; 8 import com.topdraw.business.module.rights.permanentrights.service.mapper.PermanentRightsMapper;
9 import org.apache.commons.lang3.StringUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 12 import org.springframework.transaction.annotation.Propagation;
12 import org.springframework.transaction.annotation.Transactional; 13 import org.springframework.transaction.annotation.Transactional;
13 import com.topdraw.utils.StringUtils;
14 14
15 /** 15 /**
16 * @author XiangHan 16 * @author XiangHan
......
1 package com.topdraw.business.module.rights.permanentrights.service.mapper; 1 package com.topdraw.business.module.rights.permanentrights.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights; 4 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights;
5 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO; 5 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
...@@ -2,11 +2,11 @@ package com.topdraw.business.module.rights.service.impl; ...@@ -2,11 +2,11 @@ package com.topdraw.business.module.rights.service.impl;
2 2
3 import com.topdraw.business.module.rights.domain.Rights; 3 import com.topdraw.business.module.rights.domain.Rights;
4 import com.topdraw.business.RedisKeyConstants; 4 import com.topdraw.business.RedisKeyConstants;
5 import com.topdraw.utils.*;
6 import com.topdraw.business.module.rights.repository.RightsRepository; 5 import com.topdraw.business.module.rights.repository.RightsRepository;
7 import com.topdraw.business.module.rights.service.RightsService; 6 import com.topdraw.business.module.rights.service.RightsService;
8 import com.topdraw.business.module.rights.service.dto.RightsDTO; 7 import com.topdraw.business.module.rights.service.dto.RightsDTO;
9 import com.topdraw.business.module.rights.service.mapper.RightsMapper; 8 import com.topdraw.business.module.rights.service.mapper.RightsMapper;
9 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.cache.annotation.Cacheable; 11 import org.springframework.cache.annotation.Cacheable;
12 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
......
1 package com.topdraw.business.module.rights.service.mapper; 1 package com.topdraw.business.module.rights.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.rights.domain.Rights; 4 import com.topdraw.business.module.rights.domain.Rights;
5 import com.topdraw.business.module.rights.service.dto.RightsDTO; 5 import com.topdraw.business.module.rights.service.dto.RightsDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.task.attribute.service.impl; 1 package com.topdraw.business.module.task.attribute.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.base.modules.utils.ValidationUtil;
4 import com.topdraw.business.module.task.attribute.domain.TaskAttr; 5 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.task.attribute.repository.TaskAttrRepository; 6 import com.topdraw.business.module.task.attribute.repository.TaskAttrRepository;
7 import com.topdraw.business.module.task.attribute.service.TaskAttrService; 7 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
8 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; 8 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
......
1 package com.topdraw.business.module.task.attribute.service.mapper; 1 package com.topdraw.business.module.task.attribute.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.task.attribute.domain.TaskAttr; 4 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
5 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; 5 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.task.progress.service.impl; 1 package com.topdraw.business.module.task.progress.service.impl;
2 2
3 import com.topdraw.base.modules.utils.RedisUtils;
3 import com.topdraw.business.module.task.progress.domain.TrTaskProgress; 4 import com.topdraw.business.module.task.progress.domain.TrTaskProgress;
4 import com.topdraw.business.RedisKeyConstants; 5 import com.topdraw.business.RedisKeyConstants;
5 import com.topdraw.utils.RedisUtils;
6 import com.topdraw.business.module.task.progress.repository.TrTaskProgressRepository; 6 import com.topdraw.business.module.task.progress.repository.TrTaskProgressRepository;
7 import com.topdraw.business.module.task.progress.service.TrTaskProgressService; 7 import com.topdraw.business.module.task.progress.service.TrTaskProgressService;
8 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO; 8 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO;
...@@ -44,14 +44,12 @@ public class TrTaskProgressServiceImpl implements TrTaskProgressService { ...@@ -44,14 +44,12 @@ public class TrTaskProgressServiceImpl implements TrTaskProgressService {
44 44
45 @Override 45 @Override
46 @Transactional(rollbackFor = Exception.class) 46 @Transactional(rollbackFor = Exception.class)
47 // @CachePut(cacheNames = RedisKeyConstants.cacheTaskProcessByMemberId, key = "#resources.memberId+':'+#resources.taskId+':'+#date", unless = "#result == null ")
48 public TrTaskProgress create(TrTaskProgress resources, String date) { 47 public TrTaskProgress create(TrTaskProgress resources, String date) {
49 return this.trTaskProgressRepository.save(resources); 48 return this.trTaskProgressRepository.save(resources);
50 } 49 }
51 50
52 @Override 51 @Override
53 @Transactional(rollbackFor = Exception.class) 52 @Transactional(rollbackFor = Exception.class)
54 // @CachePut(cacheNames = RedisKeyConstants.cacheTaskProcessByMemberId, key = "#resources.memberId+':'+#resources.taskId+':'+#date", unless = "#result == null ")
55 public TrTaskProgress update(TrTaskProgress resources, String date) { 53 public TrTaskProgress update(TrTaskProgress resources, String date) {
56 return this.trTaskProgressRepository.save(resources); 54 return this.trTaskProgressRepository.save(resources);
57 } 55 }
......
1 package com.topdraw.business.module.task.progress.service.mapper; 1 package com.topdraw.business.module.task.progress.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.task.progress.domain.TrTaskProgress; 4 import com.topdraw.business.module.task.progress.domain.TrTaskProgress;
5 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO; 5 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
...@@ -3,6 +3,7 @@ package com.topdraw.business.module.task.service.impl; ...@@ -3,6 +3,7 @@ package com.topdraw.business.module.task.service.impl;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
5 import com.alibaba.fastjson.JSONObject; 5 import com.alibaba.fastjson.JSONObject;
6 import com.topdraw.base.modules.utils.RedisUtils;
6 import com.topdraw.business.module.task.attribute.service.TaskAttrService; 7 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
7 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; 8 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO;
8 import com.topdraw.business.module.task.domain.Task; 9 import com.topdraw.business.module.task.domain.Task;
...@@ -11,7 +12,6 @@ import com.topdraw.business.module.task.service.TaskService; ...@@ -11,7 +12,6 @@ import com.topdraw.business.module.task.service.TaskService;
11 import com.topdraw.business.module.task.service.dto.TaskDTO; 12 import com.topdraw.business.module.task.service.dto.TaskDTO;
12 import com.topdraw.business.module.task.service.mapper.TaskMapper; 13 import com.topdraw.business.module.task.service.mapper.TaskMapper;
13 import com.topdraw.business.RedisKeyConstants; 14 import com.topdraw.business.RedisKeyConstants;
14 import com.topdraw.utils.RedisUtils;
15 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
16 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
17 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
......
1 package com.topdraw.business.module.task.service.mapper; 1 package com.topdraw.business.module.task.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.task.domain.Task; 4 import com.topdraw.business.module.task.domain.Task;
5 import com.topdraw.business.module.task.service.dto.TaskDTO; 5 import com.topdraw.business.module.task.service.dto.TaskDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.task.template.service.impl; 1 package com.topdraw.business.module.task.template.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.task.template.domain.TaskTemplate; 4 import com.topdraw.business.module.task.template.domain.TaskTemplate;
4 import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder; 5 import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.task.template.repository.TaskTemplateRepository; 6 import com.topdraw.business.module.task.template.repository.TaskTemplateRepository;
7 import com.topdraw.business.module.task.template.service.TaskTemplateService; 7 import com.topdraw.business.module.task.template.service.TaskTemplateService;
8 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO; 8 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
9 import com.topdraw.business.module.task.template.service.mapper.TaskTemplateMapper; 9 import com.topdraw.business.module.task.template.service.mapper.TaskTemplateMapper;
10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
12 import org.springframework.transaction.annotation.Propagation; 13 import org.springframework.transaction.annotation.Propagation;
13 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
14 import org.springframework.dao.EmptyResultDataAccessException; 15 import org.springframework.dao.EmptyResultDataAccessException;
15 import org.springframework.util.Assert; 16 import org.springframework.util.Assert;
16 import com.topdraw.utils.StringUtils;
17 17
18 import java.util.List; 18 import java.util.List;
19 import java.util.Objects; 19 import java.util.Objects;
...@@ -85,8 +85,7 @@ public class TaskTemplateServiceImpl implements TaskTemplateService { ...@@ -85,8 +85,7 @@ public class TaskTemplateServiceImpl implements TaskTemplateService {
85 85
86 @Override 86 @Override
87 public Long countByCodeAndType(TaskTemplate taskTemplate) { 87 public Long countByCodeAndType(TaskTemplate taskTemplate) {
88 Long count = this.taskTemplateRepository.countByCodeAndType(taskTemplate.getCode(), taskTemplate.getType()); 88 return this.taskTemplateRepository.countByCodeAndType(taskTemplate.getCode(), taskTemplate.getType());
89 return count;
90 } 89 }
91 90
92 } 91 }
......
1 package com.topdraw.business.module.task.template.service.mapper; 1 package com.topdraw.business.module.task.template.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.task.template.domain.TaskTemplate; 4 import com.topdraw.business.module.task.template.domain.TaskTemplate;
5 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO; 5 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.app.rest; 1 package com.topdraw.business.module.user.app.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.user.app.domain.UserApp; 5 import com.topdraw.business.module.user.app.domain.UserApp;
5 import com.topdraw.business.module.user.app.domain.UserAppBind; 6 import com.topdraw.business.module.user.app.domain.UserAppBind;
6 import com.topdraw.business.module.user.app.service.UserAppBindService; 7 import com.topdraw.business.module.user.app.service.UserAppBindService;
...@@ -10,7 +11,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple; ...@@ -10,7 +11,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
10 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; 11 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
11 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 12 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
12 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 13 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
13 import com.topdraw.common.ResultInfo;
14 import com.topdraw.business.module.user.app.service.UserAppService; 14 import com.topdraw.business.module.user.app.service.UserAppService;
15 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
16 import org.apache.commons.lang3.StringUtils; 16 import org.apache.commons.lang3.StringUtils;
...@@ -121,8 +121,7 @@ public class UserAppController { ...@@ -121,8 +121,7 @@ public class UserAppController {
121 return ResultInfo.failure("修改app账号最后登录时间、昵称和头像和用户名失败,参数错误,app账号不得为空"); 121 return ResultInfo.failure("修改app账号最后登录时间、昵称和头像和用户名失败,参数错误,app账号不得为空");
122 } 122 }
123 123
124 boolean result = this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImgById(resources); 124 return ResultInfo.success(this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImgById(resources));
125 return ResultInfo.success(result);
126 } 125 }
127 126
128 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImg") 127 @PostMapping(value = "/updateAppLastActiveTimeAndNicknameAndHeadImg")
...@@ -136,8 +135,7 @@ public class UserAppController { ...@@ -136,8 +135,7 @@ public class UserAppController {
136 return ResultInfo.failure("修改app账号密码失败,参数错误,app账号不得为空"); 135 return ResultInfo.failure("修改app账号密码失败,参数错误,app账号不得为空");
137 } 136 }
138 137
139 boolean result = this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImg(resources); 138 return ResultInfo.success(this.userAppService.updateAppLastActiveTimeAndNicknameAndHeadImg(resources));
140 return ResultInfo.success(result);
141 } 139 }
142 140
143 @PostMapping(value = "/updateAppPasswordByUsername") 141 @PostMapping(value = "/updateAppPasswordByUsername")
...@@ -163,8 +161,7 @@ public class UserAppController { ...@@ -163,8 +161,7 @@ public class UserAppController {
163 // return ResultInfo.failure("密码必须包含大小写字母和数字的组合，不能使用特殊字符，长度在 8-25 之间"); 161 // return ResultInfo.failure("密码必须包含大小写字母和数字的组合，不能使用特殊字符，长度在 8-25 之间");
164 // } 162 // }
165 163
166 boolean result = this.userAppService.updatePasswordByUsername(resources); 164 return ResultInfo.success(this.userAppService.updatePasswordByUsername(resources));
167 return ResultInfo.success(result);
168 } 165 }
169 166
170 @PostMapping(value = "/updateLastActiveTime") 167 @PostMapping(value = "/updateLastActiveTime")
...@@ -177,8 +174,7 @@ public class UserAppController { ...@@ -177,8 +174,7 @@ public class UserAppController {
177 log.error("修改app账号最新登录时间失败,参数错误,app账号不得为空,[updateLastActiveTime#{}]", resources); 174 log.error("修改app账号最新登录时间失败,参数错误,app账号不得为空,[updateLastActiveTime#{}]", resources);
178 return ResultInfo.failure("修改app账号最新登录时间失败,参数错误,app账号不得为空"); 175 return ResultInfo.failure("修改app账号最新登录时间失败,参数错误,app账号不得为空");
179 } 176 }
180 boolean result = this.userAppService.updateLastActiveTime(resources); 177 return ResultInfo.success(this.userAppService.updateLastActiveTime(resources));
181 return ResultInfo.success(result);
182 } 178 }
183 179
184 @PostMapping(value = "/saveThirdAccount") 180 @PostMapping(value = "/saveThirdAccount")
...@@ -198,8 +194,7 @@ public class UserAppController { ...@@ -198,8 +194,7 @@ public class UserAppController {
198 resources.setUserAppId(id); 194 resources.setUserAppId(id);
199 } 195 }
200 196
201 UserAppBindDTO userAppBindDTO = this.userAppBindService.create(resources); 197 return ResultInfo.success(this.userAppBindService.create(resources));
202 return ResultInfo.success(userAppBindDTO);
203 } 198 }
204 199
205 @PostMapping(value = "/updateValidStatusAndUserAppIdAndNickname") 200 @PostMapping(value = "/updateValidStatusAndUserAppIdAndNickname")
...@@ -229,8 +224,7 @@ public class UserAppController { ...@@ -229,8 +224,7 @@ public class UserAppController {
229 return ResultInfo.failure("修改第三方账号, 参数错误, app账号不得为空"); 224 return ResultInfo.failure("修改第三方账号, 参数错误, app账号不得为空");
230 } 225 }
231 226
232 boolean result = this.userAppBindService.updateValidStatusAndUserAppIdAndNickname(resources); 227 return ResultInfo.success(this.userAppBindService.updateValidStatusAndUserAppIdAndNickname(resources));
233 return ResultInfo.success(result);
234 } 228 }
235 229
236 @PostMapping(value = "/updateThirdAccountNickname") 230 @PostMapping(value = "/updateThirdAccountNickname")
...@@ -251,7 +245,6 @@ public class UserAppController { ...@@ -251,7 +245,6 @@ public class UserAppController {
251 return ResultInfo.failure("修改第三方账号昵称, 参数错误, 昵称不得为空"); 245 return ResultInfo.failure("修改第三方账号昵称, 参数错误, 昵称不得为空");
252 } 246 }
253 247
254 boolean result = this.userAppBindService.updateThirdAccountNickname(resources); 248 return ResultInfo.success(this.userAppBindService.updateThirdAccountNickname(resources));
255 return ResultInfo.success(result);
256 } 249 }
257 } 250 }
......
1 package com.topdraw.business.module.user.app.service; 1 package com.topdraw.business.module.user.app.service;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.module.user.app.domain.UserApp; 4 import com.topdraw.business.module.user.app.domain.UserApp;
4 import com.topdraw.business.module.user.app.domain.UserAppBind; 5 import com.topdraw.business.module.user.app.domain.UserAppBind;
5 import com.topdraw.business.module.user.app.service.dto.UserAppDTO; 6 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
...@@ -8,7 +9,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple; ...@@ -8,7 +9,6 @@ import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
8 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; 9 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
9 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 10 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
10 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 11 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
11 import com.topdraw.common.ResultInfo;
12 12
13 /** 13 /**
14 * @author XiangHan 14 * @author XiangHan
......
1 package com.topdraw.business.module.user.app.service.impl; 1 package com.topdraw.business.module.user.app.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.app.domain.UserAppBind; 4 import com.topdraw.business.module.user.app.domain.UserAppBind;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.user.app.repository.UserAppBindRepository; 5 import com.topdraw.business.module.user.app.repository.UserAppBindRepository;
6 import com.topdraw.business.module.user.app.service.UserAppBindService; 6 import com.topdraw.business.module.user.app.service.UserAppBindService;
7 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO; 7 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO;
......
1 package com.topdraw.business.module.user.app.service.impl; 1 package com.topdraw.business.module.user.app.service.impl;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.base.modules.utils.ValidationUtil;
4 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.domain.MemberBuilder; 7 import com.topdraw.business.module.member.domain.MemberBuilder;
6 import com.topdraw.business.module.member.domain.MemberTypeConstant; 8 import com.topdraw.business.module.member.domain.MemberTypeConstant;
...@@ -22,16 +24,14 @@ import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService; ...@@ -22,16 +24,14 @@ import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService;
22 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; 24 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
23 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 25 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
24 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 26 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
25 import com.topdraw.common.ResultInfo;
26 import com.topdraw.util.Base64Util; 27 import com.topdraw.util.Base64Util;
27 import com.topdraw.util.TimestampUtil; 28 import com.topdraw.util.TimestampUtil;
28 import com.topdraw.utils.StringUtils;
29 import com.topdraw.utils.ValidationUtil;
30 import com.topdraw.business.module.user.app.repository.UserAppRepository; 29 import com.topdraw.business.module.user.app.repository.UserAppRepository;
31 import com.topdraw.business.module.user.app.service.UserAppService; 30 import com.topdraw.business.module.user.app.service.UserAppService;
32 import com.topdraw.business.module.user.app.service.dto.UserAppDTO; 31 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
33 import com.topdraw.business.module.user.app.service.mapper.UserAppMapper; 32 import com.topdraw.business.module.user.app.service.mapper.UserAppMapper;
34 import lombok.extern.slf4j.Slf4j; 33 import lombok.extern.slf4j.Slf4j;
34 import org.apache.commons.lang3.StringUtils;
35 import org.springframework.aop.framework.AopContext; 35 import org.springframework.aop.framework.AopContext;
36 import org.springframework.beans.BeanUtils; 36 import org.springframework.beans.BeanUtils;
37 import org.springframework.beans.factory.annotation.Autowired; 37 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.module.user.app.service.mapper; 1 package com.topdraw.business.module.user.app.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.app.domain.UserAppBind; 4 import com.topdraw.business.module.user.app.domain.UserAppBind;
5 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO; 5 import com.topdraw.business.module.user.app.service.dto.UserAppBindDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.app.service.mapper; 1 package com.topdraw.business.module.user.app.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.app.domain.UserApp; 4 import com.topdraw.business.module.user.app.domain.UserApp;
5 import com.topdraw.business.module.user.app.service.dto.UserAppDTO; 5 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.app.service.mapper; 1 package com.topdraw.business.module.user.app.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.app.domain.UserApp;
5 import com.topdraw.business.module.user.app.domain.UserAppSimple; 4 import com.topdraw.business.module.user.app.domain.UserAppSimple;
6 import com.topdraw.business.module.user.app.service.dto.UserAppDTO;
7 import com.topdraw.business.module.user.app.service.dto.UserAppSimpleDTO; 5 import com.topdraw.business.module.user.app.service.dto.UserAppSimpleDTO;
8 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
9 import org.mapstruct.ReportingPolicy; 7 import org.mapstruct.ReportingPolicy;
......
1 package com.topdraw.business.module.user.iptv.domain; 1 package com.topdraw.business.module.user.iptv.domain;
2 2
3 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.exception.BadRequestException;
5 import com.topdraw.exception.GlobeExceptionMsg; 3 import com.topdraw.exception.GlobeExceptionMsg;
6 import com.topdraw.util.TimestampUtil; 4 import com.topdraw.util.TimestampUtil;
7 import org.apache.commons.lang3.StringUtils; 5 import org.apache.commons.lang3.StringUtils;
......
1 package com.topdraw.business.module.user.iptv.growreport.rest; 1 package com.topdraw.business.module.user.iptv.growreport.rest;
2 2
3 import com.topdraw.aop.log.Log;
4 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
5 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport; 4 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
6 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService; 5 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService;
7 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.data.domain.Pageable;
9 import org.springframework.validation.annotation.Validated; 7 import org.springframework.validation.annotation.Validated;
10 import org.springframework.web.bind.annotation.*; 8 import org.springframework.web.bind.annotation.*;
11 import io.swagger.annotations.*; 9 import io.swagger.annotations.*;
...@@ -22,7 +20,6 @@ public class GrowthReportController { ...@@ -22,7 +20,6 @@ public class GrowthReportController {
22 @Autowired 20 @Autowired
23 private GrowthReportService GrowthReportService; 21 private GrowthReportService GrowthReportService;
24 22
25 @Log
26 @PostMapping 23 @PostMapping
27 @ApiOperation("新增GrowthReport") 24 @ApiOperation("新增GrowthReport")
28 public ResultInfo create(@Validated @RequestBody GrowthReport resources) { 25 public ResultInfo create(@Validated @RequestBody GrowthReport resources) {
...@@ -30,7 +27,6 @@ public class GrowthReportController { ...@@ -30,7 +27,6 @@ public class GrowthReportController {
30 return ResultInfo.success(); 27 return ResultInfo.success();
31 } 28 }
32 29
33 @Log
34 @PutMapping 30 @PutMapping
35 @ApiOperation("修改GrowthReport") 31 @ApiOperation("修改GrowthReport")
36 public ResultInfo update(@Validated @RequestBody GrowthReport resources) { 32 public ResultInfo update(@Validated @RequestBody GrowthReport resources) {
...@@ -39,7 +35,6 @@ public class GrowthReportController { ...@@ -39,7 +35,6 @@ public class GrowthReportController {
39 } 35 }
40 36
41 37
42 @Log
43 @DeleteMapping(value = "/{id}") 38 @DeleteMapping(value = "/{id}")
44 @ApiOperation("删除GrowthReport") 39 @ApiOperation("删除GrowthReport")
45 public ResultInfo delete(@PathVariable Long id) { 40 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.user.iptv.growreport.service.impl; 1 package com.topdraw.business.module.user.iptv.growreport.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport; 4 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
4 import com.topdraw.utils.ValidationUtil;
5 import com.topdraw.business.module.user.iptv.growreport.repository.GrowthReportRepository; 5 import com.topdraw.business.module.user.iptv.growreport.repository.GrowthReportRepository;
6 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService; 6 import com.topdraw.business.module.user.iptv.growreport.service.GrowthReportService;
7 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO; 7 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO;
...@@ -13,14 +13,8 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -13,14 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
13 import org.springframework.dao.EmptyResultDataAccessException; 13 import org.springframework.dao.EmptyResultDataAccessException;
14 import cn.hutool.core.lang.Snowflake; 14 import cn.hutool.core.lang.Snowflake;
15 import cn.hutool.core.util.IdUtil; 15 import cn.hutool.core.util.IdUtil;
16 import org.springframework.data.domain.Page;
17 import org.springframework.data.domain.Pageable;
18 import org.springframework.util.Assert; 16 import org.springframework.util.Assert;
19 import com.topdraw.utils.PageUtil;
20 import com.topdraw.utils.QueryHelp;
21 17
22 import java.util.List;
23 import java.util.Map;
24 18
25 /** 19 /**
26 * @author XiangHan 20 * @author XiangHan
......
1 package com.topdraw.business.module.user.iptv.growreport.service.mapper; 1 package com.topdraw.business.module.user.iptv.growreport.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport; 4 import com.topdraw.business.module.user.iptv.growreport.domain.GrowthReport;
5 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO; 5 import com.topdraw.business.module.user.iptv.growreport.service.dto.GrowthReportDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.iptv.rest; 1 package com.topdraw.business.module.user.iptv.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.business.module.user.iptv.domain.UserTv; 6 import com.topdraw.business.module.user.iptv.domain.UserTv;
5 import com.topdraw.business.module.user.iptv.service.UserTvService; 7 import com.topdraw.business.module.user.iptv.service.UserTvService;
6 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO; 8 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
7 import com.topdraw.common.ResultInfo;
8 import com.topdraw.exception.BadRequestException;
9 import com.topdraw.exception.GlobeExceptionMsg; 9 import com.topdraw.exception.GlobeExceptionMsg;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
11 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
......
...@@ -3,6 +3,9 @@ package com.topdraw.business.module.user.iptv.service.impl; ...@@ -3,6 +3,9 @@ package com.topdraw.business.module.user.iptv.service.impl;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.aspect.AsyncMqSend; 5 import com.topdraw.aspect.AsyncMqSend;
6 import com.topdraw.base.modules.exception.EntityNotFoundException;
7 import com.topdraw.base.modules.utils.RedisUtils;
8 import com.topdraw.base.modules.utils.ValidationUtil;
6 import com.topdraw.business.module.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.business.module.user.iptv.domain.UserTv; 11 import com.topdraw.business.module.user.iptv.domain.UserTv;
...@@ -11,10 +14,7 @@ import com.topdraw.business.module.user.iptv.repository.UserTvSimpleRepository; ...@@ -11,10 +14,7 @@ import com.topdraw.business.module.user.iptv.repository.UserTvSimpleRepository;
11 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO; 14 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO;
12 import com.topdraw.business.module.user.iptv.service.mapper.UserTvSimpleMapper; 15 import com.topdraw.business.module.user.iptv.service.mapper.UserTvSimpleMapper;
13 import com.topdraw.business.RedisKeyConstants; 16 import com.topdraw.business.RedisKeyConstants;
14 import com.topdraw.exception.EntityNotFoundException;
15 import com.topdraw.exception.GlobeExceptionMsg; 17 import com.topdraw.exception.GlobeExceptionMsg;
16 import com.topdraw.utils.RedisUtils;
17 import com.topdraw.utils.ValidationUtil;
18 import com.topdraw.business.module.user.iptv.repository.UserTvRepository; 18 import com.topdraw.business.module.user.iptv.repository.UserTvRepository;
19 import com.topdraw.business.module.user.iptv.service.UserTvService; 19 import com.topdraw.business.module.user.iptv.service.UserTvService;
20 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO; 20 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
......
1 package com.topdraw.business.module.user.iptv.service.mapper; 1 package com.topdraw.business.module.user.iptv.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.iptv.domain.UserTv; 4 import com.topdraw.business.module.user.iptv.domain.UserTv;
5 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO; 5 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.iptv.service.mapper; 1 package com.topdraw.business.module.user.iptv.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.iptv.domain.UserTv;
5 import com.topdraw.business.module.user.iptv.domain.UserTvSimple; 4 import com.topdraw.business.module.user.iptv.domain.UserTvSimple;
6 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO; 5 import com.topdraw.business.module.user.iptv.service.dto.UserTvSimpleDTO;
7 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.weixin.collection.service.impl; 1 package com.topdraw.business.module.user.weixin.collection.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail; 4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
4 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionDetailRepository; 5 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionDetailRepository;
5 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionDetailService; 6 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionDetailService;
6 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO; 7 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO;
7 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionDetailMapper; 8 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionDetailMapper;
8 import com.topdraw.utils.*;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.dao.EmptyResultDataAccessException; 10 import org.springframework.dao.EmptyResultDataAccessException;
11 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
......
1 package com.topdraw.business.module.user.weixin.collection.service.impl; 1 package com.topdraw.business.module.user.weixin.collection.service.impl;
2 2
3 import com.topdraw.base.modules.utils.FileUtil;
4 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection; 5 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection;
4 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionRepository; 6 import com.topdraw.business.module.user.weixin.collection.repository.UserCollectionRepository;
5 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionService; 7 import com.topdraw.business.module.user.weixin.collection.service.UserCollectionService;
6 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO; 8 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO;
7 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionMapper; 9 import com.topdraw.business.module.user.weixin.collection.service.mapper.UserCollectionMapper;
8 import com.topdraw.utils.FileUtil;
9 import com.topdraw.utils.ValidationUtil;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.dao.EmptyResultDataAccessException; 11 import org.springframework.dao.EmptyResultDataAccessException;
12 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
......
1 package com.topdraw.business.module.user.weixin.collection.service.mapper; 1 package com.topdraw.business.module.user.weixin.collection.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail; 4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
5 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO; 5 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDetailDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.weixin.collection.service.mapper; 1 package com.topdraw.business.module.user.weixin.collection.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection; 4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollection;
5 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO; 5 import com.topdraw.business.module.user.weixin.collection.service.dto.UserCollectionDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.weixin.domain; 1 package com.topdraw.business.module.user.weixin.domain;
2 2
3 import com.topdraw.base.modules.exception.BadRequestException;
3 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.exception.BadRequestException;
5 import com.topdraw.exception.GlobeExceptionMsg; 5 import com.topdraw.exception.GlobeExceptionMsg;
6 import com.topdraw.util.TimestampUtil;
7 import org.apache.commons.lang3.StringUtils; 6 import org.apache.commons.lang3.StringUtils;
8 7
9 import java.sql.Timestamp; 8 import java.sql.Timestamp;
......
1 package com.topdraw.business.module.user.weixin.rest; 1 package com.topdraw.business.module.user.weixin.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.common.ResultInfo; 4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 5 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
6 import com.topdraw.business.module.user.weixin.service.UserWeixinService; 6 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.module.user.weixin.service.dto; 1 package com.topdraw.business.module.user.weixin.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.base.modules.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
......
1 package com.topdraw.business.module.user.weixin.service.impl; 1 package com.topdraw.business.module.user.weixin.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 4 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
4 import com.topdraw.business.module.user.weixin.domain.UserWeixinBuilder; 5 import com.topdraw.business.module.user.weixin.domain.UserWeixinBuilder;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.user.weixin.repository.UserWeixinRepository; 6 import com.topdraw.business.module.user.weixin.repository.UserWeixinRepository;
7 import com.topdraw.business.module.user.weixin.service.UserWeixinService; 7 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
8 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO; 8 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
......
1 package com.topdraw.business.module.user.weixin.service.mapper; 1 package com.topdraw.business.module.user.weixin.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 4 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
5 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO; 5 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.weixin.subscribe.service.mapper; 1 package com.topdraw.business.module.user.weixin.subscribe.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.subscribe.domain.WechatSubscribeRecord; 4 import com.topdraw.business.module.user.weixin.subscribe.domain.WechatSubscribeRecord;
5 import com.topdraw.business.module.user.weixin.subscribe.service.dto.WechatSubscribeRecordDTO; 5 import com.topdraw.business.module.user.weixin.subscribe.service.dto.WechatSubscribeRecordDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.user.weixin.wechatshare.rest; 1 package com.topdraw.business.module.user.weixin.wechatshare.rest;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.common.ResultInfo; 4 import com.topdraw.common.ResultInfo;
6 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord; 5 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
7 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService; 6 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService;
...@@ -24,7 +23,6 @@ public class WechatShareRecordController { ...@@ -24,7 +23,6 @@ public class WechatShareRecordController {
24 @Autowired 23 @Autowired
25 private WechatShareRecordService wechatShareRecordService; 24 private WechatShareRecordService wechatShareRecordService;
26 25
27 @Log
28 @PostMapping(value = "/create") 26 @PostMapping(value = "/create")
29 @ApiOperation("新增WechatShareRecord") 27 @ApiOperation("新增WechatShareRecord")
30 public ResultInfo create(@Validated @RequestBody WechatShareRecord resources) { 28 public ResultInfo create(@Validated @RequestBody WechatShareRecord resources) {
...@@ -32,7 +30,6 @@ public class WechatShareRecordController { ...@@ -32,7 +30,6 @@ public class WechatShareRecordController {
32 return ResultInfo.success(); 30 return ResultInfo.success();
33 } 31 }
34 32
35 @Log
36 @PostMapping(value = "/update") 33 @PostMapping(value = "/update")
37 @ApiOperation("修改WechatShareRecord") 34 @ApiOperation("修改WechatShareRecord")
38 public ResultInfo update(@Validated @RequestBody WechatShareRecord resources) { 35 public ResultInfo update(@Validated @RequestBody WechatShareRecord resources) {
...@@ -40,7 +37,6 @@ public class WechatShareRecordController { ...@@ -40,7 +37,6 @@ public class WechatShareRecordController {
40 return ResultInfo.success(); 37 return ResultInfo.success();
41 } 38 }
42 39
43 @Log
44 @PostMapping(value = "/createOrUpdate") 40 @PostMapping(value = "/createOrUpdate")
45 @ApiOperation("修改WechatShareRecord") 41 @ApiOperation("修改WechatShareRecord")
46 public ResultInfo createOrUpdate(@Validated @RequestBody String content) { 42 public ResultInfo createOrUpdate(@Validated @RequestBody String content) {
......
1 package com.topdraw.business.module.user.weixin.wechatshare.service.impl; 1 package com.topdraw.business.module.user.weixin.wechatshare.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord; 4 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
4 import com.topdraw.util.IdWorker; 5 import com.topdraw.util.IdWorker;
5 import com.topdraw.utils.ValidationUtil;
6 import com.topdraw.business.module.user.weixin.wechatshare.repository.WechatShareRecordRepository; 6 import com.topdraw.business.module.user.weixin.wechatshare.repository.WechatShareRecordRepository;
7 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService; 7 import com.topdraw.business.module.user.weixin.wechatshare.service.WechatShareRecordService;
8 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO; 8 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO;
9 import com.topdraw.business.module.user.weixin.wechatshare.service.mapper.WechatShareRecordMapper; 9 import com.topdraw.business.module.user.weixin.wechatshare.service.mapper.WechatShareRecordMapper;
10 import org.apache.commons.lang3.StringUtils;
10 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
12 import org.springframework.transaction.annotation.Propagation; 13 import org.springframework.transaction.annotation.Propagation;
13 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
14 import com.topdraw.utils.StringUtils;
15 15
16 import java.util.*; 16 import java.util.*;
17 17
......
1 package com.topdraw.business.module.user.weixin.wechatshare.service.mapper; 1 package com.topdraw.business.module.user.weixin.wechatshare.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord; 4 import com.topdraw.business.module.user.weixin.wechatshare.domain.WechatShareRecord;
5 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO; 5 import com.topdraw.business.module.user.weixin.wechatshare.service.dto.WechatShareRecordDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.vis.hainan.app.service.impl; 1 package com.topdraw.business.module.vis.hainan.app.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.vis.hainan.app.domain.VisUser; 4 import com.topdraw.business.module.vis.hainan.app.domain.VisUser;
4 import com.topdraw.business.module.vis.hainan.app.repository.VisUserRepository; 5 import com.topdraw.business.module.vis.hainan.app.repository.VisUserRepository;
5 import com.topdraw.business.module.vis.hainan.app.service.VisUserService; 6 import com.topdraw.business.module.vis.hainan.app.service.VisUserService;
6 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO; 7 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO;
7 import com.topdraw.business.module.vis.hainan.app.service.mapper.VisUserMapper; 8 import com.topdraw.business.module.vis.hainan.app.service.mapper.VisUserMapper;
8 import com.topdraw.utils.ValidationUtil;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.vis.hainan.app.service.mapper; 1 package com.topdraw.business.module.vis.hainan.app.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.vis.hainan.app.domain.VisUser; 4 import com.topdraw.business.module.vis.hainan.app.domain.VisUser;
5 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO; 5 import com.topdraw.business.module.vis.hainan.app.service.dto.VisUserDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.vis.hainan.apple.service.impl; 1 package com.topdraw.business.module.vis.hainan.apple.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple; 4 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
4 import com.topdraw.business.module.vis.hainan.apple.repository.VisUserAppleRepository; 5 import com.topdraw.business.module.vis.hainan.apple.repository.VisUserAppleRepository;
5 import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService; 6 import com.topdraw.business.module.vis.hainan.apple.service.VisUserAppleService;
6 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO; 7 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO;
7 import com.topdraw.business.module.vis.hainan.apple.service.mapper.VisUserAppleMapper; 8 import com.topdraw.business.module.vis.hainan.apple.service.mapper.VisUserAppleMapper;
8 import com.topdraw.utils.ValidationUtil;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.vis.hainan.apple.service.mapper; 1 package com.topdraw.business.module.vis.hainan.apple.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple; 4 import com.topdraw.business.module.vis.hainan.apple.domain.VisUserApple;
5 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO; 5 import com.topdraw.business.module.vis.hainan.apple.service.dto.VisUserAppleDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.vis.hainan.qq.service.impl; 1 package com.topdraw.business.module.vis.hainan.qq.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; 4 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
4 import com.topdraw.business.module.vis.hainan.qq.repository.VisUserQqRepository; 5 import com.topdraw.business.module.vis.hainan.qq.repository.VisUserQqRepository;
5 import com.topdraw.business.module.vis.hainan.qq.service.VisUserQqService; 6 import com.topdraw.business.module.vis.hainan.qq.service.VisUserQqService;
6 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO; 7 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO;
7 import com.topdraw.business.module.vis.hainan.qq.service.mapper.VisUserQqMapper; 8 import com.topdraw.business.module.vis.hainan.qq.service.mapper.VisUserQqMapper;
8 import com.topdraw.utils.ValidationUtil;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.vis.hainan.qq.service.mapper; 1 package com.topdraw.business.module.vis.hainan.qq.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq; 4 import com.topdraw.business.module.vis.hainan.qq.domain.VisUserQq;
5 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO; 5 import com.topdraw.business.module.vis.hainan.qq.service.dto.VisUserQqDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.vis.hainan.weibo.service.impl; 1 package com.topdraw.business.module.vis.hainan.weibo.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 4 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
4 import com.topdraw.business.module.vis.hainan.weibo.repository.VisUserWeiboRepository; 5 import com.topdraw.business.module.vis.hainan.weibo.repository.VisUserWeiboRepository;
5 import com.topdraw.business.module.vis.hainan.weibo.service.VisUserWeiboService; 6 import com.topdraw.business.module.vis.hainan.weibo.service.VisUserWeiboService;
6 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO; 7 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO;
7 import com.topdraw.business.module.vis.hainan.weibo.service.mapper.VisUserWeiboMapper; 8 import com.topdraw.business.module.vis.hainan.weibo.service.mapper.VisUserWeiboMapper;
8 import com.topdraw.utils.ValidationUtil;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.vis.hainan.weibo.service.mapper; 1 package com.topdraw.business.module.vis.hainan.weibo.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo; 4 import com.topdraw.business.module.vis.hainan.weibo.domain.VisUserWeibo;
5 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO; 5 import com.topdraw.business.module.vis.hainan.weibo.service.dto.VisUserWeiboDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.business.module.vis.hainan.weixin.service.impl; 1 package com.topdraw.business.module.vis.hainan.weixin.service.impl;
2 2
3 import com.topdraw.base.modules.utils.ValidationUtil;
3 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 4 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
4 import com.topdraw.business.module.vis.hainan.weixin.repository.VisUserWeixinRepository; 5 import com.topdraw.business.module.vis.hainan.weixin.repository.VisUserWeixinRepository;
5 import com.topdraw.business.module.vis.hainan.weixin.service.VisUserWeixinService; 6 import com.topdraw.business.module.vis.hainan.weixin.service.VisUserWeixinService;
6 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO; 7 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO;
7 import com.topdraw.business.module.vis.hainan.weixin.service.mapper.VisUserWeixinMapper; 8 import com.topdraw.business.module.vis.hainan.weixin.service.mapper.VisUserWeixinMapper;
8 import com.topdraw.utils.ValidationUtil;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
......
1 package com.topdraw.business.module.vis.hainan.weixin.service.mapper; 1 package com.topdraw.business.module.vis.hainan.weixin.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin; 4 import com.topdraw.business.module.vis.hainan.weixin.domain.VisUserWeixin;
5 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO; 5 import com.topdraw.business.module.vis.hainan.weixin.service.dto.VisUserWeixinDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
...@@ -2,7 +2,7 @@ package com.topdraw.business.process.domian.weixin; ...@@ -2,7 +2,7 @@ package com.topdraw.business.process.domian.weixin;
2 2
3 3
4 import com.alibaba.fastjson.annotation.JSONField; 4 import com.alibaba.fastjson.annotation.JSONField;
5 import com.topdraw.annotation.Query; 5 import com.topdraw.base.modules.annotation.Query;
6 import lombok.Data; 6 import lombok.Data;
7 7
8 import java.sql.Timestamp; 8 import java.sql.Timestamp;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.process.domian.TempCoupon; 4 import com.topdraw.business.process.domian.TempCoupon;
4 import com.topdraw.business.process.service.CouponOperationService; 5 import com.topdraw.business.process.service.CouponOperationService;
5 import com.topdraw.common.ResultInfo;
6 import io.swagger.annotations.Api; 6 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 7 import io.swagger.annotations.ApiOperation;
8 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.process.domian.TempExp; 4 import com.topdraw.business.process.domian.TempExp;
4 import com.topdraw.business.process.service.ExpOperationService; 5 import com.topdraw.business.process.service.ExpOperationService;
5 import com.topdraw.common.ResultInfo;
6 import io.swagger.annotations.Api; 6 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 7 import io.swagger.annotations.ApiOperation;
8 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
...@@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -13,9 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
13 import org.springframework.web.bind.annotation.RequestMapping; 13 import org.springframework.web.bind.annotation.RequestMapping;
14 import org.springframework.web.bind.annotation.RestController; 14 import org.springframework.web.bind.annotation.RestController;
15 15
16 import java.util.Arrays;
17 import java.util.Collections; 16 import java.util.Collections;
18 import java.util.List;
19 import java.util.Objects; 17 import java.util.Objects;
20 18
21 /** 19 /**
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.IResultInfo;
5 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
5 import com.topdraw.business.module.member.address.domain.MemberAddress; 7 import com.topdraw.business.module.member.address.domain.MemberAddress;
6 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; 8 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
...@@ -8,8 +10,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; ...@@ -8,8 +10,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
8 import com.topdraw.business.module.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
9 import com.topdraw.business.process.domian.member.MemberOperationBean; 11 import com.topdraw.business.process.domian.member.MemberOperationBean;
10 import com.topdraw.business.process.service.member.MemberOperationService; 12 import com.topdraw.business.process.service.member.MemberOperationService;
11 import com.topdraw.common.IResultInfo;
12 import com.topdraw.common.ResultInfo;
13 import io.swagger.annotations.Api; 13 import io.swagger.annotations.Api;
14 import io.swagger.annotations.ApiOperation; 14 import io.swagger.annotations.ApiOperation;
15 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.business.module.member.service.MemberService; 6 import com.topdraw.business.module.member.service.MemberService;
5 import com.topdraw.business.module.member.service.dto.MemberDTO; 7 import com.topdraw.business.module.member.service.dto.MemberDTO;
6 import com.topdraw.business.module.user.iptv.service.UserTvService; 8 import com.topdraw.business.module.user.iptv.service.UserTvService;
...@@ -11,9 +13,7 @@ import com.topdraw.business.process.domian.TempCustomPointBean; ...@@ -11,9 +13,7 @@ import com.topdraw.business.process.domian.TempCustomPointBean;
11 import com.topdraw.business.process.domian.TempPoints; 13 import com.topdraw.business.process.domian.TempPoints;
12 import com.topdraw.business.process.service.dto.CustomPointsResult; 14 import com.topdraw.business.process.service.dto.CustomPointsResult;
13 import com.topdraw.business.process.service.PointsOperationService; 15 import com.topdraw.business.process.service.PointsOperationService;
14 import com.topdraw.common.ResultInfo;
15 import com.topdraw.business.LocalConstants; 16 import com.topdraw.business.LocalConstants;
16 import com.topdraw.exception.BadRequestException;
17 import com.topdraw.exception.GlobeExceptionMsg; 17 import com.topdraw.exception.GlobeExceptionMsg;
18 import io.swagger.annotations.Api; 18 import io.swagger.annotations.Api;
19 import io.swagger.annotations.ApiOperation; 19 import io.swagger.annotations.ApiOperation;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.module.rights.history.domain.RightsHistory; 4 import com.topdraw.business.module.rights.history.domain.RightsHistory;
4 import com.topdraw.business.process.service.RightsOperationService; 5 import com.topdraw.business.process.service.RightsOperationService;
5 import com.topdraw.common.ResultInfo;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.validation.annotation.Validated; 7 import org.springframework.validation.annotation.Validated;
8 import org.springframework.web.bind.annotation.*; 8 import org.springframework.web.bind.annotation.*;
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.base.modules.common.IResultInfo;
5 import com.topdraw.base.modules.common.ResultInfo;
6 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.business.module.common.validated.CreateGroup; 7 import com.topdraw.business.module.common.validated.CreateGroup;
5 import com.topdraw.business.module.task.domain.Task; 8 import com.topdraw.business.module.task.domain.Task;
6 import com.topdraw.business.module.task.service.dto.TaskDTO; 9 import com.topdraw.business.module.task.service.dto.TaskDTO;
7 import com.topdraw.business.process.domian.TempIptvUser; 10 import com.topdraw.business.process.domian.TempIptvUser;
8 import com.topdraw.business.process.service.TaskOperationService; 11 import com.topdraw.business.process.service.TaskOperationService;
9 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria; 12 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
10 import com.topdraw.common.IResultInfo;
11 import com.topdraw.common.ResultInfo;
12 import com.topdraw.exception.BadRequestException;
13 import io.swagger.annotations.Api; 13 import io.swagger.annotations.Api;
14 import io.swagger.annotations.ApiOperation; 14 import io.swagger.annotations.ApiOperation;
15 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
16 import org.springframework.beans.BeanUtils;
17 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
18 import org.springframework.validation.annotation.Validated; 17 import org.springframework.validation.annotation.Validated;
19 import org.springframework.web.bind.annotation.*; 18 import org.springframework.web.bind.annotation.*;
20 19
21 import java.util.Arrays; 20 import java.util.Arrays;
22 import java.util.Objects; 21 import java.util.Objects;
23 //byte[] b = Base64Utils.decodeFromString(baseStrs[1]);
24 22
25 @Api("任务处理") 23 @Api("任务处理")
26 @RestController 24 @RestController
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.business.module.task.template.domain.TaskTemplate; 4 import com.topdraw.business.module.task.template.domain.TaskTemplate;
5 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
6 import com.topdraw.business.process.service.TaskTemplateOperationService; 5 import com.topdraw.business.process.service.TaskTemplateOperationService;
7 import io.swagger.annotations.Api; 6 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiOperation; 7 import io.swagger.annotations.ApiOperation;
......
...@@ -4,7 +4,11 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -4,7 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
4 4
5 import com.alibaba.fastjson.JSON; 5 import com.alibaba.fastjson.JSON;
6 import com.alibaba.fastjson.JSONObject; 6 import com.alibaba.fastjson.JSONObject;
7 import com.topdraw.annotation.AnonymousAccess; 7 import com.topdraw.base.modules.annotation.AnonymousAccess;
8 import com.topdraw.base.modules.common.ResultInfo;
9 import com.topdraw.base.modules.exception.BadRequestException;
10 import com.topdraw.base.modules.exception.EntityNotFoundException;
11 import com.topdraw.base.modules.utils.RedisUtils;
8 import com.topdraw.business.module.common.validated.CreateGroup; 12 import com.topdraw.business.module.common.validated.CreateGroup;
9 import com.topdraw.business.module.common.validated.UpdateGroup; 13 import com.topdraw.business.module.common.validated.UpdateGroup;
10 import com.topdraw.business.module.member.service.MemberService; 14 import com.topdraw.business.module.member.service.MemberService;
...@@ -24,16 +28,12 @@ import com.topdraw.business.process.domian.member.MemberOperationBean; ...@@ -24,16 +28,12 @@ import com.topdraw.business.process.domian.member.MemberOperationBean;
24 import com.topdraw.business.process.domian.weixin.*; 28 import com.topdraw.business.process.domian.weixin.*;
25 import com.topdraw.business.process.service.UserOperationService; 29 import com.topdraw.business.process.service.UserOperationService;
26 import com.topdraw.business.process.service.member.MemberOperationService; 30 import com.topdraw.business.process.service.member.MemberOperationService;
27 import com.topdraw.common.ResultInfo;
28 import com.topdraw.util.RedisKeyUtil; 31 import com.topdraw.util.RedisKeyUtil;
29 import com.topdraw.config.WechatConfig; 32 import com.topdraw.config.WechatConfig;
30 import com.topdraw.exception.BadRequestException;
31 import com.topdraw.exception.EntityNotFoundException;
32 import com.topdraw.exception.GlobeExceptionMsg; 33 import com.topdraw.exception.GlobeExceptionMsg;
33 import com.topdraw.resttemplate.RestTemplateClient; 34 import com.topdraw.resttemplate.RestTemplateClient;
34 import com.topdraw.util.Base64Util; 35 import com.topdraw.util.Base64Util;
35 import com.topdraw.util.JSONUtil; 36 import com.topdraw.util.JSONUtil;
36 import com.topdraw.utils.RedisUtils;
37 import com.topdraw.weixin.service.WeChatConstants; 37 import com.topdraw.weixin.service.WeChatConstants;
38 import io.swagger.annotations.Api; 38 import io.swagger.annotations.Api;
39 import io.swagger.annotations.ApiOperation; 39 import io.swagger.annotations.ApiOperation;
...@@ -463,7 +463,7 @@ public class UserOperationController { ...@@ -463,7 +463,7 @@ public class UserOperationController {
463 * @throws ConfigurationException 463 * @throws ConfigurationException
464 */ 464 */
465 private Map<String, String> getWeixinInfoByAppid(String appid) throws ConfigurationException { 465 private Map<String, String> getWeixinInfoByAppid(String appid) throws ConfigurationException {
466 if (com.topdraw.utils.StringUtils.isBlank(appid)) { 466 if (StringUtils.isBlank(appid)) {
467 throw new RuntimeException("wxAppid can not be null"); 467 throw new RuntimeException("wxAppid can not be null");
468 } 468 }
469 List<Map<String, String>> list = weixinInfoConfig.getWechatAppList(); 469 List<Map<String, String>> list = weixinInfoConfig.getWechatAppList();
......
1 package com.topdraw.business.process.service; 1 package com.topdraw.business.process.service;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.module.task.domain.Task; 4 import com.topdraw.business.module.task.domain.Task;
4 import com.topdraw.business.module.task.service.dto.TaskDTO; 5 import com.topdraw.business.module.task.service.dto.TaskDTO;
5 import com.topdraw.common.ResultInfo;
6 6
7 /** 7 /**
8 * @description 权益操作接口 8 * @description 权益操作接口
......
1 package com.topdraw.business.process.service; 1 package com.topdraw.business.process.service;
2 2
3 import com.topdraw.base.modules.common.ResultInfo;
3 import com.topdraw.business.module.member.service.dto.MemberDTO; 4 import com.topdraw.business.module.member.service.dto.MemberDTO;
4 import com.topdraw.business.module.user.app.domain.UserApp; 5 import com.topdraw.business.module.user.app.domain.UserApp;
5 import com.topdraw.business.module.user.app.domain.UserAppBind; 6 import com.topdraw.business.module.user.app.domain.UserAppBind;
...@@ -14,7 +15,6 @@ import com.topdraw.business.process.domian.weixin.BindBean; ...@@ -14,7 +15,6 @@ import com.topdraw.business.process.domian.weixin.BindBean;
14 import com.topdraw.business.process.domian.weixin.SubscribeBean; 15 import com.topdraw.business.process.domian.weixin.SubscribeBean;
15 import com.topdraw.business.process.domian.weixin.TvUnBindBean; 16 import com.topdraw.business.process.domian.weixin.TvUnBindBean;
16 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean; 17 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean;
17 import com.topdraw.common.ResultInfo;
18 18
19 19
20 public interface UserOperationService { 20 public interface UserOperationService {
......
1 package com.topdraw.business.process.service.impl; 1 package com.topdraw.business.process.service.impl;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.business.module.coupon.history.domain.CouponHistory; 5 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
5 import com.topdraw.business.module.coupon.history.service.CouponHistoryService; 6 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
6 import com.topdraw.business.module.coupon.service.CouponService; 7 import com.topdraw.business.module.coupon.service.CouponService;
...@@ -13,7 +14,6 @@ import com.topdraw.business.process.domian.TempCoupon; ...@@ -13,7 +14,6 @@ import com.topdraw.business.process.domian.TempCoupon;
13 import com.topdraw.business.process.service.RightsOperationService; 14 import com.topdraw.business.process.service.RightsOperationService;
14 import com.topdraw.business.RedisKeyConstants; 15 import com.topdraw.business.RedisKeyConstants;
15 import com.topdraw.util.TimestampUtil; 16 import com.topdraw.util.TimestampUtil;
16 import com.topdraw.utils.RedisUtils;
17 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
18 import org.springframework.aop.framework.AopContext; 18 import org.springframework.aop.framework.AopContext;
19 import org.springframework.beans.BeanUtils; 19 import org.springframework.beans.BeanUtils;
......
1 package com.topdraw.business.process.service.impl; 1 package com.topdraw.business.process.service.impl;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.base.modules.utils.RedisUtils;
4 import com.topdraw.business.module.exp.detail.domain.ExpDetail; 5 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
5 import com.topdraw.business.module.exp.detail.service.ExpDetailService; 6 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
6 import com.topdraw.business.module.member.domain.Member; 7 import com.topdraw.business.module.member.domain.Member;
...@@ -13,9 +14,8 @@ import com.topdraw.business.process.service.member.MemberOperationService; ...@@ -13,9 +14,8 @@ import com.topdraw.business.process.service.member.MemberOperationService;
13 import com.topdraw.business.process.domian.TempExp; 14 import com.topdraw.business.process.domian.TempExp;
14 import com.topdraw.business.RedisKeyConstants; 15 import com.topdraw.business.RedisKeyConstants;
15 import com.topdraw.util.TimestampUtil; 16 import com.topdraw.util.TimestampUtil;
16 import com.topdraw.utils.RedisUtils;
17 import com.topdraw.utils.StringUtils;
18 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
18 import org.apache.commons.lang3.StringUtils;
19 import org.springframework.aop.framework.AopContext; 19 import org.springframework.aop.framework.AopContext;
20 import org.springframework.beans.BeanUtils; 20 import org.springframework.beans.BeanUtils;
21 import org.springframework.beans.factory.annotation.Autowired; 21 import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.impl; ...@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.impl;
2 2
3 3
4 import com.topdraw.aspect.AsyncMqSend; 4 import com.topdraw.aspect.AsyncMqSend;
5 import com.topdraw.base.modules.utils.RedisUtils;
5 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
6 import com.topdraw.business.module.member.service.MemberService; 7 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 8 import com.topdraw.business.module.member.service.dto.MemberDTO;
...@@ -18,9 +19,8 @@ import com.topdraw.business.RedisKeyConstants; ...@@ -18,9 +19,8 @@ import com.topdraw.business.RedisKeyConstants;
18 import com.topdraw.util.DateUtil; 19 import com.topdraw.util.DateUtil;
19 import com.topdraw.util.IdWorker; 20 import com.topdraw.util.IdWorker;
20 import com.topdraw.util.TimestampUtil; 21 import com.topdraw.util.TimestampUtil;
21 import com.topdraw.utils.RedisUtils;
22 import com.topdraw.utils.StringUtils;
23 import lombok.extern.slf4j.Slf4j; 22 import lombok.extern.slf4j.Slf4j;
23 import org.apache.commons.lang3.StringUtils;
24 import org.springframework.aop.framework.AopContext; 24 import org.springframework.aop.framework.AopContext;
25 import org.springframework.beans.BeanUtils; 25 import org.springframework.beans.BeanUtils;
26 import org.springframework.beans.factory.annotation.Autowired; 26 import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -3,6 +3,8 @@ package com.topdraw.business.process.service.impl; ...@@ -3,6 +3,8 @@ package com.topdraw.business.process.service.impl;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.aspect.AsyncMqSend; 5 import com.topdraw.aspect.AsyncMqSend;
6 import com.topdraw.base.modules.common.ResultInfo;
7 import com.topdraw.base.modules.utils.RedisUtils;
6 import com.topdraw.business.module.coupon.service.CouponService; 8 import com.topdraw.business.module.coupon.service.CouponService;
7 import com.topdraw.business.module.coupon.service.dto.CouponDTO; 9 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
8 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO; 10 import com.topdraw.business.module.member.service.dto.MemberSimpleDTO;
...@@ -34,10 +36,8 @@ import com.topdraw.business.LocalConstants; ...@@ -34,10 +36,8 @@ import com.topdraw.business.LocalConstants;
34 import com.topdraw.business.module.rights.constant.RightTypeConstants; 36 import com.topdraw.business.module.rights.constant.RightTypeConstants;
35 import com.topdraw.business.module.task.template.constant.TaskEventType; 37 import com.topdraw.business.module.task.template.constant.TaskEventType;
36 import com.topdraw.business.RedisKeyConstants; 38 import com.topdraw.business.RedisKeyConstants;
37 import com.topdraw.common.ResultInfo;
38 import com.topdraw.mq.module.mq.DataSyncMsg; 39 import com.topdraw.mq.module.mq.DataSyncMsg;
39 import com.topdraw.util.*; 40 import com.topdraw.util.*;
40 import com.topdraw.utils.RedisUtils;
41 import lombok.extern.slf4j.Slf4j; 41 import lombok.extern.slf4j.Slf4j;
42 import org.apache.commons.lang3.StringUtils; 42 import org.apache.commons.lang3.StringUtils;
43 import org.springframework.aop.framework.AopContext; 43 import org.springframework.aop.framework.AopContext;
...@@ -339,7 +339,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -339,7 +339,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
339 List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip()); 339 List<Task> tasks = this.taskService.findByEventAndMemberLevelAndVip(event, memberDTO.getLevel(), memberDTO.getVip());
340 log.info("查询任务列表, dealTask# tasks ==>> [{}]",tasks); 340 log.info("查询任务列表, dealTask# tasks ==>> [{}]",tasks);
341 if (Objects.isNull(tasks) || CollectionUtils.isEmpty(tasks)) { 341 if (Objects.isNull(tasks) || CollectionUtils.isEmpty(tasks)) {
342 return Collections.singletonList(null); 342 return null;
343 } 343 }
344 344
345 // 获取当前会员所有任务的完成进度 345 // 获取当前会员所有任务的完成进度
...@@ -896,6 +896,10 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -896,6 +896,10 @@ public class TaskOperationServiceImpl implements TaskOperationService {
896 Timestamp expireTime = task.getExpireTime(); 896 Timestamp expireTime = task.getExpireTime();
897 // 积分类型(0:定值、1:随机) 897 // 积分类型(0:定值、1:随机)
898 Integer pointsType = task.getPointsType(); 898 Integer pointsType = task.getPointsType();
899 if (Objects.isNull(pointsType)) {
900 log.error("当前任务的积分类型不存在，请检查数据 task ==>> {}", task);
901 return;
902 }
899 // 随机积分的最大值 903 // 随机积分的最大值
900 Integer rewardMaxPoints = task.getRewardMaxPoints(); 904 Integer rewardMaxPoints = task.getRewardMaxPoints();
901 if (Objects.nonNull(rewardPoints) && rewardPoints > 0) { 905 if (Objects.nonNull(rewardPoints) && rewardPoints > 0) {
......
...@@ -6,7 +6,6 @@ import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder; ...@@ -6,7 +6,6 @@ import com.topdraw.business.module.task.template.domain.TaskTemplateBuilder;
6 import com.topdraw.business.module.task.template.service.TaskTemplateService; 6 import com.topdraw.business.module.task.template.service.TaskTemplateService;
7 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO; 7 import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO;
8 import com.topdraw.business.process.service.TaskTemplateOperationService; 8 import com.topdraw.business.process.service.TaskTemplateOperationService;
9 import com.topdraw.utils.StringUtils;
10 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
11 import org.springframework.aop.framework.AopContext; 10 import org.springframework.aop.framework.AopContext;
12 import org.springframework.beans.BeanUtils; 11 import org.springframework.beans.BeanUtils;
......
...@@ -6,6 +6,11 @@ import cn.hutool.core.util.StrUtil; ...@@ -6,6 +6,11 @@ import cn.hutool.core.util.StrUtil;
6 import com.alibaba.fastjson.JSON; 6 import com.alibaba.fastjson.JSON;
7 import com.alibaba.fastjson.JSONObject; 7 import com.alibaba.fastjson.JSONObject;
8 import com.topdraw.aspect.AsyncMqSend; 8 import com.topdraw.aspect.AsyncMqSend;
9 import com.topdraw.base.modules.common.ResultInfo;
10 import com.topdraw.base.modules.exception.BadRequestException;
11 import com.topdraw.base.modules.exception.EntityNotFoundException;
12 import com.topdraw.base.modules.utils.QueryHelp;
13 import com.topdraw.base.modules.utils.RedisUtils;
9 import com.topdraw.business.module.member.domain.Member; 14 import com.topdraw.business.module.member.domain.Member;
10 import com.topdraw.business.module.member.domain.MemberBuilder; 15 import com.topdraw.business.module.member.domain.MemberBuilder;
11 import com.topdraw.business.module.member.domain.MemberTypeConstant; 16 import com.topdraw.business.module.member.domain.MemberTypeConstant;
...@@ -48,15 +53,10 @@ import com.topdraw.business.process.service.dto.MemberAndWeixinUserDTO; ...@@ -48,15 +53,10 @@ import com.topdraw.business.process.service.dto.MemberAndWeixinUserDTO;
48 import com.topdraw.business.process.service.mapper.CollectionMq2DetailMapper; 53 import com.topdraw.business.process.service.mapper.CollectionMq2DetailMapper;
49 import com.topdraw.business.LocalConstants; 54 import com.topdraw.business.LocalConstants;
50 import com.topdraw.business.RedisKeyConstants; 55 import com.topdraw.business.RedisKeyConstants;
51 import com.topdraw.common.ResultInfo;
52 import com.topdraw.util.RedisKeyUtil; 56 import com.topdraw.util.RedisKeyUtil;
53 import com.topdraw.exception.BadRequestException;
54 import com.topdraw.exception.EntityNotFoundException;
55 import com.topdraw.exception.GlobeExceptionMsg; 57 import com.topdraw.exception.GlobeExceptionMsg;
56 import com.topdraw.resttemplate.RestTemplateClient; 58 import com.topdraw.resttemplate.RestTemplateClient;
57 import com.topdraw.util.TimestampUtil; 59 import com.topdraw.util.TimestampUtil;
58 import com.topdraw.utils.QueryHelp;
59 import com.topdraw.utils.RedisUtils;
60 import lombok.extern.slf4j.Slf4j; 60 import lombok.extern.slf4j.Slf4j;
61 import org.apache.commons.lang3.StringUtils; 61 import org.apache.commons.lang3.StringUtils;
62 import org.springframework.aop.framework.AopContext; 62 import org.springframework.aop.framework.AopContext;
...@@ -1462,6 +1462,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -1462,6 +1462,7 @@ public class UserOperationServiceImpl implements UserOperationService {
1462 if (UserConstant.platform_dx.contains(platform)) { 1462 if (UserConstant.platform_dx.contains(platform)) {
1463 bindIptvPlatformType = PLATFORM_LIST[1]; 1463 bindIptvPlatformType = PLATFORM_LIST[1];
1464 } 1464 }
1465 member.setId(memberDTO.getId());
1465 member.setUserIptvId(userTvDTO.getId()); 1466 member.setUserIptvId(userTvDTO.getId());
1466 member.setBindIptvTime(TimestampUtil.now()); 1467 member.setBindIptvTime(TimestampUtil.now());
1467 member.setBindIptvPlatformType(bindIptvPlatformType); 1468 member.setBindIptvPlatformType(bindIptvPlatformType);
......
1 package com.topdraw.business.process.service.impl.member; 1 package com.topdraw.business.process.service.impl.member;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.base.modules.exception.BadRequestException;
4 import com.topdraw.business.module.member.address.domain.MemberAddress; 5 import com.topdraw.business.module.member.address.domain.MemberAddress;
5 import com.topdraw.business.module.member.address.service.MemberAddressService; 6 import com.topdraw.business.module.member.address.service.MemberAddressService;
6 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO; 7 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
...@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; ...@@ -8,7 +9,6 @@ import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
8 import com.topdraw.business.module.member.service.MemberService; 9 import com.topdraw.business.module.member.service.MemberService;
9 import com.topdraw.business.module.member.service.dto.MemberDTO; 10 import com.topdraw.business.module.member.service.dto.MemberDTO;
10 import com.topdraw.business.process.service.member.MemberAddressOperationService; 11 import com.topdraw.business.process.service.member.MemberAddressOperationService;
11 import com.topdraw.exception.BadRequestException;
12 import com.topdraw.exception.GlobeExceptionMsg; 12 import com.topdraw.exception.GlobeExceptionMsg;
13 import lombok.extern.slf4j.Slf4j; 13 import lombok.extern.slf4j.Slf4j;
14 import org.springframework.aop.framework.AopContext; 14 import org.springframework.aop.framework.AopContext;
......
1 package com.topdraw.business.process.service.impl.member; 1 package com.topdraw.business.process.service.impl.member;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.base.modules.exception.EntityExistException;
5 import com.topdraw.base.modules.exception.EntityNotFoundException;
4 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.profile.domain.MemberProfile; 7 import com.topdraw.business.module.member.profile.domain.MemberProfile;
6 import com.topdraw.business.module.member.profile.service.MemberProfileService; 8 import com.topdraw.business.module.member.profile.service.MemberProfileService;
...@@ -9,8 +11,6 @@ import com.topdraw.business.module.member.service.MemberService; ...@@ -9,8 +11,6 @@ import com.topdraw.business.module.member.service.MemberService;
9 import com.topdraw.business.module.member.service.dto.MemberDTO; 11 import com.topdraw.business.module.member.service.dto.MemberDTO;
10 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO; 12 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO;
11 import com.topdraw.business.process.service.member.MemberProfileOperationService; 13 import com.topdraw.business.process.service.member.MemberProfileOperationService;
12 import com.topdraw.exception.EntityExistException;
13 import com.topdraw.exception.EntityNotFoundException;
14 import org.springframework.aop.framework.AopContext; 14 import org.springframework.aop.framework.AopContext;
15 import org.springframework.beans.BeanUtils; 15 import org.springframework.beans.BeanUtils;
16 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.business.process.service.mapper; 1 package com.topdraw.business.process.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail; 4 import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail;
5 import com.topdraw.business.process.domian.weixin.UserCollectionMq; 5 import com.topdraw.business.process.domian.weixin.UserCollectionMq;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.util; 1 package com.topdraw.util;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.topdraw.utils.StringUtils;
5 import lombok.extern.slf4j.Slf4j; 4 import lombok.extern.slf4j.Slf4j;
6 import org.bouncycastle.jce.provider.BouncyCastleProvider; 5 import org.bouncycastle.jce.provider.BouncyCastleProvider;
7 6
......
1 package com.topdraw.weixin.rest; 1 package com.topdraw.weixin.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.base.modules.annotation.AnonymousAccess;
4 import com.topdraw.common.ResultInfo; 4 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.weixin.service.UserWeixinWeixinMessageTemplateService; 5 import com.topdraw.weixin.service.UserWeixinWeixinMessageTemplateService;
6 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria; 6 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria;
7 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
......
1 package com.topdraw.weixin.service.dto; 1 package com.topdraw.weixin.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.base.modules.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 /** 6 /**
......
1 package com.topdraw.weixin.service.dto; 1 package com.topdraw.weixin.service.dto;
2 2
3 import com.topdraw.annotation.Query; 3 import com.topdraw.base.modules.annotation.Query;
4 import lombok.Data; 4 import lombok.Data;
5 5
6 import java.util.List; 6 import java.util.List;
......
1 package com.topdraw.weixin.service.impl; 1 package com.topdraw.weixin.service.impl;
2 2
3 3
4 import com.topdraw.utils.QueryHelp; 4 import com.topdraw.base.modules.utils.QueryHelp;
5 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate; 5 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
6 import com.topdraw.weixin.domain.WeixinMessageTemplate; 6 import com.topdraw.weixin.domain.WeixinMessageTemplate;
7 import com.topdraw.weixin.repository.UserWeixinWeixinMessageTemplateRepository; 7 import com.topdraw.weixin.repository.UserWeixinWeixinMessageTemplateRepository;
......
1 package com.topdraw.weixin.service.mapper; 1 package com.topdraw.weixin.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate; 4 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
5 import com.topdraw.weixin.service.dto.UserWeixinWeixinMessageTemplateDTO; 5 import com.topdraw.weixin.service.dto.UserWeixinWeixinMessageTemplateDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.weixin.service.mapper; 1 package com.topdraw.weixin.service.mapper;
2 2
3 import com.topdraw.base.BaseMapper; 3 import com.topdraw.base.modules.base.BaseMapper;
4 import com.topdraw.weixin.domain.WeixinMessageTemplate; 4 import com.topdraw.weixin.domain.WeixinMessageTemplate;
5 import com.topdraw.weixin.service.dto.WeixinMessageTemplateDTO; 5 import com.topdraw.weixin.service.dto.WeixinMessageTemplateDTO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
......
1 package com.topdraw.code; 1 package com.topdraw.code;
2 2
3 import com.topdraw.BaseTest; 3 import com.topdraw.BaseTest;
4 import com.topdraw.domain.GenConfig;
5 import com.topdraw.domain.vo.ColumnInfo;
6 import com.topdraw.MemberServiceApplication; 4 import com.topdraw.MemberServiceApplication;
7 import com.topdraw.service.GeneratorService; 5 import com.topdraw.generator.modules.domain.GenConfig;
6 import com.topdraw.generator.modules.domain.vo.ColumnInfo;
7 import com.topdraw.generator.modules.service.GeneratorService;
8 import lombok.var; 8 import lombok.var;
9 import org.junit.Test; 9 import org.junit.Test;
10 import org.junit.runner.RunWith; 10 import org.junit.runner.RunWith;
......
...@@ -3,7 +3,6 @@ package com.topdraw.test.business.basicdata.member; ...@@ -3,7 +3,6 @@ package com.topdraw.test.business.basicdata.member;
3 import com.topdraw.business.module.member.rest.MemberController; 3 import com.topdraw.business.module.member.rest.MemberController;
4 import com.topdraw.business.module.member.service.MemberService; 4 import com.topdraw.business.module.member.service.MemberService;
5 import com.topdraw.BaseTest; 5 import com.topdraw.BaseTest;
6 import com.topdraw.common.ResultInfo;
7 import org.junit.Test; 6 import org.junit.Test;
8 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
9 8
......
1 package com.topdraw.test.business.basicdata.member.rest; 1 package com.topdraw.test.business.basicdata.member.rest;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.member.address.domain.MemberAddress; 5 import com.topdraw.business.module.member.address.domain.MemberAddress;
5 import com.topdraw.business.module.member.address.rest.MemberAddressController; 6 import com.topdraw.business.module.member.address.rest.MemberAddressController;
6 import com.topdraw.common.ResultInfo;
7 import com.topdraw.BaseTest; 7 import com.topdraw.BaseTest;
8 import org.junit.Test; 8 import org.junit.Test;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.test.business.basicdata.member.rest; 1 package com.topdraw.test.business.basicdata.member.rest;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.rest.MemberController; 6 import com.topdraw.business.module.member.rest.MemberController;
6 import com.topdraw.common.ResultInfo;
7 import com.topdraw.BaseTest; 7 import com.topdraw.BaseTest;
8 import com.topdraw.util.IdWorker; 8 import com.topdraw.util.IdWorker;
9 import com.topdraw.util.TimestampUtil;
10 import org.junit.Test; 9 import org.junit.Test;
11 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
12 11
13 import java.time.LocalDateTime;
14 12
15 public class MemberControllerTest extends BaseTest { 13 public class MemberControllerTest extends BaseTest {
16 14
......
1 package com.topdraw.test.business.basicdata.member.rest; 1 package com.topdraw.test.business.basicdata.member.rest;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.base.modules.common.ResultInfo;
4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 5 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.module.member.relatedinfo.rest.MemberRelatedInfoController; 6 import com.topdraw.business.module.member.relatedinfo.rest.MemberRelatedInfoController;
6 import com.topdraw.common.ResultInfo;
7 import com.topdraw.BaseTest; 7 import com.topdraw.BaseTest;
8 import org.junit.Test; 8 import org.junit.Test;
9 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
10 10
11 import java.time.LocalDate;
12
13 //public class MemberControllerTest { 11 //public class MemberControllerTest {
14 public class MemberRelatedInfoControllerTest extends BaseTest { 12 public class MemberRelatedInfoControllerTest extends BaseTest {
15 13
......
1 package com.topdraw.test.business.process.rest; 1 package com.topdraw.test.business.process.rest;
2 2
3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
6 import com.topdraw.business.process.domian.TempCoupon;
7 import com.topdraw.business.process.rest.CouponOperationController; 5 import com.topdraw.business.process.rest.CouponOperationController;
8 import com.topdraw.common.ResultInfo;
9 import org.junit.Test; 6 import org.junit.Test;
10 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
11 8
12 import java.sql.Timestamp;
13 import java.time.LocalDateTime;
14 import java.util.ArrayList;
15 import java.util.List;
16 import java.util.Map; 9 import java.util.Map;
17 10
18 public class CouponOperationControllerTest extends BaseTest { 11 public class CouponOperationControllerTest extends BaseTest {
......
...@@ -2,20 +2,13 @@ package com.topdraw.test.business.process.rest; ...@@ -2,20 +2,13 @@ package com.topdraw.test.business.process.rest;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.business.process.domian.TempCoupon; 5 import com.topdraw.base.modules.common.ResultInfo;
6 import com.topdraw.business.process.domian.TempExp; 6 import com.topdraw.business.process.domian.TempExp;
7 import com.topdraw.business.process.rest.CouponOperationController;
8 import com.topdraw.business.process.rest.ExpOperationController; 7 import com.topdraw.business.process.rest.ExpOperationController;
9 import com.topdraw.common.ResultInfo;
10 import com.topdraw.util.TimestampUtil; 8 import com.topdraw.util.TimestampUtil;
11 import org.junit.Test; 9 import org.junit.Test;
12 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
13 11
14 import java.sql.Timestamp;
15 import java.time.LocalDateTime;
16 import java.util.ArrayList;
17 import java.util.List;
18
19 public class ExpOperationControllerTest extends BaseTest { 12 public class ExpOperationControllerTest extends BaseTest {
20 13
21 @Autowired 14 @Autowired
......
...@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest; ...@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.business.process.domian.TempPoints; 6 import com.topdraw.business.process.domian.TempPoints;
6 import com.topdraw.business.process.rest.PointsOperationController; 7 import com.topdraw.business.process.rest.PointsOperationController;
7 import com.topdraw.common.ResultInfo;
8 import com.topdraw.util.TimestampUtil; 8 import com.topdraw.util.TimestampUtil;
9 import org.junit.Test; 9 import org.junit.Test;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
......
...@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest; ...@@ -2,9 +2,9 @@ package com.topdraw.test.business.process.rest;
2 2
3 3
4 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.base.modules.common.ResultInfo;
5 import com.topdraw.business.module.rights.history.domain.RightsHistory; 6 import com.topdraw.business.module.rights.history.domain.RightsHistory;
6 import com.topdraw.business.process.rest.RightsOperationController; 7 import com.topdraw.business.process.rest.RightsOperationController;
7 import com.topdraw.common.ResultInfo;
8 import com.topdraw.util.TimestampUtil; 8 import com.topdraw.util.TimestampUtil;
9 import org.junit.Test; 9 import org.junit.Test;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.test.business.process.rest; 1 package com.topdraw.test.business.process.rest;
2 2
3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.base.modules.common.ResultInfo;
6 import com.topdraw.business.module.user.app.domain.UserApp; 6 import com.topdraw.business.module.user.app.domain.UserApp;
7 import com.topdraw.business.module.user.iptv.domain.UserTv; 7 import com.topdraw.business.module.user.iptv.domain.UserTv;
8 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 8 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
9 import com.topdraw.business.process.domian.weixin.BindBean; 9 import com.topdraw.business.process.domian.weixin.BindBean;
10 import com.topdraw.business.process.domian.weixin.SubscribeBean;
11 import com.topdraw.business.process.domian.weixin.TvUnBindBean; 10 import com.topdraw.business.process.domian.weixin.TvUnBindBean;
12 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean; 11 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean;
13 import com.topdraw.business.process.rest.UserOperationController; 12 import com.topdraw.business.process.rest.UserOperationController;
14 import com.topdraw.common.ResultInfo;
15 import org.junit.Test; 13 import org.junit.Test;
16 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
17 import org.springframework.util.Base64Utils;
18 15
19 import java.sql.Timestamp; 16 import java.sql.Timestamp;
20 import java.util.HashMap;
21 17
22 public class UserOperationControllerTest extends BaseTest { 18 public class UserOperationControllerTest extends BaseTest {
23 19
......