Skip to content

caosy / fun-golf-service

Go to a project
Commit b1c59669 by chongli
Options

conflict fixed

parents b0a6390d 37a619ed
Inline Side-by-side
Showing with 258 additions and 18 deletions
src/main/java/com/ctrip/fun/golf/api/app/RecommendStaticController.java
...@@ -89,4 +89,16 @@ public class RecommendStaticController { ...@@ -89,4 +89,16 @@ public class RecommendStaticController {
return response; 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/api/order/OpVoucherOrderController.java
package com.ctrip.fun.golf.api.order; package com.ctrip.fun.golf.api.order;
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.ResponseBody;
import com.ctrip.fun.common.vo.Request;
import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.order.OpOrderQuery;
import com.ctrip.fun.common.vo.order.VoucherOrderListBean; import com.ctrip.fun.common.vo.order.VoucherOrderListBean;
import com.ctrip.fun.common.vo.order.VoucherOrderListExcelBean; import com.ctrip.fun.common.vo.order.VoucherOrderListExcelBean;
import com.ctrip.fun.common.vo.order.VoucherOrderProcessBean; import com.ctrip.fun.common.vo.order.VoucherOrderProcessBean;
...@@ -26,4 +31,15 @@ public class OpVoucherOrderController extends AbstractOpOrderController<VoucherO ...@@ -26,4 +31,15 @@ public class OpVoucherOrderController extends AbstractOpOrderController<VoucherO
return opVoucherOrderService; return opVoucherOrderService;
} }
@ResponseBody
@RequestMapping(value = "/updateOpenOrderPerson", method = RequestMethod.POST)
public Response<Integer> updateOpenOrderPerson(@RequestBody Request<OpOrderQuery> request) {
Response<Integer> response = new Response<Integer>();
opVoucherOrderService.updateOpenOrderPerson(request.getUserId(),request.getBody());
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
response.setBody(null);
return response;
}
} }
src/main/java/com/ctrip/fun/golf/api/user/ActiveCustomerController.java
...@@ -56,6 +56,14 @@ public class ActiveCustomerController { ...@@ -56,6 +56,14 @@ public class ActiveCustomerController {
} }
@ResponseBody
@RequestMapping(value = "/updateOpenOrderPerson", method = RequestMethod.POST)
public Response<Object> updateOpenOrderPerson(@RequestBody Request<ActiveCustomerQuery> request) {
Response<Object> response = activeCustomerService.updateOpenOrderPerson(request.getUserId(),request.getBody());
return response;
}
} }
src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java
...@@ -60,6 +60,7 @@ import com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum; ...@@ -60,6 +60,7 @@ import com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum;
import com.ctrip.fun.common.vo.product.ResourceTypeEnum; import com.ctrip.fun.common.vo.product.ResourceTypeEnum;
import com.ctrip.fun.golf.dao.GenericHibernateDao; import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.integral.IntegralConfig; import com.ctrip.fun.golf.domain.integral.IntegralConfig;
import com.ctrip.fun.golf.domain.order.CommuneOrderItem;
import com.ctrip.fun.golf.domain.order.Order; import com.ctrip.fun.golf.domain.order.Order;
import com.ctrip.fun.golf.vo.PagedEntityBean; import com.ctrip.fun.golf.vo.PagedEntityBean;
import com.ctrip.fun.mall.vo.order.MallOrderListItemBean; import com.ctrip.fun.mall.vo.order.MallOrderListItemBean;
...@@ -2309,7 +2310,6 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> { ...@@ -2309,7 +2310,6 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
} }
public void updateOrdersInvoiceId(int orderId,int invoiceId){ public void updateOrdersInvoiceId(int orderId,int invoiceId){
String sql = "update ord_order od set od.invoiceId=:invoiceId where od.orderId = :orderId"; String sql = "update ord_order od set od.invoiceId=:invoiceId where od.orderId = :orderId";
Session session = this.getSession(); Session session = this.getSession();
...@@ -2319,4 +2319,17 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> { ...@@ -2319,4 +2319,17 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
query.executeUpdate(); query.executeUpdate();
} }
public CommuneOrderItem findCommuneOrderItemById(Integer orderId){
Query query = this.getSession().createQuery("from CommuneOrderItem where orderId = :orderId");
query.setParameter("orderId", orderId);
CommuneOrderItem communeOrderItem = (CommuneOrderItem) query.uniqueResult();
return communeOrderItem;
}
public void updateOpenOrderPerson(OpOrderQuery param){
Query query = this.getSession().createSQLQuery("update ord_communeitem set recommendUid = :recommendPhone where orderId = :orderId");
query.setParameter("recommendPhone", param.getRecommendPhone());
query.setParameter("orderId", param.getOrderId());
query.executeUpdate();
}
} }
src/main/java/com/ctrip/fun/golf/dao/system/SystemOperateLogDao.java 0 → 100644
package com.ctrip.fun.golf.dao.system;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.system.SystemOperateLog;
/**
*
* @author zgsong
*
*/
public class SystemOperateLogDao extends GenericHibernateDao<SystemOperateLog, Integer> {
}
src/main/java/com/ctrip/fun/golf/dao/user/ActiveCustomerDao.java
...@@ -139,6 +139,16 @@ public class ActiveCustomerDao extends GenericHibernateDao<ActiveCustomer, Integ ...@@ -139,6 +139,16 @@ public class ActiveCustomerDao extends GenericHibernateDao<ActiveCustomer, Integ
return rlt; return rlt;
} }
public Integer updateOpenOrderPerson(ActiveCustomerQuery param){
String hql = "update ActiveCustomer set saleMobile='"+param.getSaleMobile()+"'";
hql +=" where id="+param.getId();
Query query = this.getSession().createQuery(hql);
Integer rlt = query.executeUpdate();
return rlt;
}
public ActiveCustomer findByProductMobile(String customerMobile, public ActiveCustomer findByProductMobile(String customerMobile,
String productName) { String productName) {
String hql = "from ActiveCustomer where productName =:productName and customerMobile = :customerMobile"; String hql = "from ActiveCustomer where productName =:productName and customerMobile = :customerMobile";
......
src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java
...@@ -1279,7 +1279,13 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> { ...@@ -1279,7 +1279,13 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
return rankingBeanList; return rankingBeanList;
} }
public List<RecommendRankBean> getRanking3600() { /**
*
* @param activityId 活动ID
* @param productName 产品名称
* @return
*/
public List<RecommendRankBean> getRankingByActivityId(Integer activityId, String productName) {
StringBuffer sql = new StringBuffer(""); StringBuffer sql = new StringBuffer("");
sql.append("select q.username inviterUserName,count(*) as myNum1 from("); sql.append("select q.username inviterUserName,count(*) as myNum1 from(");
sql.append(" SELECT c.BindedMobilePhone AS inviterUserName, d.BindedMobilePhone AS saleMobile"); sql.append(" SELECT c.BindedMobilePhone AS inviterUserName, d.BindedMobilePhone AS saleMobile");
...@@ -1288,20 +1294,18 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> { ...@@ -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 c ON a.uid = c.UID");
sql.append(" LEFT JOIN bsc_userext d ON b.recommendUid = d.UID"); sql.append(" LEFT JOIN bsc_userext d ON b.recommendUid = d.UID");
sql.append(" WHERE a.OrderCategory = 16 "); sql.append(" WHERE a.OrderCategory = 16 ");
sql.append(" AND a.ProcessStatus&16=16 AND b.activityId IN (9)"); sql.append(" AND a.ProcessStatus&16=16 AND b.activityId IN ("+activityId+")");
sql.append("UNION "); sql.append(" UNION ");
sql.append(" SELECT a.customerMobile,a.saleMobile"); 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(" LEFT JOIN bsc_userext q ON p.saleMobile =q.bindedmobilePhone");
sql.append(" GROUP BY p.saleMobile "); sql.append(" GROUP BY p.saleMobile ");
sql.append(" ORDER BY COUNT(*) DESC"); sql.append(" ORDER BY COUNT(*) DESC");
sql.append(""); sql.append("");
Query query = getSession().createSQLQuery(sql.toString()) Query query = getSession().createSQLQuery(sql.toString())
// .addScalar("inviterUid", StandardBasicTypes.STRING)
.addScalar("inviterUserName", StandardBasicTypes.STRING) .addScalar("inviterUserName", StandardBasicTypes.STRING)
.addScalar("myNum1", StandardBasicTypes.INTEGER) .addScalar("myNum1", StandardBasicTypes.INTEGER)
// .addScalar("myNum2", StandardBasicTypes.INTEGER)
.setResultTransformer(Transformers.aliasToBean(RecommendRankBean.class)); .setResultTransformer(Transformers.aliasToBean(RecommendRankBean.class));
List<RecommendRankBean> rankingBeanList = query.list(); List<RecommendRankBean> rankingBeanList = query.list();
return rankingBeanList; return rankingBeanList;
......
src/main/java/com/ctrip/fun/golf/domain/system/SystemOperateLog.java 0 → 100644
/**
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package com.ctrip.fun.golf.domain.system;
import static javax.persistence.GenerationType.IDENTITY;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
/**
* @author zgsong
* @version 1.0.0
*/
@Entity
@Table(name = "bsc_system_operatelog")
public class SystemOperateLog implements Serializable {
/**
* serialVersionUID
*/
private static final long serialVersionUID = -5198881174057011384L;
/**
* 主键
*/
private Integer id;
/**
* 修改操作发生时间
*/
private Date changeTime;
/**
* 操作人uid
*/
private String operateUid;
/**
* 操作类型1：修改业绩
*/
private String operateType;
/**
*用户操作描述
*/
private String operateDesc;
public SystemOperateLog() {
// TODO Auto-generated constructor stub
}
public SystemOperateLog(Date changeTime, String operateUid,String operateType, String operateDesc) {
super();
this.changeTime = changeTime;
this.operateUid = operateUid;
this.operateType = operateType;
this.operateDesc = operateDesc;
}
@Id
@GeneratedValue(strategy = IDENTITY)
@Column(name = "id", unique = true, nullable = false)
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "changeTime", nullable = false, length = 19)
public Date getChangeTime() {
return changeTime;
}
public void setChangeTime(Date changeTime) {
this.changeTime = changeTime;
}
@Column(name = "operateUid")
public String getOperateUid() {
return operateUid;
}
public void setOperateUid(String operateUid) {
this.operateUid = operateUid;
}
@Column(name = "operateType")
public String getOperateType() {
return operateType;
}
public void setOperateType(String operateType) {
this.operateType = operateType;
}
@Column(name = "operateDesc")
public String getOperateDesc() {
return operateDesc;
}
public void setOperateDesc(String operateDesc) {
this.operateDesc = operateDesc;
}
}
src/main/java/com/ctrip/fun/golf/service/basic/VoucherRuleService.java
...@@ -243,13 +243,15 @@ public class VoucherRuleService extends ...@@ -243,13 +243,15 @@ public class VoucherRuleService extends
try { try {
JSONObject json = JSONObject.parseObject(voucherRule.getConditionJson()); JSONObject json = JSONObject.parseObject(voucherRule.getConditionJson());
Integer type = json.getInteger("type"); Integer type = json.getInteger("type");
if (type == 2) { if(voucherRule.getMultiple()!=1 ){
if(type == 2){
json.put("value", validateToParse(vo.getProdutIds())); json.put("value", validateToParse(vo.getProdutIds()));
json.put("resourceIds", validateToParse(vo.getResourceIds())); json.put("resourceIds", validateToParse(vo.getResourceIds()));
json.put("productStartDate", vo.getProductStartDate()); json.put("productStartDate", vo.getProductStartDate());
json.put("productEndDate", vo.getProductEndDate()); json.put("productEndDate", vo.getProductEndDate());
voucherRule.setConditionJson(json.toJSONString()); voucherRule.setConditionJson(json.toJSONString());
} }
}
voucherRule.setEndUseDate(vo.getEndUseDate()); voucherRule.setEndUseDate(vo.getEndUseDate());
voucherRule.setStartUseDate(vo.getStartUseDate()); voucherRule.setStartUseDate(vo.getStartUseDate());
voucherRule.setRemark(vo.getRemark()); voucherRule.setRemark(vo.getRemark());
......
src/main/java/com/ctrip/fun/golf/service/order/OpVoucherOrderService.java
...@@ -6,8 +6,11 @@ import java.util.List; ...@@ -6,8 +6,11 @@ import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import com.ctrip.fun.common.vo.PagedResponseBean; import com.ctrip.fun.common.vo.PagedResponseBean;
import com.ctrip.fun.common.vo.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
import com.ctrip.fun.common.vo.order.OpOrderQuery; import com.ctrip.fun.common.vo.order.OpOrderQuery;
import com.ctrip.fun.common.vo.order.OpVoucherOrderBean; import com.ctrip.fun.common.vo.order.OpVoucherOrderBean;
import com.ctrip.fun.common.vo.order.OrderPayinfoBean; import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
...@@ -16,10 +19,13 @@ import com.ctrip.fun.common.vo.order.VoucherOrderListBean; ...@@ -16,10 +19,13 @@ import com.ctrip.fun.common.vo.order.VoucherOrderListBean;
import com.ctrip.fun.common.vo.order.VoucherOrderListExcelBean; import com.ctrip.fun.common.vo.order.VoucherOrderListExcelBean;
import com.ctrip.fun.common.vo.order.VoucherOrderProcessBean; import com.ctrip.fun.common.vo.order.VoucherOrderProcessBean;
import com.ctrip.fun.golf.dao.order.VoucherOrderItemDao; import com.ctrip.fun.golf.dao.order.VoucherOrderItemDao;
import com.ctrip.fun.golf.dao.system.SystemOperateLogDao;
import com.ctrip.fun.golf.dao.user.UserExtDao; import com.ctrip.fun.golf.dao.user.UserExtDao;
import com.ctrip.fun.golf.domain.order.CommuneOrderItem;
import com.ctrip.fun.golf.domain.order.Order; import com.ctrip.fun.golf.domain.order.Order;
import com.ctrip.fun.golf.domain.order.OrderAssignment; import com.ctrip.fun.golf.domain.order.OrderAssignment;
import com.ctrip.fun.golf.domain.order.OrderPayinfo; import com.ctrip.fun.golf.domain.order.OrderPayinfo;
import com.ctrip.fun.golf.domain.system.SystemOperateLog;
public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderProcessBean, OpVoucherOrderBean, VoucherOrderListBean, VoucherOrderListExcelBean>{ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderProcessBean, OpVoucherOrderBean, VoucherOrderListBean, VoucherOrderListExcelBean>{
...@@ -31,6 +37,9 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr ...@@ -31,6 +37,9 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr
private VoucherOrderItemDao voucherOrderItemDao; private VoucherOrderItemDao voucherOrderItemDao;
@Autowired
private SystemOperateLogDao systemOperateLogDao;
/** /**
* TODO: 查询订单列表 * TODO: 查询订单列表
* 查询订单列表 * 查询订单列表
...@@ -62,6 +71,18 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr ...@@ -62,6 +71,18 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr
return pagedResponseBean; return pagedResponseBean;
} }
public Response<Object> updateOpenOrderPerson(String userId, OpOrderQuery orderQuery) {
Response<Object> response = new Response<Object>();
CommuneOrderItem communeOrderItem = this.getOrderDao().findCommuneOrderItemById(orderQuery.getOrderId());
SystemOperateLog sysLog = new SystemOperateLog(new Date(),userId,"1", "[订单号："+orderQuery.getOrderId()+",原推荐人:"+communeOrderItem.getRecommendUid()+",修改为:"+orderQuery.getRecommendPhone()+"]");
this.systemOperateLogDao.save(sysLog);
this.getOrderDao().updateOpenOrderPerson(orderQuery);
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage("操作成功!");
response.setBody(1);
return response;
}
@Override @Override
public List queryOrderIds(Date playDate) { public List queryOrderIds(Date playDate) {
......
src/main/java/com/ctrip/fun/golf/service/user/ActiveCustomerService.java
package com.ctrip.fun.golf.service.user; package com.ctrip.fun.golf.service.user;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.ctrip.fun.common.core.util.BeanConverter; import org.springframework.beans.factory.annotation.Autowired;
import com.ctrip.fun.common.vo.PagedResponseBean; import com.ctrip.fun.common.vo.PagedResponseBean;
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.ResponseStatusEnum;
...@@ -13,14 +11,15 @@ import com.ctrip.fun.common.vo.user.ActiveCustomerAuditStatusEnum; ...@@ -13,14 +11,15 @@ import com.ctrip.fun.common.vo.user.ActiveCustomerAuditStatusEnum;
import com.ctrip.fun.common.vo.user.ActiveCustomerBean; import com.ctrip.fun.common.vo.user.ActiveCustomerBean;
import com.ctrip.fun.common.vo.user.ActiveCustomerQuery; import com.ctrip.fun.common.vo.user.ActiveCustomerQuery;
import com.ctrip.fun.common.vo.user.CommuneExtQuery; import com.ctrip.fun.common.vo.user.CommuneExtQuery;
import com.ctrip.fun.golf.dao.system.SystemOperateLogDao;
import com.ctrip.fun.golf.dao.user.ActiveCustomerDao; import com.ctrip.fun.golf.dao.user.ActiveCustomerDao;
import com.ctrip.fun.golf.dao.user.CommuneExtDao; import com.ctrip.fun.golf.dao.user.CommuneExtDao;
import com.ctrip.fun.golf.dao.user.UserExtDao; import com.ctrip.fun.golf.dao.user.UserExtDao;
import com.ctrip.fun.golf.domain.system.SystemOperateLog;
import com.ctrip.fun.golf.domain.user.ActiveCustomer; import com.ctrip.fun.golf.domain.user.ActiveCustomer;
import com.ctrip.fun.golf.domain.user.CommuneExt; import com.ctrip.fun.golf.domain.user.CommuneExt;
import com.ctrip.fun.golf.domain.user.UserExt; import com.ctrip.fun.golf.domain.user.UserExt;
import com.ctrip.fun.golf.service.GenericService; import com.ctrip.fun.golf.service.GenericService;
import com.ctrip.fun.golf.vo.PagedEntityBean;
public class ActiveCustomerService extends GenericService<ActiveCustomerDao, ActiveCustomer, Integer, ActiveCustomerBean> { public class ActiveCustomerService extends GenericService<ActiveCustomerDao, ActiveCustomer, Integer, ActiveCustomerBean> {
...@@ -28,6 +27,9 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac ...@@ -28,6 +27,9 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac
private UserExtDao userExtDao; private UserExtDao userExtDao;
private CommuneExtDao communeExtDao; private CommuneExtDao communeExtDao;
@Autowired
private SystemOperateLogDao systemOperateLogDao;
@Override @Override
public ActiveCustomerDao getEntityDao() { public ActiveCustomerDao getEntityDao() {
return activeCustomerDao; return activeCustomerDao;
...@@ -102,6 +104,19 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac ...@@ -102,6 +104,19 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac
} }
public Response<Object> updateOpenOrderPerson(String userId,ActiveCustomerQuery query) {
Response<Object> response = new Response<Object>();
ActiveCustomer activeCustomer = activeCustomerDao.findById(query.getId());
SystemOperateLog sysLog = new SystemOperateLog(new Date(),userId,"1", "[业绩id:"+query.getId()+",原推荐人:"+activeCustomer.getSaleMobile()+",修改为:"+query.getSaleMobile()+"]");
systemOperateLogDao.save(sysLog);
activeCustomerDao.updateOpenOrderPerson(query);
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage("操作成功!");
response.setBody(1);
return response;
}
public Response<Object> insertOne(ActiveCustomerBean bean) { public Response<Object> insertOne(ActiveCustomerBean bean) {
//校验重复输入数据 //校验重复输入数据
Response<Object> response = new Response<Object>(); Response<Object> response = new Response<Object>();
...@@ -143,4 +158,6 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac ...@@ -143,4 +158,6 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac
} }
} }
src/main/java/com/ctrip/fun/golf/service/user/UserService.java
...@@ -3275,9 +3275,12 @@ public class UserService { ...@@ -3275,9 +3275,12 @@ public class UserService {
public List<RecommendRankBean> getRanking3600() { public List<RecommendRankBean> getRanking3600() {
// Integer activitys[] = {9}; List<RecommendRankBean> rankingList = userExtDao.getRankingByActivityId(9,"3600");
List<RecommendRankBean> rankingList = userExtDao.getRanking3600();
return rankingList; return rankingList;
} }
public List<RecommendRankBean> getRankingWys() {
List<RecommendRankBean> rankingList = userExtDao.getRankingByActivityId(10,"2380");
return rankingList;}
} }
src/main/resources/hibernate.cfg.xml
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<mapping class="com.ctrip.fun.golf.domain.user.OrderedCourse" /> <mapping class="com.ctrip.fun.golf.domain.user.OrderedCourse" />
<mapping class="com.ctrip.fun.golf.domain.system.Template" /> <mapping class="com.ctrip.fun.golf.domain.system.Template" />
<mapping class="com.ctrip.fun.golf.domain.system.SystemOperateLog" />
<mapping class="com.ctrip.fun.golf.domain.friend.Friend" /> <mapping class="com.ctrip.fun.golf.domain.friend.Friend" />
<mapping class="com.ctrip.fun.golf.domain.game.GamePlayer" /> <mapping class="com.ctrip.fun.golf.domain.game.GamePlayer" />
......
src/main/resources/system.spring.xml
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
<bean name="templateDao" class="com.ctrip.fun.golf.dao.system.TemplateDao"> <bean name="templateDao" class="com.ctrip.fun.golf.dao.system.TemplateDao">
<property name="sessionFactory" ref="sessionFactory"></property> <property name="sessionFactory" ref="sessionFactory"></property>
</bean> </bean>
<bean name="systemOperateLogDao" class="com.ctrip.fun.golf.dao.system.SystemOperateLogDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</bean>
<bean name="templateService" class="com.ctrip.fun.golf.service.system.TemplateService"> <bean name="templateService" class="com.ctrip.fun.golf.service.system.TemplateService">
<property name="templateDao" ref="templateDao"></property> <property name="templateDao" ref="templateDao"></property>
</bean> </bean>
......
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