Skip to content

caosy / fun-golf-service

Go to a project
Commit 8ac9c49a by chongli
Options

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

parents 0e70f065 7a5aff47
Inline Side-by-side
Showing with 6 additions and 34 deletions
src/main/java/com/ctrip/fun/golf/api/app/RecommendStaticController.java
...@@ -3,30 +3,17 @@ package com.ctrip.fun.golf.api.app; ...@@ -3,30 +3,17 @@ package com.ctrip.fun.golf.api.app;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.ctrip.fun.common.core.util.StringUtils;
import com.ctrip.fun.common.vo.Request;
import com.ctrip.fun.common.vo.Response; import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.app.AppClientVersionBean;
import com.ctrip.fun.common.vo.app.AppVersionAllBean;
import com.ctrip.fun.common.vo.app.AppVersionBean;
import com.ctrip.fun.common.vo.app.H5VersionBean;
import com.ctrip.fun.common.vo.user.RecommendRankBean; import com.ctrip.fun.common.vo.user.RecommendRankBean;
import com.ctrip.fun.golf.dao.user.UserExtDao;
import com.ctrip.fun.golf.service.app.AppVersionService;
import com.ctrip.fun.golf.service.app.H5VersionService; import com.ctrip.fun.golf.service.app.H5VersionService;
import com.ctrip.fun.golf.service.user.UserService; import com.ctrip.fun.golf.service.user.UserService;
......
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
...@@ -133,14 +133,10 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> { ...@@ -133,14 +133,10 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
return query.executeUpdate(); return query.executeUpdate();
} }
public UserExt GetUserExtInfoByPhone(String phone) { public UserExt GetUserExtInfoByPhone(String phone) {
String hsql = "from UserExt t where t.bindedMobilePhone = :phone"; String hsql = "from UserExt t where bindedMobilePhone=:mobilePhone";
Query query = getSession().createQuery(hsql); Query query = getSession().createQuery(hsql);
query.setParameter("phone", phone); query.setParameter("mobilePhone", phone);
List<UserExt> list = query.list(); return (UserExt) query.uniqueResult();
if (list != null && !list.isEmpty()) {
return list.get(0);
}
return null;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -1113,12 +1109,6 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> { ...@@ -1113,12 +1109,6 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
} }
public UserExt getUserInfoForMiniApp(String mobilePhone) {
String hsql = "from UserExt t where t.mobilePhone=:mobilePhone or bindedMobilePhone=:mobilePhone";
Query query = getSession().createQuery(hsql);
query.setParameter("mobilePhone", mobilePhone);
return (UserExt) query.uniqueResult();
}
/** /**
* 修改用户差点 * 修改用户差点
*/ */
......
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
package com.ctrip.fun.golf.service.user; package com.ctrip.fun.golf.service.user;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.security.AlgorithmParameters; import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException; import java.security.InvalidAlgorithmParameterException;
...@@ -63,9 +62,6 @@ import com.ctrip.fun.common.vo.basic.SmsStatus; ...@@ -63,9 +62,6 @@ import com.ctrip.fun.common.vo.basic.SmsStatus;
import com.ctrip.fun.common.vo.basic.UserGradeEnum; import com.ctrip.fun.common.vo.basic.UserGradeEnum;
import com.ctrip.fun.common.vo.basic.VipGradeEnum; import com.ctrip.fun.common.vo.basic.VipGradeEnum;
import com.ctrip.fun.common.vo.order.OrderSourceEnum; import com.ctrip.fun.common.vo.order.OrderSourceEnum;
import com.ctrip.fun.common.vo.payment.PayOrderOperateRequestBean;
import com.ctrip.fun.common.vo.payment.PayOrderOperateResponseBean;
import com.ctrip.fun.common.vo.payment.PaymentResponse;
import com.ctrip.fun.common.vo.product.AsmCourseresourceQuery; import com.ctrip.fun.common.vo.product.AsmCourseresourceQuery;
import com.ctrip.fun.common.vo.product.CourseBean; import com.ctrip.fun.common.vo.product.CourseBean;
import com.ctrip.fun.common.vo.rongyun.RongYunUserVO; import com.ctrip.fun.common.vo.rongyun.RongYunUserVO;
...@@ -77,7 +73,6 @@ import com.ctrip.fun.common.vo.user.IdentifyingCodeBean; ...@@ -77,7 +73,6 @@ import com.ctrip.fun.common.vo.user.IdentifyingCodeBean;
import com.ctrip.fun.common.vo.user.ImUserBean; import com.ctrip.fun.common.vo.user.ImUserBean;
import com.ctrip.fun.common.vo.user.LoginBean; import com.ctrip.fun.common.vo.user.LoginBean;
import com.ctrip.fun.common.vo.user.LoginResultBean; import com.ctrip.fun.common.vo.user.LoginResultBean;
import com.ctrip.fun.common.vo.user.MiniAppLoginBean;
import com.ctrip.fun.common.vo.user.MiniAppLoginResultBean; import com.ctrip.fun.common.vo.user.MiniAppLoginResultBean;
import com.ctrip.fun.common.vo.user.RecommendRankBean; import com.ctrip.fun.common.vo.user.RecommendRankBean;
import com.ctrip.fun.common.vo.user.RecommendUserItemBean; import com.ctrip.fun.common.vo.user.RecommendUserItemBean;
...@@ -849,7 +844,7 @@ public class UserService { ...@@ -849,7 +844,7 @@ public class UserService {
throw new UserException(301, "验证码验证错误次数超过限制"); throw new UserException(301, "验证码验证错误次数超过限制");
} }
String token = ""; String token = "";
UserExt userext = userExtDao.getUserInfoForMiniApp(req.getUserMobilePhone()); UserExt userext = userExtDao.GetUserExtInfoByPhone(req.getUserMobilePhone());
JSONObject weiXinInfoJSON = this.getWeiXinInfoJSON(req); JSONObject weiXinInfoJSON = this.getWeiXinInfoJSON(req);
//如果验证的手机号已经注册，则设置该手机号对应的微信信息 //如果验证的手机号已经注册，则设置该手机号对应的微信信息
if(userext!=null){ if(userext!=null){
...@@ -968,7 +963,7 @@ public class UserService { ...@@ -968,7 +963,7 @@ public class UserService {
public Map<String,String> getUserInfoForMiniApp(String mobilePhone) throws Exception { public Map<String,String> getUserInfoForMiniApp(String mobilePhone) throws Exception {
Map<String,String> map =new HashMap<String,String>(); Map<String,String> map =new HashMap<String,String>();
UserExt ext = userExtDao.getUserInfoForMiniApp(mobilePhone); UserExt ext = userExtDao.GetUserExtInfoByPhone(mobilePhone);
if(ext!=null){ if(ext!=null){
map.put("headImgUrl", ext.getHeadImgUrl()); map.put("headImgUrl", ext.getHeadImgUrl());
map.put("nickName", ext.getNickName()); map.put("nickName", ext.getNickName());
......
src/main/java/com/ctrip/fun/mall/service/product/MallProductService.java
...@@ -1053,7 +1053,7 @@ public class MallProductService extends GenericService<MallProductDao, MallProdu ...@@ -1053,7 +1053,7 @@ public class MallProductService extends GenericService<MallProductDao, MallProdu
continue; continue;
} }
BeanConverter.copyProperties(vo, mallProduct); BeanConverter.copyProperties(vo, mallProduct);
vo.setActivityPrice(mallActivityProduct.getActivityPrice());
result.add(vo); result.add(vo);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment