Commit eea9ed32 by zhangchen

1.更改查询条件

parent 7b9fc89c
......@@ -472,7 +472,6 @@ public class AsmCourseResourceController {
productTeePriceBean.setTeeTime(asmCourseresource.getTeeTime());
responseList.add(productTeePriceBean);
}
respose.setBody(responseList);
return respose;
}
......
package com.ctrip.fun.golf.dao.assemble;
import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -43,6 +42,7 @@ import com.ctrip.fun.common.vo.product.CourseProductStatusEnum;
import com.ctrip.fun.common.vo.product.CourseResourceStatusEnum;
import com.ctrip.fun.common.vo.product.CourseStatusEnum;
import com.ctrip.fun.common.vo.product.FlashSaleResourceQuery;
import com.ctrip.fun.common.vo.product.ProductTeePriceBean;
import com.ctrip.fun.common.vo.product.ProductTypeEnum;
import com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum;
import com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum;
......@@ -2030,14 +2030,15 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
* @param priceDate
* @return
*/
public List<AsmCourseresource> getProductPriceList(Integer productId, Date priceDate) {
Criteria criteria = this.createCriteria();
public List<AsmCourseresource> getProductPriceList(Integer courseID, Date priceDate) {
StringBuilder sb = new StringBuilder("SELECT *,min(SalePrice) SalePrice FROM asm_courseresource WHERE CourseID =:courseID AND PriceDate=:priceDate GROUP BY teeTime");
Session session = this.getSession();
Query query = session.createSQLQuery(sb.toString()).addEntity(AsmCourseresource.class);
query.setParameter("courseID", courseID);
query.setParameter("priceDate", priceDate);
criteria.add(Restrictions.eq("productId", productId));
criteria.add(Restrictions.eq("priceDate", priceDate));
return criteria.list();
return query.list();
}
}
......@@ -45,6 +45,7 @@ import com.ctrip.fun.common.vo.product.CourseProductStatusEnum;
import com.ctrip.fun.common.vo.product.CourseResourceStatusEnum;
import com.ctrip.fun.common.vo.product.CourseTeeTimeQuery;
import com.ctrip.fun.common.vo.product.GetAsmResourcePriceResponseBean;
import com.ctrip.fun.common.vo.product.ProductTeePriceBean;
import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
import com.ctrip.fun.common.vo.product.ResourceInventoryTypeEnum;
import com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum;
......@@ -72,7 +73,6 @@ import com.ctrip.fun.golf.service.client.ClientConfigService;
import com.ctrip.fun.golf.service.order.EventCustomerInfoService;
import com.ctrip.fun.golf.utils.DistrictUtil;
import com.ctrip.fun.golf.vo.PagedEntityBean;
import com.mysql.fabric.xmlrpc.base.Array;
public class AsmCourseResourceService {
......@@ -1351,8 +1351,8 @@ public class AsmCourseResourceService {
return map;
}
public List<AsmCourseresource> getProductPriceList(Integer productId, Date priceDate) {
List<AsmCourseresource> models = asmCourseResourceDao.getProductPriceList(productId, priceDate);
public List<AsmCourseresource> getProductPriceList(Integer courseID, Date priceDate) {
List<AsmCourseresource> models = asmCourseResourceDao.getProductPriceList(courseID, priceDate);
return models;
}
......
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