Merge branch 'f-6.6.9' of 192.168.10.6:caosy/fun-golf-service into f-6.6.9

src/main/java/com/ctrip/fun/golf/service/user/UserService.java

@@ -876,8 +876,6 @@ public class UserService {
     		userext.setGender(weiXinInfoJSON.getString("gender"));
     		userext.setCity(weiXinInfoJSON.getString("city"));
     		userext.setProvince(weiXinInfoJSON.getString("province"));
-    		userext.setUmNickName(req.getUserMobilePhone());
-    		//userext.setNickName(weiXinInfoJSON.getString("nickName"));
     		userext.setHeadImgUrl(weiXinInfoJSON.getString("avatarUrl"));
     		userext.setPrePayCardAmount(BigDecimal.valueOf(0));
     		userext.setLockedPrePayCardAmount(BigDecimal.valueOf(0));
@@ -904,14 +902,12 @@ public class UserService {
             userext.setDeviceID("");
             userext.setOsVersion("");
             userext.setCanUseRecommendCode(1);
-            userext.setFirstLoginTime(null);
-            userext.setLastLoginTime(null);
+            userext.setFirstLoginTime(new Date());
+            userext.setLastLoginTime(new Date());
             userext.setRegisterTime(new Date());
             userext.setIsSendAmt(0);
             userext.setSendAmt(BigDecimal.valueOf(0));
             userext.setSourceId("golf");
-            userext.setUserName("");
-            userext.setUmNickName("");
             userext.setMobilePhone(req.getUserMobilePhone());
             userext.setEmail("");
             userext.setBindedEmail("");
@@ -923,6 +919,9 @@ public class UserService {
             userext.setVipGrade(0);
             userext.setCommuneYears(0);
             userext.setHandicap(23);
+    		userext.setUmNickName(req.getUserMobilePhone());
+    		userext.setUserName(req.getUserMobilePhone());
+    		userext.setNickName(req.getUserMobilePhone());
     		userExtDao.save(userext);
         }
         this.userTokenDao.deleteTokenByUserId(userext.getUid());