Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 22a1a6af 22a1a6af2bba474fc73823d3a8a6e49360e37752 by xianghan
Options

1.规范、优化部分会员接口

1 parent cdf13700
Inline Side-by-side
Showing 29 changed files with 222 additions and 476 deletions
1 package com.topdraw.business.module.member.address.domain; 1 package com.topdraw.business.module.member.address.domain;
2 2
3 import com.topdraw.business.common.CreateGroup;
3 import lombok.Data; 4 import lombok.Data;
4 import lombok.experimental.Accessors; 5 import lombok.experimental.Accessors;
5 import cn.hutool.core.bean.BeanUtil; 6 import cn.hutool.core.bean.BeanUtil;
6 import cn.hutool.core.bean.copier.CopyOptions; 7 import cn.hutool.core.bean.copier.CopyOptions;
7 import javax.persistence.*; 8 import javax.persistence.*;
9 import javax.validation.constraints.NotNull;
10
8 import org.springframework.data.annotation.CreatedDate; 11 import org.springframework.data.annotation.CreatedDate;
9 import org.springframework.data.annotation.LastModifiedDate; 12 import org.springframework.data.annotation.LastModifiedDate;
10 import org.springframework.data.jpa.domain.support.AuditingEntityListener; 13 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
...@@ -32,6 +35,7 @@ public class MemberAddress implements Serializable { ...@@ -32,6 +35,7 @@ public class MemberAddress implements Serializable {
32 35
33 // 会员id 36 // 会员id
34 @Column(name = "member_id", nullable = false) 37 @Column(name = "member_id", nullable = false)
38 @NotNull(message = "" , groups= {CreateGroup.class})
35 private Long memberId; 39 private Long memberId;
36 40
37 @Transient 41 @Transient
......
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.aop.log.Log;
4 import com.topdraw.business.common.CreateGroup;
4 import com.topdraw.business.module.member.service.MemberService; 5 import com.topdraw.business.module.member.service.MemberService;
5 import com.topdraw.business.module.member.service.dto.MemberDTO; 6 import com.topdraw.business.module.member.service.dto.MemberDTO;
6 import com.topdraw.common.ResultInfo; 7 import com.topdraw.common.ResultInfo;
7 import com.topdraw.business.module.member.address.domain.MemberAddress; 8 import com.topdraw.business.module.member.address.domain.MemberAddress;
8 import com.topdraw.business.module.member.address.service.MemberAddressService; 9 import com.topdraw.business.module.member.address.service.MemberAddressService;
9 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
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;
12 import org.springframework.data.domain.Pageable;
13 import org.springframework.util.Assert; 12 import org.springframework.util.Assert;
14 import org.springframework.validation.annotation.Validated; 13 import org.springframework.validation.annotation.Validated;
15 import org.springframework.web.bind.annotation.*; 14 import org.springframework.web.bind.annotation.*;
...@@ -21,7 +20,7 @@ import java.util.Objects; ...@@ -21,7 +20,7 @@ import java.util.Objects;
21 * @author XiangHan 20 * @author XiangHan
22 * @date 2021-10-22 21 * @date 2021-10-22
23 */ 22 */
24 @Api(tags = "MemberAddress管理") 23 @Api(tags = "会员地址管理")
25 @RestController 24 @RestController
26 @RequestMapping("/ucEngine/api/memberAddress") 25 @RequestMapping("/ucEngine/api/memberAddress")
27 @CrossOrigin 26 @CrossOrigin
...@@ -33,24 +32,19 @@ public class MemberAddressController { ...@@ -33,24 +32,19 @@ public class MemberAddressController {
33 @Autowired 32 @Autowired
34 private MemberService memberService; 33 private MemberService memberService;
35 34
36 @GetMapping(value = "/pageMemberAddress") 35 @Log("查询指定会员地址")
37 @ApiOperation("查询MemberAddress")
38 public ResultInfo pageMemberAddress(MemberAddressQueryCriteria criteria, Pageable pageable) {
39 return ResultInfo.successPage(MemberAddressService.queryAll(criteria,pageable));
40 }
41
42 @GetMapping(value = "/findById/{id}") 36 @GetMapping(value = "/findById/{id}")
43 @ApiOperation("查询指定MemberAddress") 37 @ApiOperation("查询指定会员地址")
44 public ResultInfo findById(@PathVariable(value = "id") Long id) { 38 public ResultInfo findById(@PathVariable(value = "id") Long resources) {
45 return ResultInfo.success(MemberAddressService.findById(id)); 39 log.info("MemberAddressController ==>> create ==>> param ==>> [{}]",resources);
40 return ResultInfo.success(MemberAddressService.findById(resources));
46 } 41 }
47 42
48 @PostMapping(value = "/create") 43 @Log("查询指定会员地址")
49 @ApiOperation("新增MemberAddress") 44 @RequestMapping(value = "/create")
50 @AnonymousAccess 45 @ApiOperation("新增会员地址")
51 public ResultInfo create(@Validated @RequestBody MemberAddress resources) { 46 public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberAddress resources) {
52 log.info("MemberAddressController ==>> create ===>>[{}]",resources); 47 log.info("MemberAddressController ==>> create ==> param ==>> [{}]",resources);
53
54 Long memberId = resources.getMemberId(); 48 Long memberId = resources.getMemberId();
55 MemberDTO memberDTO = this.memberService.findById(memberId); 49 MemberDTO memberDTO = this.memberService.findById(memberId);
56 String code = memberDTO.getCode(); 50 String code = memberDTO.getCode();
...@@ -59,13 +53,11 @@ public class MemberAddressController { ...@@ -59,13 +53,11 @@ public class MemberAddressController {
59 return ResultInfo.success(); 53 return ResultInfo.success();
60 } 54 }
61 55
62 @PutMapping(value = "/update") 56 @Log("修改会员地址")
63 @ApiOperation("修改MemberAddress") 57 @RequestMapping(value = "/update")
64 @AnonymousAccess 58 @ApiOperation("修改会员地址")
65 public ResultInfo update(@Validated @RequestBody MemberAddress resources) { 59 public ResultInfo update(@Validated(value = {CreateGroup.class}) @RequestBody MemberAddress resources) {
66 60 log.info("MemberAddressController ==>> update ==> param ==>> [{}]",resources);
67 log.info("MemberAddressController ==>> update ===>>[{}]",resources);
68
69 Long memberId = resources.getMemberId(); 61 Long memberId = resources.getMemberId();
70 Integer sequence = resources.getSequence(); 62 Integer sequence = resources.getSequence();
71 Assert.notNull(memberId,"memberId can't be null"); 63 Assert.notNull(memberId,"memberId can't be null");
...@@ -80,11 +72,12 @@ public class MemberAddressController { ...@@ -80,11 +72,12 @@ public class MemberAddressController {
80 return ResultInfo.success(); 72 return ResultInfo.success();
81 } 73 }
82 74
83 @DeleteMapping(value = "/delete/{id}") 75 @Log("删除会员地址")
84 @ApiOperation("删除MemberAddress") 76 @RequestMapping(value = "/delete/{id}")
85 @AnonymousAccess 77 @ApiOperation("删除会员地址")
86 public ResultInfo delete(@PathVariable Long id) { 78 public ResultInfo delete(@PathVariable Long resources) {
87 MemberAddressService.delete(id); 79 log.info("MemberAddressController ==>> delete ==> param ==>> [{}]",resources);
80 MemberAddressService.delete(resources);
88 return ResultInfo.success(); 81 return ResultInfo.success();
89 } 82 }
90 83
......
...@@ -14,30 +14,27 @@ import java.util.List; ...@@ -14,30 +14,27 @@ import java.util.List;
14 public interface MemberAddressService { 14 public interface MemberAddressService {
15 15
16 /** 16 /**
17 * 查询数据分页
18 * @param criteria 条件参数
19 * @param pageable 分页参数
20 * @return Map<String,Object>
21 */
22 Map<String,Object> queryAll(MemberAddressQueryCriteria criteria, Pageable pageable);
23
24 /**
25 * 查询所有数据不分页
26 * @param criteria 条件参数
27 * @return List<MemberAddressDTO>
28 */
29 List<MemberAddressDTO> queryAll(MemberAddressQueryCriteria criteria);
30
31 /**
32 * 根据ID查询 17 * 根据ID查询
33 * @param id ID 18 * @param id ID
34 * @return MemberAddressDTO 19 * @return MemberAddressDTO
35 */ 20 */
36 MemberAddressDTO findById(Long id); 21 MemberAddressDTO findById(Long id);
37 22
23 /**
24 * 保存会员地址
25 * @param resources
26 */
38 void create(MemberAddress resources); 27 void create(MemberAddress resources);
39 28
29 /**
30 * 修改会员地址
31 * @param resources
32 */
40 void update(MemberAddress resources); 33 void update(MemberAddress resources);
41 34
42 void delete(Long id); 35 /**
36 * 通过id删除
37 * @param resources
38 */
39 void delete(Long resources);
43 } 40 }
......
...@@ -38,17 +38,6 @@ public class MemberAddressServiceImpl implements MemberAddressService { ...@@ -38,17 +38,6 @@ public class MemberAddressServiceImpl implements MemberAddressService {
38 private MemberAddressMapper MemberAddressMapper; 38 private MemberAddressMapper MemberAddressMapper;
39 39
40 @Override 40 @Override
41 public Map<String, Object> queryAll(MemberAddressQueryCriteria criteria, Pageable pageable) {
42 Page<MemberAddress> page = MemberAddressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
43 return PageUtil.toPage(page.map(MemberAddressMapper::toDto));
44 }
45
46 @Override
47 public List<MemberAddressDTO> queryAll(MemberAddressQueryCriteria criteria) {
48 return MemberAddressMapper.toDto(MemberAddressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
49 }
50
51 @Override
52 public MemberAddressDTO findById(Long id) { 41 public MemberAddressDTO findById(Long id) {
53 MemberAddress MemberAddress = MemberAddressRepository.findById(id).orElseGet(MemberAddress::new); 42 MemberAddress MemberAddress = MemberAddressRepository.findById(id).orElseGet(MemberAddress::new);
54 ValidationUtil.isNull(MemberAddress.getId(),"MemberAddress","id",id); 43 ValidationUtil.isNull(MemberAddress.getId(),"MemberAddress","id",id);
......
...@@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions; ...@@ -5,6 +5,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
5 import com.topdraw.util.IdWorker; 5 import com.topdraw.util.IdWorker;
6 import lombok.Data; 6 import lombok.Data;
7 import lombok.experimental.Accessors; 7 import lombok.experimental.Accessors;
8 import org.apache.commons.lang3.StringUtils;
8 import org.springframework.data.annotation.CreatedDate; 9 import org.springframework.data.annotation.CreatedDate;
9 import org.springframework.data.annotation.LastModifiedDate; 10 import org.springframework.data.annotation.LastModifiedDate;
10 import org.springframework.data.jpa.domain.support.AuditingEntityListener; 11 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
...@@ -13,6 +14,7 @@ import javax.persistence.*; ...@@ -13,6 +14,7 @@ import javax.persistence.*;
13 import java.io.Serializable; 14 import java.io.Serializable;
14 import java.sql.Timestamp; 15 import java.sql.Timestamp;
15 import java.time.LocalDateTime; 16 import java.time.LocalDateTime;
17 import java.util.Objects;
16 18
17 /** 19 /**
18 * @author XiangHan 20 * @author XiangHan
...@@ -20,12 +22,13 @@ import java.time.LocalDateTime; ...@@ -20,12 +22,13 @@ import java.time.LocalDateTime;
20 */ 22 */
21 public class MemberBuilder { 23 public class MemberBuilder {
22 24
23 public static Member build(Integer type,String avatarUrl,String nickname,Integer vip){ 25 public static Member build(Integer type,String avatarUrl,String nickname,int vip){
26 // todo 原型模式
24 Member member = new Member(); 27 Member member = new Member();
25 member.setType(type); 28 member.setType(type);
26 member.setBlackStatus(0L); 29 member.setBlackStatus(0L);
27 member.setGender(-1); 30 member.setGender(-1);
28 member.setVip(vip==null?0:vip); 31 member.setVip(vip);
29 member.setLevel(1); 32 member.setLevel(1);
30 member.setStatus(1); 33 member.setStatus(1);
31 member.setPoints(0L); 34 member.setPoints(0L);
...@@ -33,9 +36,9 @@ public class MemberBuilder { ...@@ -33,9 +36,9 @@ public class MemberBuilder {
33 member.setExp(0L); 36 member.setExp(0L);
34 member.setCouponAmount(0L); 37 member.setCouponAmount(0L);
35 member.setDueCouponAmount(0L); 38 member.setDueCouponAmount(0L);
36 member.setAvatarUrl(avatarUrl); 39 member.setAvatarUrl(StringUtils.isBlank(avatarUrl)?"":avatarUrl);
37 member.setCode(IdWorker.generator() + ""); 40 member.setCode(IdWorker.generator() + "");
38 member.setNickname(nickname); 41 member.setNickname(StringUtils.isBlank(nickname)?"":nickname);
39 return member; 42 return member;
40 } 43 }
41 } 44 }
......
1 package com.topdraw.business.module.member.group.repository; 1 package com.topdraw.business.module.member.group.repository;
2 2
3 import com.topdraw.business.module.member.group.domain.MemberGroup; 3 import com.topdraw.business.module.member.group.domain.MemberGroup;
4 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
4 import org.springframework.data.jpa.repository.JpaRepository; 5 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 6 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 7
8 import java.util.List;
9
7 /** 10 /**
8 * @author XiangHan 11 * @author XiangHan
9 * @date 2021-11-17 12 * @date 2021-11-17
10 */ 13 */
11 public interface MemberGroupRepository extends JpaRepository<MemberGroup, Long>, JpaSpecificationExecutor<MemberGroup> { 14 public interface MemberGroupRepository extends JpaRepository<MemberGroup, Long>, JpaSpecificationExecutor<MemberGroup> {
12 15
16 List<MemberGroupDTO> findByMemberId(Long memberId);
13 } 17 }
......
1 package com.topdraw.business.module.member.group.rest; 1 package com.topdraw.business.module.member.group.rest;
2 2
3 import com.topdraw.aop.log.Log;
3 import com.topdraw.common.ResultInfo; 4 import com.topdraw.common.ResultInfo;
4 import com.topdraw.business.module.member.group.domain.MemberGroup; 5 import com.topdraw.business.module.member.group.domain.MemberGroup;
5 import com.topdraw.business.module.member.group.service.MemberGroupService; 6 import com.topdraw.business.module.member.group.service.MemberGroupService;
6 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria; 7 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
8 import lombok.extern.slf4j.Slf4j;
7 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.data.domain.Pageable; 10 import org.springframework.data.domain.Pageable;
9 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
...@@ -17,41 +19,37 @@ import io.swagger.annotations.*; ...@@ -17,41 +19,37 @@ import io.swagger.annotations.*;
17 @Api(tags = "会员分组管理") 19 @Api(tags = "会员分组管理")
18 @RestController 20 @RestController
19 @RequestMapping("/ucEngine/api/memberGroup") 21 @RequestMapping("/ucEngine/api/memberGroup")
22 @CrossOrigin
23 @Slf4j
20 public class MemberGroupController { 24 public class MemberGroupController {
21 25
22 @Autowired 26 @Autowired
23 private MemberGroupService MemberGroupService; 27 private MemberGroupService MemberGroupService;
24 28
25 @GetMapping 29 @Log("新增会员分组")
26 @ApiOperation("查询MemberGroup") 30 @RequestMapping(value = "/create")
27 public ResultInfo getMemberGroups(MemberGroupQueryCriteria criteria, Pageable pageable) {
28 return ResultInfo.successPage(MemberGroupService.queryAll(criteria,pageable));
29 }
30
31 @GetMapping(value = "/all")
32 @ApiOperation("查询所有会员分组")
33 public ResultInfo getMemberGroups(MemberGroupQueryCriteria criteria) {
34 return ResultInfo.success(MemberGroupService.queryAll(criteria));
35 }
36
37 @PostMapping
38 @ApiOperation("新增会员分组") 31 @ApiOperation("新增会员分组")
39 public ResultInfo create(@Validated @RequestBody MemberGroup resources) { 32 public ResultInfo create(@Validated @RequestBody MemberGroup resources) {
33 log.info("MemberGroupController ==>> create ==>> param ==>> [{}]",resources);
40 MemberGroupService.create(resources); 34 MemberGroupService.create(resources);
41 return ResultInfo.success(); 35 return ResultInfo.success();
42 } 36 }
43 37
44 @PutMapping 38 @Log("修改会员分组")
39 @RequestMapping(value = "/update")
45 @ApiOperation("修改会员分组") 40 @ApiOperation("修改会员分组")
46 public ResultInfo update(@Validated @RequestBody MemberGroup resources) { 41 public ResultInfo update(@Validated @RequestBody MemberGroup resources) {
42 log.info("MemberGroupController ==>> update ==>> param ==>> [{}]",resources);
47 MemberGroupService.update(resources); 43 MemberGroupService.update(resources);
48 return ResultInfo.success(); 44 return ResultInfo.success();
49 } 45 }
50 46
51 @DeleteMapping(value = "/{id}") 47 @Log("删除会员分组")
48 @RequestMapping(value = "/{id}")
52 @ApiOperation("删除会员分组") 49 @ApiOperation("删除会员分组")
53 public ResultInfo delete(@PathVariable Long id) { 50 public ResultInfo delete(@PathVariable(value = "id") Long resources) {
54 MemberGroupService.delete(id); 51 log.info("MemberGroupController ==>> delete ==>> param ==>> [{}]",resources);
52 MemberGroupService.delete(resources);
55 return ResultInfo.success(); 53 return ResultInfo.success();
56 } 54 }
57 55
......
...@@ -2,9 +2,7 @@ package com.topdraw.business.module.member.group.service; ...@@ -2,9 +2,7 @@ package com.topdraw.business.module.member.group.service;
2 2
3 import com.topdraw.business.module.member.group.domain.MemberGroup; 3 import com.topdraw.business.module.member.group.domain.MemberGroup;
4 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO; 4 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
5 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria; 5
6 import org.springframework.data.domain.Pageable;
7 import java.util.Map;
8 import java.util.List; 6 import java.util.List;
9 7
10 /** 8 /**
...@@ -14,19 +12,11 @@ import java.util.List; ...@@ -14,19 +12,11 @@ import java.util.List;
14 public interface MemberGroupService { 12 public interface MemberGroupService {
15 13
16 /** 14 /**
17 * 查询数据分页 15 * 通过会员id获取会员分组列表
18 * @param criteria 条件参数 16 * @param memberId
19 * @param pageable 分页参数 17 * @return
20 * @return Map<String,Object>
21 */ 18 */
22 Map<String,Object> queryAll(MemberGroupQueryCriteria criteria, Pageable pageable); 19 List<MemberGroupDTO> findByMemberId(Long memberId);
23
24 /**
25 * 查询所有数据不分页
26 * @param criteria 条件参数
27 * @return List<MemberGroupDTO>
28 */
29 List<MemberGroupDTO> queryAll(MemberGroupQueryCriteria criteria);
30 20
31 /** 21 /**
32 * 根据ID查询 22 * 根据ID查询
...@@ -35,10 +25,22 @@ public interface MemberGroupService { ...@@ -35,10 +25,22 @@ public interface MemberGroupService {
35 */ 25 */
36 MemberGroupDTO findById(Long id); 26 MemberGroupDTO findById(Long id);
37 27
28 /**
29 * 创建会员分组
30 * @param resources
31 */
38 void create(MemberGroup resources); 32 void create(MemberGroup resources);
39 33
34 /**
35 * 修改会员分组
36 * @param resources
37 */
40 void update(MemberGroup resources); 38 void update(MemberGroup resources);
41 39
40 /**
41 * 删除会员分组
42 * @param id
43 */
42 void delete(Long id); 44 void delete(Long id);
43 45
44 } 46 }
......
...@@ -5,21 +5,15 @@ import com.topdraw.utils.ValidationUtil; ...@@ -5,21 +5,15 @@ 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;
8 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
9 import com.topdraw.business.module.member.group.service.mapper.MemberGroupMapper; 8 import com.topdraw.business.module.member.group.service.mapper.MemberGroupMapper;
10 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
12 import org.springframework.transaction.annotation.Propagation; 11 import org.springframework.transaction.annotation.Propagation;
13 import org.springframework.transaction.annotation.Transactional; 12 import org.springframework.transaction.annotation.Transactional;
14 import org.springframework.dao.EmptyResultDataAccessException; 13 import org.springframework.dao.EmptyResultDataAccessException;
15 import org.springframework.data.domain.Page;
16 import org.springframework.data.domain.Pageable;
17 import org.springframework.util.Assert; 14 import org.springframework.util.Assert;
18 import com.topdraw.utils.PageUtil;
19 import com.topdraw.utils.QueryHelp;
20 15
21 import java.util.List; 16 import java.util.List;
22 import java.util.Map;
23 17
24 /** 18 /**
25 * @author XiangHan 19 * @author XiangHan
...@@ -30,51 +24,44 @@ import java.util.Map; ...@@ -30,51 +24,44 @@ import java.util.Map;
30 public class MemberGroupServiceImpl implements MemberGroupService { 24 public class MemberGroupServiceImpl implements MemberGroupService {
31 25
32 @Autowired 26 @Autowired
33 private MemberGroupRepository MemberGroupRepository; 27 private MemberGroupRepository memberGroupRepository;
34
35 @Autowired 28 @Autowired
36 private MemberGroupMapper MemberGroupMapper; 29 private MemberGroupMapper memberGroupMapper;
37
38 @Override
39 public Map<String, Object> queryAll(MemberGroupQueryCriteria criteria, Pageable pageable) {
40 Page<MemberGroup> page = MemberGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
41 return PageUtil.toPage(page.map(MemberGroupMapper::toDto));
42 }
43 30
44 @Override 31 @Override
45 public List<MemberGroupDTO> queryAll(MemberGroupQueryCriteria criteria) { 32 public List<MemberGroupDTO> findByMemberId(Long memberId) {
46 return MemberGroupMapper.toDto(MemberGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); 33 return this.memberGroupRepository.findByMemberId(memberId);
47 } 34 }
48 35
49 @Override 36 @Override
50 public MemberGroupDTO findById(Long id) { 37 public MemberGroupDTO findById(Long id) {
51 MemberGroup MemberGroup = MemberGroupRepository.findById(id).orElseGet(MemberGroup::new); 38 MemberGroup memberGroup = this.memberGroupRepository.findById(id).orElseGet(MemberGroup::new);
52 ValidationUtil.isNull(MemberGroup.getId(),"MemberGroup","id",id); 39 ValidationUtil.isNull(memberGroup.getId(),"MemberGroup","id",id);
53 return MemberGroupMapper.toDto(MemberGroup); 40 return this.memberGroupMapper.toDto(memberGroup);
54 } 41 }
55 42
56 @Override 43 @Override
57 @Transactional(rollbackFor = Exception.class) 44 @Transactional(rollbackFor = Exception.class)
58 public void create(MemberGroup resources) { 45 public void create(MemberGroup resources) {
59 MemberGroupRepository.save(resources); 46 this.memberGroupRepository.save(resources);
60 } 47 }
61 48
62 @Override 49 @Override
63 @Transactional(rollbackFor = Exception.class) 50 @Transactional(rollbackFor = Exception.class)
64 public void update(MemberGroup resources) { 51 public void update(MemberGroup resources) {
65 MemberGroup MemberGroup = MemberGroupRepository.findById(resources.getId()).orElseGet(MemberGroup::new); 52 MemberGroup memberGroup = this.memberGroupRepository.findById(resources.getId()).orElseGet(MemberGroup::new);
66 ValidationUtil.isNull( MemberGroup.getId(),"MemberGroup","id",resources.getId()); 53 ValidationUtil.isNull(memberGroup.getId(),"MemberGroup","id",resources.getId());
67 MemberGroup.copy(resources); 54 memberGroup.copy(resources);
68 MemberGroupRepository.save(MemberGroup); 55 this.memberGroupRepository.save(memberGroup);
69 } 56 }
70 57
71 @Override 58 @Override
72 @Transactional(rollbackFor = Exception.class) 59 @Transactional(rollbackFor = Exception.class)
73 public void delete(Long id) { 60 public void delete(Long id) {
74 Assert.notNull(id, "The given id must not be null!"); 61 Assert.notNull(id, "The given id must not be null!");
75 MemberGroup MemberGroup = MemberGroupRepository.findById(id).orElseThrow( 62 MemberGroup MemberGroup = this.memberGroupRepository.findById(id).orElseThrow(
76 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberGroup.class, id), 1)); 63 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberGroup.class, id), 1));
77 MemberGroupRepository.delete(MemberGroup); 64 this.memberGroupRepository.delete(MemberGroup);
78 } 65 }
79 66
80 67
......
1 package com.topdraw.business.module.member.level.domain; 1 package com.topdraw.business.module.member.level.domain;
2 2
3 import com.topdraw.business.common.UpdateGroup;
3 import lombok.Data; 4 import lombok.Data;
4 import lombok.experimental.Accessors; 5 import lombok.experimental.Accessors;
5 import cn.hutool.core.bean.BeanUtil; 6 import cn.hutool.core.bean.BeanUtil;
6 import cn.hutool.core.bean.copier.CopyOptions; 7 import cn.hutool.core.bean.copier.CopyOptions;
7 import javax.persistence.*; 8 import javax.persistence.*;
9 import javax.validation.constraints.NotNull;
10
8 import org.springframework.data.annotation.CreatedDate; 11 import org.springframework.data.annotation.CreatedDate;
9 import org.springframework.data.annotation.LastModifiedDate; 12 import org.springframework.data.annotation.LastModifiedDate;
10 import org.springframework.data.jpa.domain.support.AuditingEntityListener; 13 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
...@@ -23,50 +26,51 @@ import java.io.Serializable; ...@@ -23,50 +26,51 @@ import java.io.Serializable;
23 @Table(name="uc_member_level") 26 @Table(name="uc_member_level")
24 public class MemberLevel implements Serializable { 27 public class MemberLevel implements Serializable {
25 28
26 // 主键 29 /** 主键 */
27 @Id 30 @Id
28 @GeneratedValue(strategy = GenerationType.IDENTITY) 31 @GeneratedValue(strategy = GenerationType.IDENTITY)
29 @Column(name = "id") 32 @Column(name = "id")
33 @NotNull(message = "id can't be null !!" , groups = {UpdateGroup.class})
30 private Long id; 34 private Long id;
31 35
32 // 标识 36 /** 标识 */
33 @Column(name = "code", nullable = false) 37 @Column(name = "code", nullable = false)
34 private String code; 38 private String code;
35 39
36 // 名称 40 /** 名称 */
37 @Column(name = "name", nullable = false) 41 @Column(name = "name", nullable = false)
38 private String name; 42 private String name;
39 43
40 // 状态 0：未启用；1：启用 44 /** 状态 0：未启用；1：启用 */
41 @Column(name = "status", nullable = false) 45 @Column(name = "status", nullable = false)
42 private Integer status; 46 private Integer status;
43 47
44 // 对应成长值 48 /** 对应成长值 */
45 @Column(name = "exp_value", nullable = false) 49 @Column(name = "exp_value", nullable = false)
46 private Long expValue; 50 private Long expValue;
47 51
48 // 等级（不可重复，数字越大等级越高） 52 /** 等级（不可重复，数字越大等级越高） */
49 @Column(name = "level", nullable = false) 53 @Column(name = "level", nullable = false)
50 private Integer level; 54 private Integer level;
51 55
52 // 会员徽标 56 /** 会员徽标 */
53 @Column(name = "icon_url") 57 @Column(name = "icon_url")
54 private String iconUrl; 58 private String iconUrl;
55 59
56 // 描述 60 /** 描述 */
57 @Column(name = "description") 61 @Column(name = "description")
58 private String description; 62 private String description;
59 63
60 // 对应任务id，通过此字段可获得该等级所对应的权益 64 /** 对应任务id，通过此字段可获得该等级所对应的权益 */
61 @Column(name = "task_id") 65 @Column(name = "task_id")
62 private Long taskId; 66 private Long taskId;
63 67
64 // 创建时间 68 /** 创建时间 */
65 @CreatedDate 69 @CreatedDate
66 @Column(name = "create_time") 70 @Column(name = "create_time")
67 private Timestamp createTime; 71 private Timestamp createTime;
68 72
69 // 更新时间 73 /** 更新时间 */
70 @LastModifiedDate 74 @LastModifiedDate
71 @Column(name = "update_time") 75 @Column(name = "update_time")
72 private Timestamp updateTime; 76 private Timestamp updateTime;
......
1 package com.topdraw.business.module.member.level.rest; 1 package com.topdraw.business.module.member.level.rest;
2 2
3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.common.UpdateGroup;
5 import com.topdraw.business.module.member.level.domain.MemberLevel;
3 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
4 import com.topdraw.business.module.member.level.service.MemberLevelService; 7 import com.topdraw.business.module.member.level.service.MemberLevelService;
5 import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria; 8 import lombok.extern.slf4j.Slf4j;
6 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
7 import org.springframework.data.domain.Pageable; 10 import org.springframework.validation.annotation.Validated;
8 import org.springframework.web.bind.annotation.*; 11 import org.springframework.web.bind.annotation.*;
9 import io.swagger.annotations.*; 12 import io.swagger.annotations.*;
10 13
...@@ -12,54 +15,30 @@ import io.swagger.annotations.*; ...@@ -12,54 +15,30 @@ import io.swagger.annotations.*;
12 * @author XiangHan 15 * @author XiangHan
13 * @date 2021-10-22 16 * @date 2021-10-22
14 */ 17 */
15 @Api(tags = "MemberLevel管理") 18 @Api(tags = "等级管理")
16 @RestController 19 @RestController
17 @RequestMapping("/api/MemberLevel") 20 @RequestMapping("/ucEngine/api/MemberLevel")
21 @CrossOrigin
22 @Slf4j
18 public class MemberLevelController { 23 public class MemberLevelController {
19 24
20 @Autowired 25 @Autowired
21 private MemberLevelService MemberLevelService; 26 private MemberLevelService MemberLevelService;
22 27
23 @GetMapping 28 @Log("修改等级")
24 @ApiOperation("查询MemberLevel") 29 @RequestMapping(value = "/update")
25 public ResultInfo getMemberLevels(MemberLevelQueryCriteria criteria, Pageable pageable) { 30 @ApiOperation("修改等级")
26 return ResultInfo.successPage(MemberLevelService.queryAll(criteria,pageable)); 31 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberLevel resources) {
27 } 32 log.info("MemberLevelController ==>> update ==>> param ==>> [{}]",resources);
28
29 @GetMapping(value = "/all")
30 @ApiOperation("查询所有MemberLevel")
31 public ResultInfo getMemberLevels(MemberLevelQueryCriteria criteria) {
32 return ResultInfo.success(MemberLevelService.queryAll(criteria));
33 }
34
35 /*@Log
36 @PostMapping(value = "/create")
37 @ApiOperation("新增MemberLevel")
38 public ResultInfo create(@Validated @RequestBody MemberLevel resources) {
39 MemberLevelService.create(resources);
40 return ResultInfo.success();
41 }
42
43 @Log
44 @PutMapping(value = "/update")
45 @ApiOperation("修改MemberLevel")
46 public ResultInfo update(@Validated @RequestBody MemberLevel resources) {
47 MemberLevelService.update(resources); 33 MemberLevelService.update(resources);
48 return ResultInfo.success(); 34 return ResultInfo.success();
49 } 35 }
50 36
51 37 @Log("根据标识查询")
52 @Log
53 @DeleteMapping(value = "/delete/{id}")
54 @ApiOperation("删除MemberLevel")
55 public ResultInfo delete(@PathVariable Long id) {
56 MemberLevelService.delete(id);
57 return ResultInfo.success();
58 }*/
59
60 @GetMapping(value = "/getByCode/{code}") 38 @GetMapping(value = "/getByCode/{code}")
61 @ApiOperation(value = "根据标识查询") 39 @ApiOperation(value = "根据标识查询")
62 public ResultInfo getByCode(@PathVariable String code) { 40 public ResultInfo getByCode(@PathVariable String code) {
41 log.info("MemberLevelController ==>> getByCode ==>> param ==>> [{}]",code);
63 return ResultInfo.success(MemberLevelService.getByCode(code)); 42 return ResultInfo.success(MemberLevelService.getByCode(code));
64 } 43 }
65 } 44 }
......
...@@ -2,9 +2,7 @@ package com.topdraw.business.module.member.level.service; ...@@ -2,9 +2,7 @@ package com.topdraw.business.module.member.level.service;
2 2
3 import com.topdraw.business.module.member.level.domain.MemberLevel; 3 import com.topdraw.business.module.member.level.domain.MemberLevel;
4 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO; 4 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
5 import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria; 5
6 import org.springframework.data.domain.Pageable;
7 import java.util.Map;
8 import java.util.List; 6 import java.util.List;
9 7
10 /** 8 /**
...@@ -12,22 +10,6 @@ import java.util.List; ...@@ -12,22 +10,6 @@ import java.util.List;
12 * @date 2021-10-22 10 * @date 2021-10-22
13 */ 11 */
14 public interface MemberLevelService { 12 public interface MemberLevelService {
15
16 /**
17 * 查询数据分页
18 * @param criteria 条件参数
19 * @param pageable 分页参数
20 * @return Map<String,Object>
21 */
22 Map<String,Object> queryAll(MemberLevelQueryCriteria criteria, Pageable pageable);
23
24 /**
25 * 查询所有数据不分页
26 * @param criteria 条件参数
27 * @return List<MemberLevelDTO>
28 */
29 List<MemberLevelDTO> queryAll(MemberLevelQueryCriteria criteria);
30
31 /** 13 /**
32 * 根据ID查询 14 * 根据ID查询
33 * @param id ID 15 * @param id ID
...@@ -35,12 +17,12 @@ public interface MemberLevelService { ...@@ -35,12 +17,12 @@ public interface MemberLevelService {
35 */ 17 */
36 MemberLevelDTO findById(Long id); 18 MemberLevelDTO findById(Long id);
37 19
38 void create(MemberLevel resources); 20 /**
39 21 *
22 * @param resources
23 */
40 void update(MemberLevel resources); 24 void update(MemberLevel resources);
41 25
42 void delete(Long id);
43
44 /** 26 /**
45 * Code校验 27 * Code校验
46 * @param code 28 * @param code
...@@ -48,5 +30,11 @@ public interface MemberLevelService { ...@@ -48,5 +30,11 @@ public interface MemberLevelService {
48 */ 30 */
49 MemberLevelDTO getByCode(String code); 31 MemberLevelDTO getByCode(String code);
50 32
33 /**
34 *
35 * @param i
36 * @param status
37 * @return
38 */
51 List<MemberLevelDTO> findLevelAndStatus(Integer i, Integer status); 39 List<MemberLevelDTO> findLevelAndStatus(Integer i, Integer status);
52 } 40 }
......
...@@ -38,17 +38,6 @@ public class MemberLevelServiceImpl implements MemberLevelService { ...@@ -38,17 +38,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
38 private MemberLevelMapper MemberLevelMapper; 38 private MemberLevelMapper MemberLevelMapper;
39 39
40 @Override 40 @Override
41 public Map<String, Object> queryAll(MemberLevelQueryCriteria criteria, Pageable pageable) {
42 Page<MemberLevel> page = MemberLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
43 return PageUtil.toPage(page.map(MemberLevelMapper::toDto));
44 }
45
46 @Override
47 public List<MemberLevelDTO> queryAll(MemberLevelQueryCriteria criteria) {
48 return MemberLevelMapper.toDto(MemberLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
49 }
50
51 @Override
52 public MemberLevelDTO findById(Long id) { 41 public MemberLevelDTO findById(Long id) {
53 MemberLevel MemberLevel = MemberLevelRepository.findById(id).orElseGet(MemberLevel::new); 42 MemberLevel MemberLevel = MemberLevelRepository.findById(id).orElseGet(MemberLevel::new);
54 ValidationUtil.isNull(MemberLevel.getId(),"MemberLevel","id",id); 43 ValidationUtil.isNull(MemberLevel.getId(),"MemberLevel","id",id);
...@@ -58,13 +47,6 @@ public class MemberLevelServiceImpl implements MemberLevelService { ...@@ -58,13 +47,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
58 @Override 47 @Override
59 @Transactional(rollbackFor = Exception.class) 48 @Transactional(rollbackFor = Exception.class)
60 @AsyncMqSend() 49 @AsyncMqSend()
61 public void create(MemberLevel resources) {
62 MemberLevelRepository.save(resources);
63 }
64
65 @Override
66 @Transactional(rollbackFor = Exception.class)
67 @AsyncMqSend()
68 public void update(MemberLevel resources) { 50 public void update(MemberLevel resources) {
69 MemberLevel MemberLevel = MemberLevelRepository.findById(resources.getId()).orElseGet(MemberLevel::new); 51 MemberLevel MemberLevel = MemberLevelRepository.findById(resources.getId()).orElseGet(MemberLevel::new);
70 ValidationUtil.isNull( MemberLevel.getId(),"MemberLevel","id",resources.getId()); 52 ValidationUtil.isNull( MemberLevel.getId(),"MemberLevel","id",resources.getId());
...@@ -73,17 +55,6 @@ public class MemberLevelServiceImpl implements MemberLevelService { ...@@ -73,17 +55,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
73 } 55 }
74 56
75 @Override 57 @Override
76 @Transactional(rollbackFor = Exception.class)
77 @AsyncMqSend()
78 public void delete(Long id) {
79 Assert.notNull(id, "The given id must not be null!");
80 MemberLevel MemberLevel = MemberLevelRepository.findById(id).orElseThrow(
81 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberLevel.class, id), 1));
82 MemberLevelRepository.delete(MemberLevel);
83 }
84
85
86 @Override
87 public MemberLevelDTO getByCode(String code) { 58 public MemberLevelDTO getByCode(String code) {
88 return StringUtils.isNotEmpty(code) ? MemberLevelMapper.toDto(MemberLevelRepository.findFirstByCode(code).orElseGet(MemberLevel::new)) 59 return StringUtils.isNotEmpty(code) ? MemberLevelMapper.toDto(MemberLevelRepository.findFirstByCode(code).orElseGet(MemberLevel::new))
89 : new MemberLevelDTO(); 60 : new MemberLevelDTO();
......
1 package com.topdraw.business.module.member.profile;
2
3 public interface DoSaveMemberProfileGroup {
4 }
1 package com.topdraw.business.module.member.profile;
2
3 public interface DoUpdateMemberProfileGroup {
4 }
1 package com.topdraw.business.module.member.profile.domain; 1 package com.topdraw.business.module.member.profile.domain;
2 2
3 import com.topdraw.business.module.member.profile.DoSaveMemberProfileGroup; 3 import com.topdraw.business.common.CreateGroup;
4 import com.topdraw.business.module.member.profile.DoUpdateMemberProfileGroup; 4 import com.topdraw.business.common.UpdateGroup;
5 import lombok.Data; 5 import lombok.Data;
6 import lombok.experimental.Accessors; 6 import lombok.experimental.Accessors;
7 import cn.hutool.core.bean.BeanUtil; 7 import cn.hutool.core.bean.BeanUtil;
...@@ -28,17 +28,17 @@ import java.io.Serializable; ...@@ -28,17 +28,17 @@ import java.io.Serializable;
28 public class MemberProfile implements Serializable { 28 public class MemberProfile implements Serializable {
29 29
30 @Transient 30 @Transient
31 @NotNull(message = "memberCode not be null!!" , groups = CreateGroup.class)
31 private String memberCode; 32 private String memberCode;
32 33
33 // 主键 34 // 主键
34 @Id 35 @Id
35 @GeneratedValue(strategy = GenerationType.IDENTITY) 36 @GeneratedValue(strategy = GenerationType.IDENTITY)
36 @Column(name = "id") 37 @Column(name = "id")
37 @NotNull(message = "【id】 not be null!!" , groups = DoUpdateMemberProfileGroup.class) 38 @NotNull(message = "id not be null!!" , groups = UpdateGroup.class)
38 private Long id; 39 private Long id;
39 40
40 // 会员id 41 // 会员id
41 @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
42 @Column(name = "member_id", nullable = false) 42 @Column(name = "member_id", nullable = false)
43 private Long memberId; 43 private Long memberId;
44 44
...@@ -48,11 +48,9 @@ public class MemberProfile implements Serializable { ...@@ -48,11 +48,9 @@ public class MemberProfile implements Serializable {
48 48
49 // 性别 0：女； 1：男 -1：未知 49 // 性别 0：女； 1：男 -1：未知
50 @Column(name = "gender", nullable = false) 50 @Column(name = "gender", nullable = false)
51 @NotNull(message = "【gender】 not be null!!" , groups = {DoSaveMemberProfileGroup.class})
52 private Integer gender; 51 private Integer gender;
53 52
54 // 生日 53 // 生日
55 @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
56 @Column(name = "birthday", nullable = false) 54 @Column(name = "birthday", nullable = false)
57 private Timestamp birthday; 55 private Timestamp birthday;
58 56
...@@ -65,7 +63,6 @@ public class MemberProfile implements Serializable { ...@@ -65,7 +63,6 @@ public class MemberProfile implements Serializable {
65 private String constellation; 63 private String constellation;
66 64
67 // 身份证 65 // 身份证
68 @NotNull(message = "【idCard】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
69 @Column(name = "id_card", nullable = false) 66 @Column(name = "id_card", nullable = false)
70 private String idCard; 67 private String idCard;
71 68
......
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.aop.log.Log;
4 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 4 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
5 import com.topdraw.business.module.member.service.MemberService; 5 import com.topdraw.business.module.member.service.MemberService;
6 import com.topdraw.business.module.member.service.dto.MemberDTO; 6 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.common.ResultInfo; 7 import com.topdraw.common.ResultInfo;
8 import com.topdraw.business.module.member.profile.domain.MemberProfile; 8 import com.topdraw.business.module.member.profile.domain.MemberProfile;
9 import com.topdraw.business.module.member.profile.service.MemberProfileService; 9 import com.topdraw.business.module.member.profile.service.MemberProfileService;
10 import com.topdraw.util.Base64Util;
11 import com.topdraw.utils.StringUtils; 10 import com.topdraw.utils.StringUtils;
12 import lombok.extern.slf4j.Slf4j; 11 import lombok.extern.slf4j.Slf4j;
13 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
...@@ -22,7 +21,7 @@ import java.util.Objects; ...@@ -22,7 +21,7 @@ import java.util.Objects;
22 * @author XiangHan 21 * @author XiangHan
23 * @date 2021-10-22 22 * @date 2021-10-22
24 */ 23 */
25 @Api(tags = "MemberProfile管理") 24 @Api(tags = "会员基础信息管理")
26 @RestController 25 @RestController
27 @RequestMapping("/ucEngine/api/memberProfile") 26 @RequestMapping("/ucEngine/api/memberProfile")
28 @CrossOrigin 27 @CrossOrigin
...@@ -34,35 +33,20 @@ public class MemberProfileController { ...@@ -34,35 +33,20 @@ public class MemberProfileController {
34 @Autowired 33 @Autowired
35 private MemberService memberService; 34 private MemberService memberService;
36 35
37 /*@GetMapping 36 @Log("新增会员基础信息")
38 @ApiOperation("查询MemberProfile") 37 @RequestMapping(value = "/create")
39 public ResultInfo getMemberProfiles(MemberProfileQueryCriteria criteria, Pageable pageable) { 38 @ApiOperation("新增会员基础信息")
40 return ResultInfo.successPage(MemberProfileService.queryAll(criteria,pageable));
41 }
42
43 @GetMapping(value = "/all")
44 @ApiOperation("查询所有MemberProfile")
45 public ResultInfo getMemberProfiles(MemberProfileQueryCriteria criteria) {
46 return ResultInfo.success(MemberProfileService.queryAll(criteria));
47 }*/
48
49 @PostMapping(value = "/create")
50 @ApiOperation("新增MemberProfile")
51 @AnonymousAccess
52 public ResultInfo create(@Validated @RequestBody MemberProfile resources) { 39 public ResultInfo create(@Validated @RequestBody MemberProfile resources) {
53 log.info("MemberProfileServiceImpl ==>> create ==>> resources ===>> [{}]",resources); 40 log.info("MemberProfileController ==>> create ==>> resources ===>> [{}]",resources);
54 String realname = resources.getRealname();
55 MemberProfileService.create(resources); 41 MemberProfileService.create(resources);
56 return ResultInfo.success(); 42 return ResultInfo.success();
57 } 43 }
58 44
59 @PutMapping(value = "/update") 45 @Log("修改会员基础信息")
60 @ApiOperation("修改MemberProfile") 46 @RequestMapping(value = "/update")
61 @AnonymousAccess 47 @ApiOperation("修改会员基础信息")
62 public ResultInfo update(@Validated @RequestBody MemberProfile resources) { 48 public ResultInfo update(@Validated @RequestBody MemberProfile resources) {
63 49 log.info("MemberProfileController ==>> update ==>> resources ===>> [{}]",resources);
64 log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
65
66 Long memberId = resources.getMemberId(); 50 Long memberId = resources.getMemberId();
67 Assert.notNull(memberId,"memberId can't be null"); 51 Assert.notNull(memberId,"memberId can't be null");
68 MemberDTO memberDTO = this.memberService.findById(memberId); 52 MemberDTO memberDTO = this.memberService.findById(memberId);
...@@ -83,19 +67,21 @@ public class MemberProfileController { ...@@ -83,19 +67,21 @@ public class MemberProfileController {
83 return ResultInfo.success(); 67 return ResultInfo.success();
84 } 68 }
85 69
86 @PutMapping 70 @Log("修改会员基础信息")
87 @ApiOperation("修改MemberProfile") 71 @RequestMapping(value = "/updateMemberProfileAndMember")
88 @AnonymousAccess 72 @ApiOperation("修改会员基础信息")
89 public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) { 73 public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) {
90 log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources); 74 log.info("MemberProfileController ==>> updateMemberProfileAndMember ==>> resources ===>> [{}]",resources);
91 this.MemberProfileService.updateMemberProfileAndMember(resources); 75 this.MemberProfileService.updateMemberProfileAndMember(resources);
92 return ResultInfo.success(); 76 return ResultInfo.success();
93 } 77 }
94 78
95 @DeleteMapping(value = "/delete/{id}") 79 @Log("删除会员基础信息")
96 @ApiOperation("删除MemberProfile") 80 @RequestMapping(value = "/delete/{id}")
97 public ResultInfo delete(@PathVariable Long id) { 81 @ApiOperation("删除会员基础信息")
98 MemberProfileService.delete(id); 82 public ResultInfo delete(@PathVariable Long resources) {
83 log.info("MemberProfileController ==>> delete ==>> resources ===>> [{}]",resources);
84 MemberProfileService.delete(resources);
99 return ResultInfo.success(); 85 return ResultInfo.success();
100 } 86 }
101 87
......
...@@ -14,36 +14,48 @@ import java.util.List; ...@@ -14,36 +14,48 @@ import java.util.List;
14 public interface MemberProfileService { 14 public interface MemberProfileService {
15 15
16 /** 16 /**
17 * 查询数据分页
18 * @param criteria 条件参数
19 * @param pageable 分页参数
20 * @return Map<String,Object>
21 */
22 Map<String,Object> queryAll(MemberProfileQueryCriteria criteria, Pageable pageable);
23
24 /**
25 * 查询所有数据不分页
26 * @param criteria 条件参数
27 * @return List<MemberProfileDTO>
28 */
29 List<MemberProfileDTO> queryAll(MemberProfileQueryCriteria criteria);
30
31 /**
32 * 根据ID查询 17 * 根据ID查询
33 * @param id ID 18 * @param id ID
34 * @return MemberProfileDTO 19 * @return MemberProfileDTO
35 */ 20 */
36 MemberProfileDTO findById(Long id); 21 MemberProfileDTO findById(Long id);
37 22
23 /**
24 * 保存
25 * @param resources 会员基本信息
26 * @return
27 */
38 MemberProfile create(MemberProfile resources); 28 MemberProfile create(MemberProfile resources);
39 29
30 /**
31 * 保存默认会员基本信息
32 * @param resources
33 * @return
34 */
40 MemberProfile createDefault(MemberProfile resources); 35 MemberProfile createDefault(MemberProfile resources);
41 36
37 /**
38 *
39 * @param resources
40 */
42 void update(MemberProfile resources); 41 void update(MemberProfile resources);
43 42
43 /**
44 *
45 * @param id
46 */
44 void delete(Long id); 47 void delete(Long id);
45 48
49 /**
50 *
51 * @param memberId
52 * @return
53 */
46 MemberProfileDTO findByMemberId(Long memberId); 54 MemberProfileDTO findByMemberId(Long memberId);
47 55
56 /**
57 *
58 * @param resources
59 */
48 void updateMemberProfileAndMember(MemberProfile resources); 60 void updateMemberProfileAndMember(MemberProfile resources);
49 } 61 }
......
...@@ -43,27 +43,13 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -43,27 +43,13 @@ public class MemberProfileServiceImpl implements MemberProfileService {
43 43
44 @Autowired 44 @Autowired
45 private MemberProfileRepository MemberProfileRepository; 45 private MemberProfileRepository MemberProfileRepository;
46
47 @Autowired 46 @Autowired
48 private MemberRepository memberRepository; 47 private MemberRepository memberRepository;
49
50 @Autowired 48 @Autowired
51 private MemberProfileMapper MemberProfileMapper; 49 private MemberProfileMapper MemberProfileMapper;
52 @Autowired 50 @Autowired
53 private MemberService memberService; 51 private MemberService memberService;
54 52
55
56 @Override
57 public Map<String, Object> queryAll(MemberProfileQueryCriteria criteria, Pageable pageable) {
58 Page<MemberProfile> page = MemberProfileRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
59 return PageUtil.toPage(page.map(MemberProfileMapper::toDto));
60 }
61
62 @Override
63 public List<MemberProfileDTO> queryAll(MemberProfileQueryCriteria criteria) {
64 return MemberProfileMapper.toDto(MemberProfileRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
65 }
66
67 @Override 53 @Override
68 public MemberProfileDTO findById(Long id) { 54 public MemberProfileDTO findById(Long id) {
69 MemberProfile MemberProfile = MemberProfileRepository.findById(id).orElseGet(MemberProfile::new); 55 MemberProfile MemberProfile = MemberProfileRepository.findById(id).orElseGet(MemberProfile::new);
...@@ -82,10 +68,6 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -82,10 +68,6 @@ public class MemberProfileServiceImpl implements MemberProfileService {
82 68
83 @Override 69 @Override
84 public MemberProfile createDefault(MemberProfile resources) { 70 public MemberProfile createDefault(MemberProfile resources) {
85
86 Long memberId = resources.getMemberId();
87 String realname = resources.getRealname();
88 Integer gender = resources.getGender();
89 MemberProfile memberProfile = MemberProfileBuild.build(); 71 MemberProfile memberProfile = MemberProfileBuild.build();
90 MemberProfile memberProfile1 = this.MemberProfileRepository.save(memberProfile); 72 MemberProfile memberProfile1 = this.MemberProfileRepository.save(memberProfile);
91 return memberProfile1; 73 return memberProfile1;
......
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.aop.log.Log;
4 import com.topdraw.business.module.member.relatedinfo.domain.UpdateGroup; 4 import com.topdraw.business.module.member.relatedinfo.domain.UpdateGroup;
5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
6 import com.topdraw.business.module.member.service.MemberService; 6 import com.topdraw.business.module.member.service.MemberService;
...@@ -8,63 +8,55 @@ import com.topdraw.business.module.member.service.dto.MemberDTO; ...@@ -8,63 +8,55 @@ import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.common.ResultInfo; 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 com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService; 10 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
11 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
12 import com.topdraw.exception.BadRequestException; 11 import com.topdraw.exception.BadRequestException;
13 import com.topdraw.util.Base64Util; 12 import com.topdraw.util.Base64Util;
14 import lombok.extern.slf4j.Slf4j; 13 import lombok.extern.slf4j.Slf4j;
15 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.data.domain.Pageable;
17 import org.springframework.util.Assert; 15 import org.springframework.util.Assert;
18 import org.springframework.util.StringUtils; 16 import org.springframework.util.StringUtils;
19 import org.springframework.validation.annotation.Validated; 17 import org.springframework.validation.annotation.Validated;
20 import org.springframework.web.bind.annotation.*; 18 import org.springframework.web.bind.annotation.*;
21 import io.swagger.annotations.*; 19 import io.swagger.annotations.*;
22 20
23 import java.util.Base64;
24 import java.util.Objects; 21 import java.util.Objects;
25 22
26 /** 23 /**
27 * @author XiangHan 24 * @author XiangHan
28 * @date 2021-10-22 25 * @date 2021-10-22
29 */ 26 */
30 @Slf4j 27 @Api(tags = "相关人员管理")
31 @Api(tags = "MemberRelatedInfo管理")
32 @RestController 28 @RestController
33 @RequestMapping("/ucEngine/api/memberRelatedInfo") 29 @RequestMapping("/ucEngine/api/memberRelatedInfo")
34 @CrossOrigin 30 @CrossOrigin
31 @Slf4j
35 public class MemberRelatedInfoController { 32 public class MemberRelatedInfoController {
36 33
37 @Autowired 34 @Autowired
38 private MemberRelatedInfoService MemberRelatedInfoService;
39 @Autowired
40 private MemberService memberService; 35 private MemberService memberService;
36 @Autowired
37 private MemberRelatedInfoService memberRelatedInfoService;
41 38
42 @GetMapping(value = "/pageMemberRelatedInfos") 39 @Log("新增相关人员")
43 @ApiOperation("查询MemberRelatedInfo") 40 @RequestMapping(value = "/create")
44 public ResultInfo pageMemberRelatedInfos(@Validated MemberRelatedInfoQueryCriteria criteria, Pageable pageable) { 41 @ApiOperation("新增相关人员")
45 return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable));
46 }
47
48 @PostMapping(value = "/create")
49 @ApiOperation("新增MemberRelatedInfo")
50 @AnonymousAccess
51 public ResultInfo create(@Validated @RequestBody MemberRelatedInfo resources) { 42 public ResultInfo create(@Validated @RequestBody MemberRelatedInfo resources) {
43 log.info("MemberRelatedInfoController ==>> create ==>> resources ===>> [{}]",resources);
52 String name = resources.getName(); 44 String name = resources.getName();
53 if (StringUtils.hasText(name)) { 45 if (StringUtils.hasText(name)) {
54 String nickNameEncode = Base64Util.encode(name); 46 String nickNameEncode = Base64Util.encode(name);
55 resources.setName(nickNameEncode); 47 resources.setName(nickNameEncode);
56 } 48 }
57 49
58 MemberRelatedInfoService.create(resources); 50 this.memberRelatedInfoService.create(resources);
59 return ResultInfo.success(); 51 return ResultInfo.success();
60 } 52 }
61 53
62 @PutMapping(value = "/update") 54 @Log("修改相关人员")
63 @ApiOperation("修改MemberRelatedInfo") 55 @RequestMapping(value = "/update")
64 @AnonymousAccess 56 @ApiOperation("修改相关人员")
65 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberRelatedInfo resources) { 57 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberRelatedInfo resources) {
66 58
67 log.info("Param ===> resources ===> [{}]",resources); 59 log.info("MemberRelatedInfoController ==>> update ==>> resources ===>> [{}]",resources);
68 60
69 String name = resources.getName(); 61 String name = resources.getName();
70 if (StringUtils.hasText(name)) { 62 if (StringUtils.hasText(name)) {
...@@ -73,7 +65,7 @@ public class MemberRelatedInfoController { ...@@ -73,7 +65,7 @@ public class MemberRelatedInfoController {
73 } 65 }
74 66
75 Long id = resources.getId(); 67 Long id = resources.getId();
76 MemberRelatedInfoDTO memberRelatedInfoDTO = this.MemberRelatedInfoService.findById(id); 68 MemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoService.findById(id);
77 if (memberRelatedInfoDTO.getId() != null) { 69 if (memberRelatedInfoDTO.getId() != null) {
78 Long memberId = memberRelatedInfoDTO.getMemberId(); 70 Long memberId = memberRelatedInfoDTO.getMemberId();
79 if (Objects.isNull(memberId)) { 71 if (Objects.isNull(memberId)) {
...@@ -86,24 +78,25 @@ public class MemberRelatedInfoController { ...@@ -86,24 +78,25 @@ public class MemberRelatedInfoController {
86 String code = memberDTO.getCode(); 78 String code = memberDTO.getCode();
87 Assert.notNull(code,"code can't be null"); 79 Assert.notNull(code,"code can't be null");
88 resources.setMemberCode(code); 80 resources.setMemberCode(code);
89 MemberRelatedInfoService.update(resources); 81 this.memberRelatedInfoService.update(resources);
90 } 82 }
91 } 83 }
92 84
93 return ResultInfo.success(); 85 return ResultInfo.success();
94 } 86 }
95 87
88 @Log("查询指定相关人员")
96 @GetMapping(value = "/findById/{id}") 89 @GetMapping(value = "/findById/{id}")
97 @ApiOperation("查询指定MemberRelatedInfo") 90 @ApiOperation("查询指定相关人员")
98 public ResultInfo findById(@PathVariable("id") Long id) { 91 public ResultInfo findById(@PathVariable("id") Long id) {
99 return ResultInfo.success(MemberRelatedInfoService.findById(id)); 92 return ResultInfo.success(this.memberRelatedInfoService.findById(id));
100 } 93 }
101 94
102 @DeleteMapping(value = "/delete/{id}") 95 @Log("删除相关人员")
103 @ApiOperation("删除MemberRelatedInfo") 96 @RequestMapping(value = "/delete/{id}")
104 @AnonymousAccess 97 @ApiOperation("删除相关人员")
105 public ResultInfo delete(@PathVariable Long id) { 98 public ResultInfo delete(@PathVariable(value = "id") Long id) {
106 MemberRelatedInfoService.delete(id); 99 this.memberRelatedInfoService.delete(id);
107 return ResultInfo.success(); 100 return ResultInfo.success();
108 } 101 }
109 102
......
...@@ -2,10 +2,6 @@ package com.topdraw.business.module.member.relatedinfo.service; ...@@ -2,10 +2,6 @@ package com.topdraw.business.module.member.relatedinfo.service;
2 2
3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 3 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
4 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 4 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
6 import org.springframework.data.domain.Pageable;
7 import java.util.Map;
8 import java.util.List;
9 5
10 /** 6 /**
11 * @author XiangHan 7 * @author XiangHan
...@@ -14,21 +10,6 @@ import java.util.List; ...@@ -14,21 +10,6 @@ import java.util.List;
14 public interface MemberRelatedInfoService { 10 public interface MemberRelatedInfoService {
15 11
16 /** 12 /**
17 * 查询数据分页
18 * @param criteria 条件参数
19 * @param pageable 分页参数
20 * @return Map<String,Object>
21 */
22 Map<String,Object> queryAll(MemberRelatedInfoQueryCriteria criteria, Pageable pageable);
23
24 /**
25 * 查询所有数据不分页
26 * @param criteria 条件参数
27 * @return List<MemberRelatedInfoDTO>
28 */
29 List<MemberRelatedInfoDTO> queryAll(MemberRelatedInfoQueryCriteria criteria);
30
31 /**
32 * 根据ID查询 13 * 根据ID查询
33 * @param id ID 14 * @param id ID
34 * @return MemberRelatedInfoDTO 15 * @return MemberRelatedInfoDTO
......
...@@ -37,17 +37,6 @@ public class MemberRelatedInfoServiceImpl implements MemberRelatedInfoService { ...@@ -37,17 +37,6 @@ public class MemberRelatedInfoServiceImpl implements MemberRelatedInfoService {
37 private MemberRelatedInfoMapper MemberRelatedInfoMapper; 37 private MemberRelatedInfoMapper MemberRelatedInfoMapper;
38 38
39 @Override 39 @Override
40 public Map<String, Object> queryAll(MemberRelatedInfoQueryCriteria criteria, Pageable pageable) {
41 Page<MemberRelatedInfo> page = MemberRelatedInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
42 return PageUtil.toPage(page.map(MemberRelatedInfoMapper::toDto));
43 }
44
45 @Override
46 public List<MemberRelatedInfoDTO> queryAll(MemberRelatedInfoQueryCriteria criteria) {
47 return MemberRelatedInfoMapper.toDto(MemberRelatedInfoRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
48 }
49
50 @Override
51 public MemberRelatedInfoDTO findById(Long id) { 40 public MemberRelatedInfoDTO findById(Long id) {
52 MemberRelatedInfo MemberRelatedInfo = MemberRelatedInfoRepository.findById(id).orElseGet(MemberRelatedInfo::new); 41 MemberRelatedInfo MemberRelatedInfo = MemberRelatedInfoRepository.findById(id).orElseGet(MemberRelatedInfo::new);
53 ValidationUtil.isNull(MemberRelatedInfo.getId(),"MemberRelatedInfo","id",id); 42 ValidationUtil.isNull(MemberRelatedInfo.getId(),"MemberRelatedInfo","id",id);
......
...@@ -53,7 +53,7 @@ public class MemberController { ...@@ -53,7 +53,7 @@ public class MemberController {
53 } 53 }
54 54
55 @Log("为大屏账户创建会员") 55 @Log("为大屏账户创建会员")
56 @PostMapping(value = "/createMemberByUserTv") 56 @RequestMapping(value = "/createMemberByUserTv")
57 @ApiOperation("为大屏账户创建会员") 57 @ApiOperation("为大屏账户创建会员")
58 public ResultInfo createMemberByUserTv(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) { 58 public ResultInfo createMemberByUserTv(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
59 59
...@@ -69,7 +69,7 @@ public class MemberController { ...@@ -69,7 +69,7 @@ public class MemberController {
69 } 69 }
70 70
71 @Log("新增会员") 71 @Log("新增会员")
72 @PostMapping(value = "/create") 72 @RequestMapping(value = "/create")
73 @ApiOperation("新增会员") 73 @ApiOperation("新增会员")
74 public ResultInfo create(@Validated @RequestBody Member resources) { 74 public ResultInfo create(@Validated @RequestBody Member resources) {
75 log.info("member ==>> create ==>> param ==>> [{}]",resources); 75 log.info("member ==>> create ==>> param ==>> [{}]",resources);
...@@ -81,9 +81,9 @@ public class MemberController { ...@@ -81,9 +81,9 @@ public class MemberController {
81 } 81 }
82 82
83 @Log("手动修改vip") 83 @Log("手动修改vip")
84 @PostMapping(value = "/doUpdateVip") 84 @RequestMapping(value = "/doUpdateVip")
85 @ApiOperation("手动修改vip") 85 @ApiOperation("手动修改vip")
86 public ResultInfo doUpdateVip(@Validated @RequestBody Member resources) { 86 public ResultInfo doUpdateVipByCode(@Validated @RequestBody Member resources) {
87 // TODO mall-service需要修改 87 // TODO mall-service需要修改
88 log.info("member ==>> create ==>> param ==>> [{}]",resources); 88 log.info("member ==>> create ==>> param ==>> [{}]",resources);
89 memberService.update(resources); 89 memberService.update(resources);
...@@ -91,7 +91,7 @@ public class MemberController { ...@@ -91,7 +91,7 @@ public class MemberController {
91 } 91 }
92 92
93 @Log("修改会员") 93 @Log("修改会员")
94 @PutMapping(value = "/update") 94 @RequestMapping(value = "/update")
95 @ApiOperation("修改会员") 95 @ApiOperation("修改会员")
96 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody Member resources) { 96 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody Member resources) {
97 Long memberId = resources.getId(); 97 Long memberId = resources.getId();
......
1 package com.topdraw.business.module.member.viphistory.rest;
2
3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
4 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
6 import com.topdraw.common.ResultInfo;
7 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiOperation;
9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.data.domain.Pageable;
11 import org.springframework.validation.annotation.Validated;
12 import org.springframework.web.bind.annotation.*;
13
14 /**
15 * @author luerlong
16 * @date 2021-12-10
17 */
18 @Api(tags = "MemberVipHistory管理")
19 @RestController
20 @RequestMapping("/api/memberVipHistory")
21 public class MemberVipHistoryController {
22
23 @Autowired
24 private MemberVipHistoryService memberVipHistoryService;
25
26 @GetMapping
27 @ApiOperation("查询MemberVipHistory")
28 public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria, Pageable pageable) {
29 return ResultInfo.successPage(memberVipHistoryService.queryAll(criteria,pageable));
30 }
31
32 @GetMapping(value = "/all")
33 @ApiOperation("查询所有MemberVipHistory")
34 public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria) {
35 return ResultInfo.success(memberVipHistoryService.queryAll(criteria));
36 }
37
38 @PostMapping
39 @ApiOperation("新增MemberVipHistory")
40 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
41 memberVipHistoryService.create(resources);
42 return ResultInfo.success();
43 }
44
45 @PutMapping
46 @ApiOperation("修改MemberVipHistory")
47 public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) {
48 memberVipHistoryService.update(resources);
49 return ResultInfo.success();
50 }
51
52 @DeleteMapping(value = "/{id}")
53 @ApiOperation("删除MemberVipHistory")
54 public ResultInfo delete(@PathVariable Long id) {
55 memberVipHistoryService.delete(id);
56 return ResultInfo.success();
57 }
58
59 }
...@@ -646,9 +646,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -646,9 +646,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
646 * @return 646 * @return
647 */ 647 */
648 private List<MemberGroupDTO> findGroupByMemberId(Long memberId) { 648 private List<MemberGroupDTO> findGroupByMemberId(Long memberId) {
649 MemberGroupQueryCriteria memberGroupQueryCriteria = new MemberGroupQueryCriteria(); 649 return this.memberGroupService.findByMemberId(memberId);
650 memberGroupQueryCriteria.setMemberId(memberId);
651 return this.memberGroupService.queryAll(memberGroupQueryCriteria);
652 } 650 }
653 651
654 /** 652 /**
......
1 package com.topdraw.schedule;
2
3 import com.topdraw.business.process.service.PointsOperationService;
4 import org.springframework.beans.factory.annotation.Autowired;
5
6 /**
7 * 积分台账
8 */
9 //@Component
10 //@Slf4j
11 //@EnableScheduling
12 public class ScheduledTask {
13
14 @Autowired
15 PointsOperationService pointsOperationService;
16
17 // @Scheduled(cron = "0/59 59 23 * * ? ")
18
19 /**
20 * 清理已过期的积分
21 */
22 // @Scheduled(cron = "0 0/1 * * * ? ")
23 public void cleanValidAvailablePoints(){
24 // this.pointsOperationService.cleanInvalidAvailablePoints();
25 }
26
27 }
...@@ -18,15 +18,6 @@ public class MemberAddressControllerTest extends BaseTest { ...@@ -18,15 +18,6 @@ public class MemberAddressControllerTest extends BaseTest {
18 MemberAddressController memberAddressController; 18 MemberAddressController memberAddressController;
19 19
20 @Test 20 @Test
21 public void pageMemberAddress(){
22 MemberAddressQueryCriteria memberQueryCriteria = new MemberAddressQueryCriteria();
23 memberQueryCriteria.setMemberId(1L);
24 Pageable pageable = PageRequest.of(0,20);
25 ResultInfo byId = this.memberAddressController.pageMemberAddress(memberQueryCriteria,pageable);
26 LOG.info("===>>>"+byId);
27 }
28
29 @Test
30 public void update(){ 21 public void update(){
31 MemberAddress memberAddress = new MemberAddress(); 22 MemberAddress memberAddress = new MemberAddress();
32 memberAddress.setId(1L); 23 memberAddress.setId(1L);
......
...@@ -24,7 +24,7 @@ public class MemberControllerTest extends BaseTest { ...@@ -24,7 +24,7 @@ public class MemberControllerTest extends BaseTest {
24 member.setId(5L); 24 member.setId(5L);
25 member.setVip(4); 25 member.setVip(4);
26 String s = JSON.toJSONString(member); 26 String s = JSON.toJSONString(member);
27 ResultInfo byId = this.memberController.doUpdateVip(member); 27 ResultInfo byId = this.memberController.doUpdateVipByCode(member);
28 LOG.info("===>>>"+byId); 28 LOG.info("===>>>"+byId);
29 } 29 }
30 30
......
...@@ -21,14 +21,6 @@ public class MemberRelatedInfoControllerTest extends BaseTest { ...@@ -21,14 +21,6 @@ public class MemberRelatedInfoControllerTest extends BaseTest {
21 MemberRelatedInfoController memberRelatedInfoController; 21 MemberRelatedInfoController memberRelatedInfoController;
22 22
23 @Test 23 @Test
24 public void getMembers(){
25 MemberRelatedInfoQueryCriteria memberQueryCriteria = new MemberRelatedInfoQueryCriteria();
26 Pageable pageable = PageRequest.of(0,20);
27 ResultInfo byId = this.memberRelatedInfoController.pageMemberRelatedInfos(memberQueryCriteria,pageable);
28 LOG.info("===>>>"+byId);
29 }
30
31 @Test
32 public void update(){ 24 public void update(){
33 MemberRelatedInfo member = new MemberRelatedInfo(); 25 MemberRelatedInfo member = new MemberRelatedInfo();
34 member.setId(15L); 26 member.setId(15L);
......