Commit 8704da13 by chongli

修改开单人

parent 59e307b8
package com.ctrip.fun.golf.api.order;
import org.springframework.beans.factory.annotation.Autowired;
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.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.VoucherOrderListExcelBean;
import com.ctrip.fun.common.vo.order.VoucherOrderProcessBean;
......@@ -25,5 +30,16 @@ public class OpVoucherOrderController extends AbstractOpOrderController<VoucherO
AbstractOpOrderService<VoucherOrderProcessBean, OpVoucherOrderBean, VoucherOrderListBean, VoucherOrderListExcelBean> getOpOrderService() {
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;
}
}
......@@ -55,6 +55,14 @@ public class ActiveCustomerController {
return response;
}
@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;
}
......
......@@ -57,6 +57,7 @@ import com.ctrip.fun.common.vo.product.ProductPaymentTypeEnum;
import com.ctrip.fun.common.vo.product.ResourceTypeEnum;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
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.vo.PagedEntityBean;
import com.ctrip.fun.mall.vo.order.MallOrderListItemBean;
......@@ -2269,5 +2270,18 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
return pagedResponseBean;
}
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();
}
}
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> {
}
......@@ -138,6 +138,16 @@ public class ActiveCustomerDao extends GenericHibernateDao<ActiveCustomer, Integ
Integer rlt = query.executeUpdate();
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,
String productName) {
......
/**
* 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;
}
}
......@@ -6,8 +6,11 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
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.OpVoucherOrderBean;
import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
......@@ -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.VoucherOrderProcessBean;
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.domain.order.CommuneOrderItem;
import com.ctrip.fun.golf.domain.order.Order;
import com.ctrip.fun.golf.domain.order.OrderAssignment;
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>{
......@@ -30,6 +36,9 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr
private UserExtDao userExtDao;
private VoucherOrderItemDao voucherOrderItemDao;
@Autowired
private SystemOperateLogDao systemOperateLogDao;
/**
* TODO: 查询订单列表
......@@ -62,6 +71,18 @@ public class OpVoucherOrderService extends AbstractOpOrderService<VoucherOrderPr
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
public List queryOrderIds(Date playDate) {
......
package com.ctrip.fun.golf.service.user;
import java.io.Serializable;
import java.math.BigDecimal;
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.Response;
import com.ctrip.fun.common.vo.ResponseStatusEnum;
......@@ -13,20 +11,24 @@ import com.ctrip.fun.common.vo.user.ActiveCustomerAuditStatusEnum;
import com.ctrip.fun.common.vo.user.ActiveCustomerBean;
import com.ctrip.fun.common.vo.user.ActiveCustomerQuery;
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.CommuneExtDao;
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.CommuneExt;
import com.ctrip.fun.golf.domain.user.UserExt;
import com.ctrip.fun.golf.service.GenericService;
import com.ctrip.fun.golf.vo.PagedEntityBean;
public class ActiveCustomerService extends GenericService<ActiveCustomerDao, ActiveCustomer, Integer, ActiveCustomerBean> {
private ActiveCustomerDao activeCustomerDao;
private UserExtDao userExtDao;
private CommuneExtDao communeExtDao;
@Autowired
private SystemOperateLogDao systemOperateLogDao;
@Override
public ActiveCustomerDao getEntityDao() {
......@@ -101,6 +103,19 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac
return response;
}
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) {
//校验重复输入数据
......@@ -141,6 +156,8 @@ public class ActiveCustomerService extends GenericService<ActiveCustomerDao, Ac
public void setCommuneExtDao(CommuneExtDao communeExtDao) {
this.communeExtDao = communeExtDao;
}
}
......@@ -50,6 +50,7 @@
<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.SystemOperateLog" />
<mapping class="com.ctrip.fun.golf.domain.friend.Friend" />
<mapping class="com.ctrip.fun.golf.domain.game.GamePlayer" />
......
......@@ -6,6 +6,11 @@
<bean name="templateDao" class="com.ctrip.fun.golf.dao.system.TemplateDao">
<property name="sessionFactory" ref="sessionFactory"></property>
</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">
<property name="templateDao" ref="templateDao"></property>
</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