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

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

@@ -124,11 +124,12 @@ public class UserExtService extends GenericService<UserExtDao, UserExt, Integer,
         /*a) 新手机号码未注册, usr_basicuser表的mobilePhone字段 , bsc_userext表中mobilePhone,bindedMobilePhone 数据更改为新的手机号码, 并且提示变更之后旧手机号码将无法登录 
     	 b) 新手机号码已注册,直接对调手机号
     	*/ 
+    	BasicUser basicUser_oldPhone = basicUserDao.getBasicUserByUid(bean.getUid());
     	UserPhoneChangeLog userPhoneChangeLog = new UserPhoneChangeLog();
     	userPhoneChangeLog.setChangeTime(new Date());
     	userPhoneChangeLog.setUid(bean.getUid());
     	userPhoneChangeLog.setOperateUid(opertorUid);
-    	userPhoneChangeLog.setPhone(bean.getMobilePhone());
+    	userPhoneChangeLog.setPhone(basicUser_oldPhone.getMobilePhone());
     	
     	UserExt  userExt_newphone = userExtDao.GetUserExtInfoByPhone(bean.getMobilePhone());
     	if(userExt_newphone==null){
@@ -141,7 +142,7 @@ public class UserExtService extends GenericService<UserExtDao, UserExt, Integer,
     		//保存修改手机号日志
     		userPhoneChangeLogDao.save(userPhoneChangeLog);
     		//查询用户基础手机号和扩展手机号
-    		BasicUser basicUser_oldPhone = basicUserDao.getBasicUserByUid(bean.getUid());
+    		
     		UserExt userExtOld = userExtDao.getByUid(bean.getUid());
     		//换原账号的手机号为新手机号
     		basicUserDao.updateMobilePhoneByUid(basicUser_oldPhone.getUid(),userExt_newphone.getBindedMobilePhone());

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

@@ -694,10 +694,10 @@ public class UserService {
                 userExtDao.update(userExt);
 
                 if (null != recommendDao.GetRecommendInfoByCode(strCode)) {
-                    giveRecommend(uid, userExt, 10, 15);
+                    //giveRecommend(uid, userExt, 10, 15);
                 } else {
-                    giveRecommend(uid, userExt, 10, 15);
-                    giveRecommend(uid, userExt, 10, 15);
+                    //giveRecommend(uid, userExt, 10, 15);
+                    //giveRecommend(uid, userExt, 10, 15);
                 }
 
             }
@@ -2955,7 +2955,7 @@ public class UserService {
 		        JSONObject workPointJson = (JSONObject)dataArray.get(3);
 		        if(voucherJson.getIntValue("vouchersAmount")>0){
 		        	//执行抵用券业务
-		        	giveRecommend(userExt.getUid(), userExt, voucherJson.getIntValue("vouchersAmount"), voucherJson.getIntValue("days"));
+		        	//giveRecommend(userExt.getUid(), userExt, voucherJson.getIntValue("vouchersAmount"), voucherJson.getIntValue("days"));
 		        }
 		        if(balanceJson.getIntValue("balanceAmout")>0){
 		        	//执行余额业务