Skip to content

caosy / fun-golf-service

Go to a project
Commit c6d24a23 by unknown
Options

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

parents 2ba4601b b30f901c
Inline Side-by-side
Showing with 137 additions and 39 deletions
src/main/java/com/ctrip/fun/golf/api/order/OpCourseOrderController.java
......@@ -17,8 +17,10 @@ import com.ctrip.fun.common.vo.order.CourseOrderListBean;
import com.ctrip.fun.common.vo.order.CourseOrderListExcelBean;
import com.ctrip.fun.common.vo.order.CourseOrderProcessBean;
import com.ctrip.fun.common.vo.order.OpCourseOrderBean;
import com.ctrip.fun.common.vo.order.OrderItemSupplierBean;
import com.ctrip.fun.common.vo.order.OrderResourceBean;
import com.ctrip.fun.common.vo.order.OrderResourceQuery;
import com.ctrip.fun.golf.domain.order.OrderItem;
import com.ctrip.fun.golf.service.order.AbstractOpOrderService;
import com.ctrip.fun.golf.service.order.OpCourseOrderService;
......@@ -68,4 +70,31 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
return response;
}
/**
* 高秘专享
* 修改订单供应商
*
* @param request
* @return Response<Serializable> Response<Serializable>
*/
@SuppressWarnings("unchecked")
@ResponseBody
@RequestMapping(value = "/updateOrderItemSupplier", method = RequestMethod.POST)
public Response<Serializable> updateOrderItemSupplier(@RequestBody Request<OrderItemSupplierBean> request) {
OrderItemSupplierBean bean = request.getBody();
opCourseOrderService.updateOrderItemSupplier(bean);
// this.getOpOrderService().updateOnlineOrderFlag(orderProcessBean);
Response<Serializable> response = new Response<Serializable>();
response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
return response;
}
}
src/main/java/com/ctrip/fun/golf/dao/product/CourseResourceDao.java
......@@ -55,17 +55,27 @@ public class CourseResourceDao extends GenericHibernateDao<CourseResource, Integ
}
public void setStatus(CourseResourceStatusBean courseResourceStatusBean) {
String hql = "update CourseResource set status=:status where id in ("
+ StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")";
// String hql = "update CourseResource set status=:status,updateUser=:updateUser where id in ("
// + StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")";
StringBuffer hql = new StringBuffer();
hql.append( "update CourseResource set status=:status");
if(org.apache.commons.lang.StringUtils.isNotBlank( courseResourceStatusBean.getUpdateUser())){
hql.append(" ,updateUser=:updateUser");
}
hql.append(" where id in ("+ StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")");
Session session = this.getSession();
String[] ids = courseResourceStatusBean.getResourceIds().split(",");
Integer[] ia = new Integer[ids.length];
for (int i = 0; i < ids.length; i++) {
ia[i] = Integer.parseInt(ids[i]);
}
session.createQuery(hql)
.setParameter("status", courseResourceStatusBean.getResourceStatus())
.executeUpdate();
Query query = session.createQuery(hql.toString())
.setParameter("status", courseResourceStatusBean.getResourceStatus());
if(org.apache.commons.lang.StringUtils.isNotBlank( courseResourceStatusBean.getUpdateUser())){
query.setParameter("updateUser", courseResourceStatusBean.getUpdateUser());
}
query.executeUpdate();
}
public int minusInvtory(Integer id, int num) {
......
src/main/java/com/ctrip/fun/golf/dao/product/ResourceInventoryDao.java
......@@ -7,12 +7,15 @@ import java.util.Map;
import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
import com.ctrip.fun.common.vo.product.ResourceTypeEnum;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Query;
import com.ctrip.fun.common.core.util.DateUtil;
import com.ctrip.fun.common.vo.product.ResourceInventoryBean;
import com.ctrip.fun.golf.dao.GenericHibernateDao;
import com.ctrip.fun.golf.domain.product.ResourceInventory;
import org.hibernate.criterion.CriteriaSpecification;
/**
......@@ -114,15 +117,20 @@ public class ResourceInventoryDao extends GenericHibernateDao<ResourceInventory,
* @param model
*/
public void saveOrUpdateByUniqueKey(ResourceInventory model) {
String sql = new StringBuilder().append("INSERT INTO prd_resourceInventory (ResourceCategory, ResourceID, Size, TheDate, Used) VALUES (:resourceCategory, :resourceId, :size, :theDate, :used) ")
.append("ON DUPLICATE KEY UPDATE Size = :size, Used = :used").toString();
Query query = this.getSession().createSQLQuery(sql);
StringBuilder sql = new StringBuilder().append("INSERT INTO prd_resourceInventory (ResourceCategory, ResourceID, Size, TheDate, Used) VALUES (:resourceCategory, :resourceId, :size, :theDate, :used) ")
.append("ON DUPLICATE KEY UPDATE Size = :size, Used = :used");
if(StringUtils.isNotBlank( model.getUpdateUser())){
sql.append(",updateUser=:updateUser");
}
Query query = this.getSession().createSQLQuery(sql.toString());
query.setParameter("resourceCategory", model.getResourceCategory());
query.setParameter("resourceId", model.getResourceId());
query.setParameter("size", model.getSize());
query.setParameter("theDate", model.getTheDate());
query.setParameter("used", model.getUsed());
if(StringUtils.isNotBlank( model.getUpdateUser())){
query.setParameter("updateUser", model.getUpdateUser());
}
query.executeUpdate();
}
}
src/main/java/com/ctrip/fun/golf/dao/tour/TourBasicDao.java
......@@ -55,7 +55,7 @@ public class TourBasicDao extends GenericHibernateDao<TourBasic, Integer> {
*/
public PagedResponseBean<TourBean> search(TourBasicQuery tourBasicQuery) {
Map<String, Object> parameters = new HashMap<String, Object>();
String subSql = "select GROUP_CONCAT(DATE_FORMAT(priceDate,\"%c/%e\") ORDER BY priceDate ASC) as departureDays,min(adultPrice) as adultPrice,tourId from tur_price tp inner join tur_tourbasic tour1 on tp.tourId=tour1.id where tp.status=:priceStatus and priceDate>=DATE_ADD('"
String subSql = "select GROUP_CONCAT(DATE_FORMAT(priceDate,'%c/%e') ORDER BY priceDate ASC) as departureDays,min(adultPrice) as adultPrice,tourId from tur_price tp inner join tur_tourbasic tour1 on tp.tourId=tour1.id where tp.status=:priceStatus and priceDate>=DATE_ADD('"
+ DateUtil.getDateStr(new Date()) + "',INTERVAL advanceDays day)";
if (tourBasicQuery.getPriceDate() != null) {
subSql = subSql + " and priceDate=:priceDate";
......
src/main/java/com/ctrip/fun/golf/domain/product/CourseResource.java
......@@ -189,6 +189,8 @@ public class CourseResource implements java.io.Serializable {
* 是否热门活动
*/
private Boolean hotEvent;
private String updateUser;
/**
* 赛事限制人员uid
......@@ -579,4 +581,12 @@ public class CourseResource implements java.io.Serializable {
this.eventLimitUids = eventLimitUids;
}
public String getUpdateUser() {
return updateUser;
}
public void setUpdateUser(String updateUser) {
this.updateUser = updateUser;
}
}
src/main/java/com/ctrip/fun/golf/domain/product/ResourceInventory.java
......@@ -55,6 +55,8 @@ public class ResourceInventory implements java.io.Serializable {
* 创建时间
*/
private Date createdTime;
private String updateUser;
@Id
@GeneratedValue(strategy = IDENTITY)
......@@ -134,4 +136,12 @@ public class ResourceInventory implements java.io.Serializable {
this.used = used;
}
public String getUpdateUser() {
return updateUser;
}
public void setUpdateUser(String updateUser) {
this.updateUser = updateUser;
}
}
src/main/java/com/ctrip/fun/golf/domain/product/ResourcePrice.java
......@@ -114,6 +114,9 @@ public class ResourcePrice implements java.io.Serializable {
* 社员嘉宾立减
*/
private Double communeGuestMinus;
private String updateUser;
@Id
@GeneratedValue(strategy = IDENTITY)
......@@ -313,4 +316,12 @@ public class ResourcePrice implements java.io.Serializable {
this.communeGuestMinus = communeGuestMinus;
}
public String getUpdateUser() {
return updateUser;
}
public void setUpdateUser(String updateUser) {
this.updateUser = updateUser;
}
}
src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java
......@@ -1322,6 +1322,7 @@ public class AsmCourseResourceService {
bean.setCancelTips(model.getCancelTips());
bean.setPaymentType(model.getPaymentType());
bean.setResourceName(model.getResourceName());
bean.setCashRebate(model.getCashRebate());
// bean.setProductName(model.getName()); // db中无ProductName，取name
bean.setProductName(model.getProductName());
map.put(bean.getResourceId(), bean);
......
src/main/java/com/ctrip/fun/golf/service/order/CourseOrderService.java
......@@ -33,6 +33,7 @@ import com.ctrip.fun.common.vo.operation.ResourceConfirmTypeEnum;
import com.ctrip.fun.common.vo.order.CourseOrderBean;
import com.ctrip.fun.common.vo.order.CourseOrderListItemBean;
import com.ctrip.fun.common.vo.order.CourseOrderResourceBean;
import com.ctrip.fun.common.vo.order.CustomerInfoBean;
import com.ctrip.fun.common.vo.order.OrderQuery;
import com.ctrip.fun.common.vo.order.OrderSourceEnum;
import com.ctrip.fun.common.vo.order.OrderStatusEnum;
......@@ -489,7 +490,8 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
if (courseOrderBean.getResourceList() != null) {
for (CourseOrderResourceBean courseOrderResourceBean : courseOrderBean.getResourceList()) {
if (courseOrderResourceBean.getCashRebate() != null) {
totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate());
totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate());
// totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate().multiply(BigDecimal.valueOf(courseOrderBean.getCustomerInfoList().size())));
}
}
......
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
......@@ -34,6 +34,7 @@ import com.ctrip.fun.common.vo.order.InvoiceBean;
import com.ctrip.fun.common.vo.order.OfflinePayTypeEnum;
import com.ctrip.fun.common.vo.order.OpCourseOrderBean;
import com.ctrip.fun.common.vo.order.OpOrderQuery;
import com.ctrip.fun.common.vo.order.OrderItemSupplierBean;
import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
import com.ctrip.fun.common.vo.order.OrderProcessEnum;
import com.ctrip.fun.common.vo.order.OrderResourceBean;
......@@ -1149,6 +1150,18 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
}*/
return orderResourceBeans;
}
/**
*
* @param orderItem
*/
public void updateOrderItemSupplier(OrderItemSupplierBean orderItem) {
StringBuffer hql = new StringBuffer();
hql.append("update OrderItem set supplierId="+orderItem.getSupplierId()+",supplierName='"+orderItem.getSupplierName()+"' where orderId="+orderItem.getOrderId());
supplierDao.getSessionFactory().getCurrentSession().createQuery(hql.toString()).executeUpdate();
}
public List<OrderResourceBean> getOutDateResource(OrderQueryBean queryBean){
return resourcePriceDao.getAllResourceList(queryBean);
......
src/main/java/com/ctrip/fun/golf/service/product/CourseResourceService.java
......@@ -157,23 +157,25 @@ public class CourseResourceService extends
.getResourceSiblings(resourceInventoryBean.getResourceId());
for (Date date : dates) {
for (Integer resourceId : siblingResourceIds) {
ResourceInventory resourceInventory = new ResourceInventory();
BeanConverter.copyProperties(resourceInventory, resourceInventoryBean);
resourceInventory.setTheDate(date);
resourceInventory.setResourceId(resourceId);
this.resourceInventoryDao.saveOrUpdateByUniqueKey(resourceInventory);
}
// ResourceInventory resource = this.resourceInventoryDao.getResourceInventory(date,
// resourceInventory.getResourceId(),
// ResourceCategoryEnum.COURSE.getValue());
// if (resource != null) {
// resourceInventory.setId(resource.getId());
// this.resourceInventoryDao.merge(resourceInventory);
// } else {
// this.resourceInventoryDao.save(resourceInventory);
// }
if(date!=null){
for (Integer resourceId : siblingResourceIds) {
ResourceInventory resourceInventory = new ResourceInventory();
BeanConverter.copyProperties(resourceInventory, resourceInventoryBean);
resourceInventory.setTheDate(date);
resourceInventory.setResourceId(resourceId);
this.resourceInventoryDao.saveOrUpdateByUniqueKey(resourceInventory);
}
// ResourceInventory resource = this.resourceInventoryDao.getResourceInventory(date,
// resourceInventory.getResourceId(),
// ResourceCategoryEnum.COURSE.getValue());
// if (resource != null) {
// resourceInventory.setId(resource.getId());
// this.resourceInventoryDao.merge(resourceInventory);
// } else {
// this.resourceInventoryDao.save(resourceInventory);
// }
}
}
}
......@@ -1126,17 +1128,19 @@ public class CourseResourceService extends
// Date[] dates = DateUtil.getDates(resourcePriceBean.getStartDate(),resourcePriceBean.getEndDate(), resourcePriceBean.getWeekdayStr());
Date[] dates = resourcePriceBean.getTheDate();
for (Date date : dates) {
ResourcePrice resourcePrice = new ResourcePrice();
BeanConverter.copyProperties(resourcePrice, resourcePriceBean);
resourcePrice.setPriceDate(date);
ResourcePrice price = this.resourcePriceDao.getResourcePrice(date,
resourcePriceBean.getResourceId());
if (price != null) {
resourcePrice.setId(price.getId());
this.resourcePriceDao.merge(resourcePrice);
} else {
this.resourcePriceDao.save(resourcePrice);
}
if(date!=null){
ResourcePrice resourcePrice = new ResourcePrice();
BeanConverter.copyProperties(resourcePrice, resourcePriceBean);
resourcePrice.setPriceDate(date);
ResourcePrice price = this.resourcePriceDao.getResourcePrice(date,
resourcePriceBean.getResourceId());
if (price != null) {
resourcePrice.setId(price.getId());
this.resourcePriceDao.merge(resourcePrice);
} else {
this.resourcePriceDao.save(resourcePrice);
}
}
}
......
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