Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 1432c3cf 1432c3cf9ce4d3324a4dead3fa4fb1abb2cdb71c by xianghan
Options

1.优化

1 parent 0509ec16
Inline Side-by-side
Showing 6 changed files with 173 additions and 12 deletions
1 package com.topdraw.business.module.common.domain; 1 package com.topdraw.business.module.common.domain;
2 2
3 import com.topdraw.business.module.common.validated.UpdateGroup;
4 import lombok.Data; 3 import lombok.Data;
5 import lombok.experimental.Accessors; 4 import lombok.experimental.Accessors;
6 5
7 import javax.persistence.Transient; 6 import javax.persistence.Transient;
8 import javax.validation.constraints.NotNull;
9 7
10 /** 8 /**
11 * @author ： 9 * @author ：
...@@ -21,7 +19,6 @@ import javax.validation.constraints.NotNull; ...@@ -21,7 +19,6 @@ import javax.validation.constraints.NotNull;
21 public class AsyncMqModule { 19 public class AsyncMqModule {
22 20
23 @Transient 21 @Transient
24 @NotNull(message = "memberCode can't be null" , groups = {UpdateGroup.class})
25 private String memberCode; 22 private String memberCode;
26 23
27 /** 运营商平台账号 */ 24 /** 运营商平台账号 */
......
...@@ -4,6 +4,7 @@ import com.topdraw.annotation.AnonymousAccess; ...@@ -4,6 +4,7 @@ import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
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.module.member.address.service.dto.MemberAddressDTO;
8 import com.topdraw.business.process.service.member.MemberAddressOperationService; 9 import com.topdraw.business.process.service.member.MemberAddressOperationService;
9 import com.topdraw.common.ResultInfo; 10 import com.topdraw.common.ResultInfo;
...@@ -34,7 +35,7 @@ public class MemberAddressController { ...@@ -34,7 +35,7 @@ public class MemberAddressController {
34 @AnonymousAccess 35 @AnonymousAccess
35 public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberAddress resources) { 36 public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberAddress resources) {
36 log.info("memberAddress ==>> create ==> param ==>> [{}]",resources); 37 log.info("memberAddress ==>> create ==> param ==>> [{}]",resources);
37 MemberAddressDTO memberAddressDTO = this.memberAddressOperationService.create(resources); 38 BasicMemberAddressDTO memberAddressDTO = this.memberAddressOperationService.create(resources);
38 log.info("memberAddress ==>> create ==> result ==>> [{}]",resources); 39 log.info("memberAddress ==>> create ==> result ==>> [{}]",resources);
39 return ResultInfo.success(memberAddressDTO); 40 return ResultInfo.success(memberAddressDTO);
40 } 41 }
...@@ -45,7 +46,7 @@ public class MemberAddressController { ...@@ -45,7 +46,7 @@ public class MemberAddressController {
45 @AnonymousAccess 46 @AnonymousAccess
46 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberAddress resources) { 47 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberAddress resources) {
47 log.info("memberAddress ==>> update ==> param ==>> [{}]",resources); 48 log.info("memberAddress ==>> update ==> param ==>> [{}]",resources);
48 MemberAddressDTO memberAddressDTO = this.memberAddressOperationService.update(resources); 49 BasicMemberAddressDTO memberAddressDTO = this.memberAddressOperationService.update(resources);
49 log.info("memberAddress ==>> update ==> result ==>> [{}]",resources); 50 log.info("memberAddress ==>> update ==> result ==>> [{}]",resources);
50 return ResultInfo.success(memberAddressDTO); 51 return ResultInfo.success(memberAddressDTO);
51 } 52 }
......
1 package com.topdraw.business.module.member.address.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6 import java.time.LocalDateTime;
7
8
9 /**
10 * @author XiangHan
11 * @date 2021-10-22
12 */
13 @Data
14 public class BasicMemberAddressDTO implements Serializable {
15
16 /** 主键 */
17 private Long id;
18
19 /** 会员id */
20 private Long memberId;
21
22 /** 类型 1：家；2：公司；3：学校 */
23 private Integer type;
24
25 /** 是否默认地址 */
26 private Integer isDefault;
27
28 /** 显示顺序 */
29 private Integer sequence;
30
31 /** 状态 0：不可用；1-可用 */
32 private Integer status;
33
34 /** 联系人姓名 */
35 private String contactor;
36
37 /** 联系人电话 */
38 private String cellphone;
39
40 /** 国家 */
41 private String country;
42
43 /** 省份 */
44 private String province;
45
46 /** 城市 */
47 private String city;
48
49 /** 区县 */
50 private String district;
51
52 /** 地址 */
53 private String address;
54
55 /** 邮编 */
56 private String zipCode;
57 }
1 package com.topdraw.business.module.member.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6 import java.time.LocalDateTime;
7
8
9 /**
10 * @author XiangHan
11 * @date 2021-10-22
12 */
13 @Data
14 public class BasicMemberDTO implements Serializable {
15
16 private String platformAccount;
17
18 /** iptv绑定的主会员 0:否 1:是 */
19 private Integer iptvMajor;
20
21 /** vip过期时间 */
22 private LocalDateTime vipExpireTime;
23
24 /** 主键 */
25 private Long id;
26
27 /** 标识 */
28 private String code;
29
30 /** 类型 1：大屏；2：小屏 */
31 private Integer type;
32
33 /** 状态 0：不可用；1：可用 */
34 private Integer status;
35
36 /** 昵称 base64 */
37 private String nickname;
38
39 /** 描述 */
40 private String description;
41
42 /** 性别 0：女；1：男；-1：未知 */
43 private Integer gender;
44
45 /** 生日 */
46 private String birthday;
47
48 /** 头像 */
49 private String avatarUrl;
50
51 /** 分组信息 */
52 private String groups;
53
54 /** 标签 */
55 private String tags;
56
57 /** 是否会员 0：非会员；1：会员 */
58 private Integer vip;
59
60 /** 会员等级（对应level表的level字段，非id） */
61 private Integer level;
62
63 /** 成长值 */
64 private Long exp;
65
66 /** 当前积分 */
67 private Long points;
68
69 /** 即将到期积分（一个月内） */
70 private Long duePoints;
71
72 /** 优惠券数量 */
73 private Long couponAmount;
74
75 /** 即将过期优惠券数量 */
76 private Long dueCouponAmount;
77
78 /** iptv账号id */
79 private Long userIptvId;
80
81 /** 绑定IPTV平台 0：未知；1：电信；2：移动；3：联通 */
82 private Integer bindIptvPlatformType;
83
84 /** iptv账号绑定时间 */
85 private LocalDateTime bindIptvTime;
86
87 /** 创建时间 */
88 private LocalDateTime createTime;
89
90 /** 更新时间 */
91 private LocalDateTime updateTime;
92
93 /** 是否在黑名单 1：是；0否 */
94 private Long blackStatus;
95 }
...@@ -3,6 +3,7 @@ package com.topdraw.business.process.service.impl.member; ...@@ -3,6 +3,7 @@ package com.topdraw.business.process.service.impl.member;
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
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.MemberAddressService; 5 import com.topdraw.business.module.member.address.service.MemberAddressService;
6 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
6 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; 7 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
7 import com.topdraw.business.module.member.service.MemberService; 8 import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.member.service.dto.MemberDTO; 9 import com.topdraw.business.module.member.service.dto.MemberDTO;
...@@ -11,6 +12,7 @@ import com.topdraw.exception.BadRequestException; ...@@ -11,6 +12,7 @@ import com.topdraw.exception.BadRequestException;
11 import com.topdraw.exception.GlobeExceptionMsg; 12 import com.topdraw.exception.GlobeExceptionMsg;
12 import lombok.extern.slf4j.Slf4j; 13 import lombok.extern.slf4j.Slf4j;
13 import org.springframework.aop.framework.AopContext; 14 import org.springframework.aop.framework.AopContext;
15 import org.springframework.beans.BeanUtils;
14 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
16 import org.springframework.transaction.annotation.Propagation; 18 import org.springframework.transaction.annotation.Propagation;
...@@ -42,7 +44,7 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation ...@@ -42,7 +44,7 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
42 44
43 @Override 45 @Override
44 @Transactional(rollbackFor = Exception.class) 46 @Transactional(rollbackFor = Exception.class)
45 public MemberAddressDTO create(MemberAddress resources) { 47 public BasicMemberAddressDTO create(MemberAddress resources) {
46 log.info("MemberAddressOperationServiceImpl ==>> create ==>> param ==>> [{}]",resources); 48 log.info("MemberAddressOperationServiceImpl ==>> create ==>> param ==>> [{}]",resources);
47 int maxSequence = this.memberAddressService.findMaxSequenceByMemberId(resources.getMemberId()); 49 int maxSequence = this.memberAddressService.findMaxSequenceByMemberId(resources.getMemberId());
48 if (maxSequence < 6) { 50 if (maxSequence < 6) {
...@@ -51,7 +53,10 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation ...@@ -51,7 +53,10 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
51 MemberDTO memberDTO = this.memberService.findById(resources.getMemberId()); 53 MemberDTO memberDTO = this.memberService.findById(resources.getMemberId());
52 memberAddressDTO.setMemberCode(memberDTO.getCode()); 54 memberAddressDTO.setMemberCode(memberDTO.getCode());
53 ((MemberAddressOperationServiceImpl) AopContext.currentProxy()).asyncMemberAddress(memberAddressDTO); 55 ((MemberAddressOperationServiceImpl) AopContext.currentProxy()).asyncMemberAddress(memberAddressDTO);
54 return memberAddressDTO; 56
57 BasicMemberAddressDTO basicMemberAddressDTO = new BasicMemberAddressDTO();
58 BeanUtils.copyProperties(memberAddressDTO, basicMemberAddressDTO);
59 return basicMemberAddressDTO;
55 } 60 }
56 61
57 throw new BadRequestException(GlobeExceptionMsg.SEQUENCE_MAX); 62 throw new BadRequestException(GlobeExceptionMsg.SEQUENCE_MAX);
...@@ -60,12 +65,17 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation ...@@ -60,12 +65,17 @@ public class MemberAddressOperationServiceImpl implements MemberAddressOperation
60 65
61 @Override 66 @Override
62 @Transactional(rollbackFor = Exception.class) 67 @Transactional(rollbackFor = Exception.class)
63 public MemberAddressDTO update(MemberAddress resources) { 68 public BasicMemberAddressDTO update(MemberAddress resources) {
64 log.info("MemberAddressOperationServiceImpl ==>> update ==>> param ==>> [{}]",resources); 69 log.info("MemberAddressOperationServiceImpl ==>> update ==>> param ==>> [{}]",resources);
65 MemberAddressDTO memberAddressDTO = this.memberAddressService.update(resources); 70 MemberAddressDTO memberAddressDTO = this.memberAddressService.update(resources);
66 memberAddressDTO.setMemberCode(resources.getMemberCode()); 71
72 MemberDTO memberDTO = this.memberService.findById(memberAddressDTO.getMemberId());
73 memberAddressDTO.setMemberCode(memberDTO.getCode());
67 ((MemberAddressOperationServiceImpl) AopContext.currentProxy()).asyncMemberAddress(memberAddressDTO); 74 ((MemberAddressOperationServiceImpl) AopContext.currentProxy()).asyncMemberAddress(memberAddressDTO);
68 return memberAddressDTO; 75
76 BasicMemberAddressDTO basicMemberAddressDTO = new BasicMemberAddressDTO();
77 BeanUtils.copyProperties(memberAddressDTO, basicMemberAddressDTO);
78 return basicMemberAddressDTO;
69 } 79 }
70 80
71 @Override 81 @Override
......
1 package com.topdraw.business.process.service.member; 1 package com.topdraw.business.process.service.member;
2 2
3 import com.topdraw.business.module.member.address.domain.MemberAddress; 3 import com.topdraw.business.module.member.address.domain.MemberAddress;
4 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
4 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO; 5 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
5 6
6 public interface MemberAddressOperationService { 7 public interface MemberAddressOperationService {
...@@ -16,13 +17,13 @@ public interface MemberAddressOperationService { ...@@ -16,13 +17,13 @@ public interface MemberAddressOperationService {
16 * 保存会员地址 17 * 保存会员地址
17 * @param resources 18 * @param resources
18 */ 19 */
19 MemberAddressDTO create(MemberAddress resources); 20 BasicMemberAddressDTO create(MemberAddress resources);
20 21
21 /** 22 /**
22 * 修改会员地址 23 * 修改会员地址
23 * @param resources 24 * @param resources
24 */ 25 */
25 MemberAddressDTO update(MemberAddress resources); 26 BasicMemberAddressDTO update(MemberAddress resources);
26 27
27 /** 28 /**
28 * 通过id删除 29 * 通过id删除
......