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/api/app/RecommendStaticController.java

@@ -89,4 +89,16 @@ public class RecommendStaticController {
 		return response;
 	}
 
+	@ResponseBody
+	@RequestMapping(value = "/rankingWys", method = RequestMethod.POST)
+	public Response<List<RecommendRankBean>> getRankingWys() {
+
+		Response<List<RecommendRankBean>> response = new Response<List<RecommendRankBean>>();
+		List<RecommendRankBean> rankingList = new ArrayList<RecommendRankBean>();
+		// 查询数据库最新版本的App
+		 rankingList = UserService.getRankingWys();
+		 response.setBody(rankingList);
+		return response;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java

@@ -1279,7 +1279,13 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
 		return rankingBeanList;
 	}
 
-	public List<RecommendRankBean> getRanking3600() {
+	/**
+	 * 
+	 * @param activityId  活动ID
+	 * @param productName 产品名称 
+	 * @return
+	 */
+	public List<RecommendRankBean> getRankingByActivityId(Integer activityId, String productName) {
 		StringBuffer sql = new StringBuffer("");
 		sql.append("select q.username inviterUserName,count(*) as myNum1 from(");
 		sql.append(" SELECT c.BindedMobilePhone AS inviterUserName, d.BindedMobilePhone AS saleMobile");
@@ -1288,20 +1294,18 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
 		sql.append(" LEFT JOIN bsc_userext c ON  a.uid = c.UID");
 		sql.append(" LEFT JOIN bsc_userext d ON b.recommendUid = d.UID");
 		sql.append(" WHERE  a.OrderCategory = 16   ");
-		sql.append("   AND a.ProcessStatus&16=16    AND b.activityId IN (9)");
-		sql.append("UNION ");
+		sql.append("   AND a.ProcessStatus&16=16    AND b.activityId IN ("+activityId+")");
+		sql.append(" UNION ");
 		sql.append(" SELECT  a.customerMobile,a.saleMobile");
-		sql.append(" FROM active_customer a WHERE productName = '3600') p");
+		sql.append(" FROM active_customer a WHERE productName = '"+productName+"'  AND a.auditState&128<>128) p");
 		sql.append(" LEFT JOIN bsc_userext q ON p.saleMobile =q.bindedmobilePhone");
 		sql.append(" GROUP BY p.saleMobile ");
 		sql.append(" ORDER BY COUNT(*) DESC");
 		sql.append("");
 		
         Query query = getSession().createSQLQuery(sql.toString())
-//        		.addScalar("inviterUid", StandardBasicTypes.STRING)
 				.addScalar("inviterUserName", StandardBasicTypes.STRING)
 				.addScalar("myNum1", StandardBasicTypes.INTEGER)
-//				.addScalar("myNum2", StandardBasicTypes.INTEGER)
         		.setResultTransformer(Transformers.aliasToBean(RecommendRankBean.class));
         List<RecommendRankBean> rankingBeanList = query.list();
 		return rankingBeanList;

src/main/java/com/ctrip/fun/golf/service/basic/VoucherRuleService.java

@@ -243,12 +243,14 @@ public class VoucherRuleService extends
         try {
             JSONObject json = JSONObject.parseObject(voucherRule.getConditionJson());
             Integer type = json.getInteger("type");
-            if (type == 2) {
-                json.put("value", validateToParse(vo.getProdutIds()));
-                json.put("resourceIds", validateToParse(vo.getResourceIds()));
-                json.put("productStartDate", vo.getProductStartDate());
-                json.put("productEndDate", vo.getProductEndDate());
-                voucherRule.setConditionJson(json.toJSONString());
+            if(voucherRule.getMultiple()!=1 ){
+            	if(type == 2){
+	                json.put("value", validateToParse(vo.getProdutIds()));
+	                json.put("resourceIds", validateToParse(vo.getResourceIds()));
+	                json.put("productStartDate", vo.getProductStartDate());
+	                json.put("productEndDate", vo.getProductEndDate());
+	                voucherRule.setConditionJson(json.toJSONString());
+            	}
             }
             voucherRule.setEndUseDate(vo.getEndUseDate());
             voucherRule.setStartUseDate(vo.getStartUseDate());

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

@@ -3275,9 +3275,12 @@ public class UserService {
 
 
 	public List<RecommendRankBean> getRanking3600() {
-//		Integer activitys[] = {9};
-		List<RecommendRankBean> rankingList = userExtDao.getRanking3600();
-		
+		List<RecommendRankBean> rankingList = userExtDao.getRankingByActivityId(9,"3600");
 		return rankingList;
 	}
+
+	public List<RecommendRankBean> getRankingWys() {
+		List<RecommendRankBean> rankingList = userExtDao.getRankingByActivityId(10,"2380");
+		
+		return rankingList;}
 }