Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 501d4382 501d438294b6ab780524f38a3e290e0d2dcfd536 by xianghan
Options

1.优化

1 parent d7fea15b
Inline Side-by-side
Showing 5 changed files with 40 additions and 34 deletions
...@@ -29,7 +29,7 @@ public class MemberProfile implements Serializable { ...@@ -29,7 +29,7 @@ public class MemberProfile implements Serializable {
29 29
30 /** 会员code */ 30 /** 会员code */
31 @Transient 31 @Transient
32 @NotNull(message = "memberCode not be null!!" , groups = {CreateGroup.class,UpdateGroup.class}) 32 // @NotNull(message = "memberCode not be null!!" , groups = {CreateGroup.class,UpdateGroup.class})
33 private String memberCode; 33 private String memberCode;
34 34
35 /** 头像 */ 35 /** 头像 */
......
...@@ -51,4 +51,14 @@ public class MemberProfileController { ...@@ -51,4 +51,14 @@ public class MemberProfileController {
51 MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.updateMemberProfileAndMember(resources); 51 MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.updateMemberProfileAndMember(resources);
52 return ResultInfo.success(memberProfileDTO); 52 return ResultInfo.success(memberProfileDTO);
53 } 53 }
54
55 @Log("修改会员属性并同步会员信息")
56 @PutMapping
57 @ApiOperation("修改会员属性并同步会员信息")
58 @AnonymousAccess
59 public ResultInfo updateMemberProfileAndMember_(@Validated @RequestBody MemberProfile resources) {
60 log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
61 MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.updateMemberProfileAndMember(resources);
62 return ResultInfo.success(memberProfileDTO);
63 }
54 } 64 }
......
...@@ -63,7 +63,6 @@ public class MemberProfileDTO implements Serializable { ...@@ -63,7 +63,6 @@ public class MemberProfileDTO implements Serializable {
63 /** 更新时间 */ 63 /** 更新时间 */
64 private Timestamp updateTime; 64 private Timestamp updateTime;
65 65
66
67 /** vip */ 66 /** vip */
68 private Integer vip; 67 private Integer vip;
69 68
......
...@@ -16,81 +16,81 @@ public class MemberDTO implements Serializable { ...@@ -16,81 +16,81 @@ public class MemberDTO implements Serializable {
16 16
17 private String platformAccount; 17 private String platformAccount;
18 18
19 // iptv绑定的主会员 0:否 1:是 19 /** iptv绑定的主会员 0:否 1:是 */
20 private Integer iptvMajor; 20 private Integer iptvMajor;
21 21
22 // vip过期时间 22 /** vip过期时间 */
23 private LocalDateTime vipExpireTime; 23 private LocalDateTime vipExpireTime;
24 24
25 // 主键 25 /** 主键 */
26 private Long id; 26 private Long id;
27 27
28 // 标识 28 /** 标识 */
29 private String code; 29 private String code;
30 30
31 // 类型 1：大屏；2：小屏 31 /** 类型 1：大屏；2：小屏 */
32 private Integer type; 32 private Integer type;
33 33
34 // 状态 0：不可用；1：可用 34 /** 状态 0：不可用；1：可用 */
35 private Integer status; 35 private Integer status;
36 36
37 // 昵称 base64 37 /** 昵称 base64 */
38 private String nickname; 38 private String nickname;
39 39
40 // 描述 40 /** 描述 */
41 private String description; 41 private String description;
42 42
43 // 性别 0：女；1：男；-1：未知 43 /** 性别 0：女；1：男；-1：未知 */
44 private Integer gender; 44 private Integer gender;
45 45
46 // 生日 46 /** 生日 */
47 private String birthday; 47 private String birthday;
48 48
49 // 头像 49 /** 头像 */
50 private String avatarUrl; 50 private String avatarUrl;
51 51
52 // 分组信息 52 /** 分组信息 */
53 private String groups; 53 private String groups;
54 54
55 // 标签 55 /** 标签 */
56 private String tags; 56 private String tags;
57 57
58 // 是否会员 0：非会员；1：会员 58 /** 是否会员 0：非会员；1：会员 */
59 private Integer vip; 59 private Integer vip;
60 60
61 // 会员等级（对应level表的level字段，非id） 61 /** 会员等级（对应level表的level字段，非id） */
62 private Integer level; 62 private Integer level;
63 63
64 // 成长值 64 /** 成长值 */
65 private Long exp; 65 private Long exp;
66 66
67 // 当前积分 67 /** 当前积分 */
68 private Long points; 68 private Long points;
69 69
70 // 即将到期积分（一个月内） 70 /** 即将到期积分（一个月内） */
71 private Long duePoints; 71 private Long duePoints;
72 72
73 // 优惠券数量 73 /** 优惠券数量 */
74 private Long couponAmount; 74 private Long couponAmount;
75 75
76 // 即将过期优惠券数量 76 /** 即将过期优惠券数量 */
77 private Long dueCouponAmount; 77 private Long dueCouponAmount;
78 78
79 // iptv账号id 79 /** iptv账号id */
80 private Long userIptvId; 80 private Long userIptvId;
81 81
82 // 绑定IPTV平台 0：未知；1：电信；2：移动；3：联通 82 /** 绑定IPTV平台 0：未知；1：电信；2：移动；3：联通 */
83 private Integer bindIptvPlatformType; 83 private Integer bindIptvPlatformType;
84 84
85 // iptv账号绑定时间 85 /** iptv账号绑定时间 */
86 private LocalDateTime bindIptvTime; 86 private LocalDateTime bindIptvTime;
87 87
88 // 创建时间 88 /** 创建时间 */
89 private LocalDateTime createTime; 89 private LocalDateTime createTime;
90 90
91 // 更新时间 91 /** 更新时间 */
92 private LocalDateTime updateTime; 92 private LocalDateTime updateTime;
93 93
94 // 是否在黑名单 1：是；0否 94 /** 是否在黑名单 1：是；0否 */
95 private Long blackStatus; 95 private Long blackStatus;
96 } 96 }
......
...@@ -46,16 +46,13 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation ...@@ -46,16 +46,13 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
46 46
47 @Override 47 @Override
48 public MemberProfileDTO updateMemberProfileAndMember(MemberProfile resources) { 48 public MemberProfileDTO updateMemberProfileAndMember(MemberProfile resources) {
49 String memberCode = resources.getMemberCode(); 49 MemberDTO memberDTO = this.memberService.checkMember(resources.getMemberId(), resources.getMemberCode());
50 MemberDTO memberDTO = null;
51 if (StringUtils.isNotBlank(memberCode)) {
52 memberDTO = this.memberService.findByCode(memberCode);
53 resources.setMemberCode(memberDTO.getCode()); 50 resources.setMemberCode(memberDTO.getCode());
54 }
55 51
56 MemberProfileDTO memberProfileDTO = 52 MemberProfileDTO memberProfileDTO =
57 this.memberProfileService.updateMemberProfileAndMember(resources, memberDTO); 53 this.memberProfileService.updateMemberProfileAndMember(resources, memberDTO);
58 memberProfileDTO.setMemberCode(memberCode); 54 memberProfileDTO.setMemberCode(memberDTO.getCode());
55
59 ((MemberProfileOperationServiceImpl)AopContext.currentProxy()) 56 ((MemberProfileOperationServiceImpl)AopContext.currentProxy())
60 .asyncMemberProfileAndMember(new MemberProfileAndMemberDTO(memberProfileDTO, memberDTO)); 57 .asyncMemberProfileAndMember(new MemberProfileAndMemberDTO(memberProfileDTO, memberDTO));
61 58
......