Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2fac68f8 2fac68f8cdcf77c90127a358c24c11308b89d9b6 by xianghan
Options

1.切换主账号时，取消已是主账号的判断条件

1 parent b5c851ca
Inline Side-by-side
Showing 7 changed files with 18 additions and 13 deletions
...@@ -54,7 +54,7 @@ public class MemberProfile implements Serializable { ...@@ -54,7 +54,7 @@ public class MemberProfile implements Serializable {
54 // 生日 54 // 生日
55 @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class) 55 @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
56 @Column(name = "birthday", nullable = false) 56 @Column(name = "birthday", nullable = false)
57 private Timestamp birthday; 57 private String birthday;
58 58
59 // 手机号 59 // 手机号
60 @Column(name = "phone") 60 @Column(name = "phone")
......
1 package com.topdraw.business.module.member.profile.domain; 1 package com.topdraw.business.module.member.profile.domain;
2 2
3
3 import com.topdraw.utils.StringUtils; 4 import com.topdraw.utils.StringUtils;
4 5
5 import java.sql.Timestamp; 6 import java.sql.Timestamp;
...@@ -7,7 +8,7 @@ import java.util.Objects; ...@@ -7,7 +8,7 @@ import java.util.Objects;
7 8
8 public class MemberProfileBuild { 9 public class MemberProfileBuild {
9 10
10 public static MemberProfile build(Long memberId , String realname , Integer gender, Timestamp birthday){ 11 public static MemberProfile build(Long memberId , String realname , Integer gender, String birthday){
11 MemberProfile memberProfile = build(memberId,realname,gender,"","","","","","", 12 MemberProfile memberProfile = build(memberId,realname,gender,"","","","","","",
12 "","","",birthday); 13 "","","",birthday);
13 return memberProfile; 14 return memberProfile;
...@@ -22,7 +23,7 @@ public class MemberProfileBuild { ...@@ -22,7 +23,7 @@ public class MemberProfileBuild {
22 public static MemberProfile build(Long memberId, String realName, Integer sex, 23 public static MemberProfile build(Long memberId, String realName, Integer sex,
23 String contry, String district, String city, String idCard, String province, 24 String contry, String district, String city, String idCard, String province,
24 String email, String description, String phone, String constellation, 25 String email, String description, String phone, String constellation,
25 Timestamp timestamp) { 26 String timestamp) {
26 27
27 if (memberId == null) 28 if (memberId == null)
28 throw new NullPointerException("memberId is null"); 29 throw new NullPointerException("memberId is null");
...@@ -40,7 +41,7 @@ public class MemberProfileBuild { ...@@ -40,7 +41,7 @@ public class MemberProfileBuild {
40 memberProfile.setDescription(stringIsNull(description)); 41 memberProfile.setDescription(stringIsNull(description));
41 memberProfile.setPhone(stringIsNull(phone)); 42 memberProfile.setPhone(stringIsNull(phone));
42 memberProfile.setConstellation(stringIsNull(constellation)); 43 memberProfile.setConstellation(stringIsNull(constellation));
43 memberProfile.setBirthday(timestamp); 44 memberProfile.setBirthday(StringUtils.isNotBlank(timestamp) ? timestamp : "1900-01-01");
44 45
45 return memberProfile; 46 return memberProfile;
46 } 47 }
......
...@@ -27,7 +27,7 @@ public class MemberProfileDTO implements Serializable { ...@@ -27,7 +27,7 @@ public class MemberProfileDTO implements Serializable {
27 private Integer gender; 27 private Integer gender;
28 28
29 // 生日 29 // 生日
30 private Timestamp birthday; 30 private String birthday;
31 31
32 // 生日字符串 32 // 生日字符串
33 private String birthdayStr; 33 private String birthdayStr;
......
...@@ -151,7 +151,8 @@ public class MemberProfileServiceImpl implements MemberProfileService { ...@@ -151,7 +151,8 @@ public class MemberProfileServiceImpl implements MemberProfileService {
151 151
152 member.setNickname(nickNameStr); 152 member.setNickname(nickNameStr);
153 member.setGender(resources.getGender()); 153 member.setGender(resources.getGender());
154 member.setBirthday(DateUtil.format(resources.getBirthday(), "yyyy-MM-dd")); 154 // member.setBirthday(DateUtil.format(resources.getBirthday(), "yyyy-MM-dd"));
155 member.setBirthday(resources.getBirthday());
155 member.setAvatarUrl(resources.getAvatarUrl()); 156 member.setAvatarUrl(resources.getAvatarUrl());
156 157
157 // memberRepository.save(member); 158 // memberRepository.save(member);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 spring: 2 spring:
3 datasource: 3 datasource:
4 # 测试/演示库url: 4 # 测试/演示库url:
5 url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs_test?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false 5 url: jdbc:log4jdbc:mysql://139.196.145.150:3306/ucs-small-sichuan?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
6 username: root 6 username: root
7 password: Tjlh@2021 7 password: Tjlh@2021
8 8
...@@ -71,7 +71,7 @@ spring: ...@@ -71,7 +71,7 @@ spring:
71 rabbitmq: 71 rabbitmq:
72 host: 122.112.214.149 # rabbitmq的连接地址 72 host: 122.112.214.149 # rabbitmq的连接地址
73 port: 5672 # rabbitmq的连接端口号 73 port: 5672 # rabbitmq的连接端口号
74 virtual-host: member_center_sichuan # rabbitmq的虚拟host 74 virtual-host: member_center_small_sichuan # rabbitmq的虚拟host
75 username: guest # rabbitmq的用户名 75 username: guest # rabbitmq的用户名
76 password: guest # rabbitmq的密码 76 password: guest # rabbitmq的密码
77 publisher-confirms: true #如果对异步消息需要回调必须设置为true 77 publisher-confirms: true #如果对异步消息需要回调必须设置为true
......
...@@ -19,7 +19,7 @@ public class MemberProfileServiceTest extends BaseTest { ...@@ -19,7 +19,7 @@ public class MemberProfileServiceTest extends BaseTest {
19 MemberProfile resources = new MemberProfile(); 19 MemberProfile resources = new MemberProfile();
20 resources.setMemberId(memberId); 20 resources.setMemberId(memberId);
21 resources.setIdCard("422827199208010713"); 21 resources.setIdCard("422827199208010713");
22 resources.setBirthday(TimestampUtil.now()); 22 // resources.setBirthday(TimestampUtil.now());
23 resources.setGender(1); 23 resources.setGender(1);
24 resources.setDescription(""); 24 resources.setDescription("");
25 resources.setRealname(""); 25 resources.setRealname("");
...@@ -35,11 +35,14 @@ public class MemberProfileServiceTest extends BaseTest { ...@@ -35,11 +35,14 @@ public class MemberProfileServiceTest extends BaseTest {
35 35
36 @Test 36 @Test
37 public void update(){ 37 public void update(){
38 Long memberId = 1L; 38 Long memberId = 517998L;
39 MemberProfile resources = new MemberProfile(); 39 MemberProfile resources = new MemberProfile();
40 resources.setId(1L); 40 resources.setId(352459L);
41 resources.setMemberId(memberId); 41 resources.setMemberId(memberId);
42 resources.setCity("sh"); 42 resources.setBirthday("1992-08-01 08:00:00.0");
43 resources.setGender(0);
44 resources.setRealname("65465464");
45 resources.setCity("fdf");
43 String s = JSON.toJSONString(resources); 46 String s = JSON.toJSONString(resources);
44 this.memberProfileService.update(resources); 47 this.memberProfileService.update(resources);
45 LOG.info("=====>>>s=====>>>" + s); 48 LOG.info("=====>>>s=====>>>" + s);
......
...@@ -19,7 +19,7 @@ public class MemberProfileControllerTest extends BaseTest { ...@@ -19,7 +19,7 @@ public class MemberProfileControllerTest extends BaseTest {
19 MemberProfile resources = new MemberProfile(); 19 MemberProfile resources = new MemberProfile();
20 resources.setMemberId(memberId); 20 resources.setMemberId(memberId);
21 resources.setIdCard("422827199208010713"); 21 resources.setIdCard("422827199208010713");
22 resources.setBirthday(TimestampUtil.now()); 22 // resources.setBirthday(TimestampUtil.now());
23 resources.setGender(1); 23 resources.setGender(1);
24 resources.setDescription(""); 24 resources.setDescription("");
25 resources.setRealname(""); 25 resources.setRealname("");
......