Skip to content

caosy / fun-golf-service

Go to a project
Commit 485b1ab4 by unknown
Options

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

parents 2c50c2de 2e6ab35a
Inline Side-by-side
Showing with 57 additions and 16 deletions
src/main/java/com/ctrip/fun/golf/api/user/CommuneAdmController.java
......@@ -33,7 +33,11 @@ public class CommuneAdmController {
@Autowired
private CommuneAdmService communeAdmService;
/**
* 列表
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/list", method = RequestMethod.POST)
public Response<PagedResponseBean<CommuneAdmBean>> list(@RequestBody Request<CommuneAdmQuery> request) {
......@@ -46,6 +50,11 @@ public class CommuneAdmController {
return response;
}
/**
* 我管理的社员
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/myBindList", method = RequestMethod.POST)
public Response<PagedResponseBean<CommuneAdmBean>> myBindList(@RequestBody Request<CommuneAdmQuery> request) {
......@@ -70,7 +79,11 @@ public class CommuneAdmController {
}
/**
* 批量绑定
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/batchBind", method = RequestMethod.POST)
public Response<Integer> batchBind(@RequestBody Request<Map<String,Object>> request) {
......@@ -83,6 +96,11 @@ public class CommuneAdmController {
return response;
}
/**
* 批量解绑
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/batchUnbind", method = RequestMethod.POST)
public Response<Integer> batchUnbind(@RequestBody Request<Map<String,Object>> request) {
......@@ -95,7 +113,11 @@ public class CommuneAdmController {
return response;
}
/**
* 单个更新标签
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/updateLabels", method = RequestMethod.POST)
public Response<Integer> updateLabels(@RequestBody Request<CommuneAdmQuery> request) {
......@@ -111,7 +133,11 @@ public class CommuneAdmController {
/**
* 查找所有标签
* @param request
* @return
*/
@ResponseBody
@RequestMapping(value = "/findAllLabels", method = RequestMethod.POST)
public Response<List<CommuneLabelBean>> findAllLabels(@RequestBody Request<Integer> request) {
......
src/main/java/com/ctrip/fun/golf/dao/order/EventCustomerInfoDao.java
......@@ -363,7 +363,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
sql.append(" e.resourceId, ");
sql.append(" e.groupNum, ");
sql.append(" e.uid, ");
sql.append(" CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN ((u.vipGrade=2 or u.vipGrade=3) and date_add(u.communeAgainTime,INTERVAL '1' YEAR)>CURRENT_DATE() ) THEN '社员' else '非社员' end `userGrade`, ");
sql.append(" CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN (u.vipGrade&2=2 and date_add(u.communeAgainTime,INTERVAL '1' YEAR)>CURRENT_DATE() ) THEN '社员' else '非社员' end `userGrade`, ");
sql.append(" CASE WHEN o.courseProductId=0 OR o.courseProductId IS NULL THEN ol.productId ELSE o.courseProductId END `productId`,");
sql.append(" CASE WHEN o.productName IS NULL THEN ol.productName ELSE o.productName END `productName`, ");
sql.append(" CASE WHEN o.playDate IS NULL THEN ol.priceDate ELSE o.playDate END `playDate`, ");
......
src/main/java/com/ctrip/fun/golf/dao/user/CommuneAdmDao.java
......@@ -28,7 +28,7 @@ public class CommuneAdmDao extends GenericHibernateDao<CommuneAdm, Integer>{
public PagedEntityBean<CommuneAdmBean> queryAdmBeanList(Object obj) {
CommuneAdmQuery query = (CommuneAdmQuery) obj;
StringBuffer sb = new StringBuffer();
sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels");
sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels,a.customerRegion ,a.checkedRegion ");
sb.append(" FROM usr_commune_ext a LEFT JOIN usr_commune_adm b ON a.id = b.communeExtId");
sb.append(" LEFT JOIN bsc_userext c ON a.uid = c.uid");
sb.append(" LEFT JOIN adm_users d ON b.admUserId = d.id");
......@@ -46,9 +46,21 @@ public class CommuneAdmDao extends GenericHibernateDao<CommuneAdm, Integer>{
if (StringUtils.isNotBlank(query.getDrawer())) {
sb.append(" AND a.drawer = '"+query.getDrawer()+"'");
}
if (StringUtils.isNotBlank(query.getBindedAdm())) {
if ("0".equals(query.getBindedAdm())) {
sb.append(" AND d.username is null");
}else if ("1".equals(query.getBindedAdm())) {
sb.append(" AND d.username is not null");
}else if (StringUtils.isNotBlank(query.getBindedAdm())) {
sb.append(" AND d.username LIKE '%"+query.getBindedAdm()+"%'");
}
if (query.getCheckedRegion() != null && query.getCheckedRegion() != 0) {
sb.append(" and a.checkedRegion = "+query.getCheckedRegion());
}
if (query.getCustomerRegion() != null && query.getCustomerRegion() != 0) {
sb.append(" and a.customerRegion = "+query.getCustomerRegion());
}
if (StringUtils.isNotBlank(query.getLabels())) {
String labels[] = query.getLabels().split(" ");
for(String label : labels){
......
src/main/java/com/ctrip/fun/golf/dao/user/CommuneExtDao.java
......@@ -2,19 +2,11 @@ package com.ctrip.fun.golf.dao.user;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.hibernate.Criteria;
import org.hibernate.FetchMode;
import org.hibernate.Query;
import org.hibernate.criterion.CriteriaSpecification;
import org.hibernate.criterion.DetachedCriteria;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions;
import org.springframework.util.StringUtils;
import com.ctrip.fun.common.core.util.BeanConverter;
......@@ -24,7 +16,6 @@ import com.ctrip.fun.common.vo.user.CommuneExtBean;
import com.ctrip.fun.common.vo.user.CommuneExtQuery;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.user.CommuneExt;
import com.ctrip.fun.golf.domain.user.UserExt;
import com.ctrip.fun.golf.vo.PagedEntityBean;
public class CommuneExtDao extends GenericHibernateDao<CommuneExt, Integer> {
......
src/main/java/com/ctrip/fun/golf/service/user/CommuneAdmService.java
package com.ctrip.fun.golf.service.user;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.ctrip.fun.common.core.util.BeanConverter;
import com.ctrip.fun.common.core.util.DateUtil;
import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.user.CommuneAdmBean;
import com.ctrip.fun.common.vo.user.CommuneLabelBean;
......@@ -15,6 +17,8 @@ import com.ctrip.fun.golf.domain.user.CommuneAdm;
import com.ctrip.fun.golf.domain.user.CommuneLabel;
import com.ctrip.fun.golf.vo.PagedEntityBean;
import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
import com.ctrip.fun.common.vo.user.CheckedRegionEnum;
import com.ctrip.fun.common.vo.user.CustomerRegionEnum;
public class CommuneAdmService {
......@@ -30,6 +34,14 @@ public class CommuneAdmService {
for(CommuneAdmBean bean : beanList){
String labels = bean.getLabels();
bean.setLabels(transLabelNames(labels));
if (bean.getCheckedRegion() != null && bean.getCheckedRegion() != 0) {
bean.setCheckedRegionMsg(CheckedRegionEnum.valueOf(bean.getCheckedRegion()).getMsg());
}
if (bean.getCustomerRegion() != null && bean.getCustomerRegion() != 0) {
bean.setCustomerRegionMsg(CustomerRegionEnum.valueOf(bean.getCustomerRegion()).getMsg());
}
bean.setCommuneAgainTime(DateUtil.addDateField(bean.getCommuneAgainTime(), Calendar.YEAR, 1));
}
BeanConverter.copyProperties(pagedResponseBean, pagedEntityBean);
return pagedResponseBean;
......
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