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/basic/SignLogService.java

@@ -93,7 +93,7 @@ public class SignLogService extends GenericService<SignLogDao, SignLog, Integer,
             }
             }
         }
         }
         // 4、保存到DB
         // 4、保存到DB
-        UserExt userExt = userExtDao.getUserExt(requestBean.getUid());
+        UserExt userExt = userExtDao.getUserExtInfoByUid(requestBean.getUid());
         SignLog signLog = new SignLog();
         SignLog signLog = new SignLog();
         signLog.setUid(requestBean.getUid());
         signLog.setUid(requestBean.getUid());
         if (isContinuity) {
         if (isContinuity) {

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

@@ -117,7 +117,7 @@ public class CommuneExtService extends GenericService<CommuneExtDao, CommuneExt,
     }
     }
 
 
     private void executeUidAndUserExtVipGradeCommune(CommuneExtBean vo) {
     private void executeUidAndUserExtVipGradeCommune(CommuneExtBean vo) {
-        UserExt userExt = userExtDao.getUserExt(vo.getMobilePhone());
+        UserExt userExt = userExtDao.GetUserExtInfoByPhone(vo.getMobilePhone());
         if (userExt != null) {
         if (userExt != null) {
             vo.setUid(userExt.getUid());
             vo.setUid(userExt.getUid());
         }
         }