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

src/main/java/com/ctrip/fun/golf/dao/product/CourseResourceDao.java

@@ -58,8 +58,7 @@ public class CourseResourceDao extends GenericHibernateDao<CourseResource, Integ
 //        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 where id in ("
-                + StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")");
+        hql.append( "update CourseResource set status=:status");
         if(org.apache.commons.lang.StringUtils.isNotBlank( courseResourceStatusBean.getUpdateUser())){
         	hql.append(" ,updateUser=:updateUser");
         }

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/ResourcePrice.java

@@ -99,10 +99,6 @@ public class ResourcePrice implements java.io.Serializable {
      * 社员价
      */
     private Double communePrice;
-    /**
-     * 社员价
-     */
-    private Double vipPrice;
     
     /**
      * 社员立减金额
@@ -119,6 +115,21 @@ public class ResourcePrice implements java.io.Serializable {
      */
     private Double communeGuestMinus;
     
+    /**
+     * vip首单立减
+     */
+    private Double vipFirstReduction;
+    
+    /**
+     * vip随机立减最小值
+     */
+    private Double vipMinRandom;
+    
+    /**
+     * vip随机立减最大值
+     */
+    private Double vipMaxRandom;
+    
     
     private String updateUser;
 
@@ -304,7 +315,34 @@ public class ResourcePrice implements java.io.Serializable {
         return communeGuestMinus;
     }
 
-    public void setCommunePrice(Double communePrice) {
+    @Column(name="vipFirstReduction")
+    public Double getVipFirstReduction() {
+		return vipFirstReduction;
+	}
+
+    @Column(name="vipMinRandom")
+	public Double getVipMinRandom() {
+		return vipMinRandom;
+	}
+
+    @Column(name="vipMaxRandom")
+	public Double getVipMaxRandom() {
+		return vipMaxRandom;
+	}
+
+	public void setVipFirstReduction(Double vipFirstReduction) {
+		this.vipFirstReduction = vipFirstReduction;
+	}
+
+	public void setVipMinRandom(Double vipMinRandom) {
+		this.vipMinRandom = vipMinRandom;
+	}
+
+	public void setVipMaxRandom(Double vipMaxRandom) {
+		this.vipMaxRandom = vipMaxRandom;
+	}
+
+	public void setCommunePrice(Double communePrice) {
         this.communePrice = communePrice;
     }
 
@@ -328,13 +366,4 @@ public class ResourcePrice implements java.io.Serializable {
 		this.updateUser = updateUser;
 	}
 
-    @Column(name="vipPrice")
-	public Double getVipPrice() {
-		return vipPrice;
-	}
-
-	public void setVipPrice(Double vipPrice) {
-		this.vipPrice = vipPrice;
-	}
-
 }

src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java

@@ -580,6 +580,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
     protected abstract void returnInventory(Order order, boolean isForce);
 
     /**
+     * 检查传入参数
      * @param abstractOrderBean
      */
     protected void checkParameters(H abstractOrderBean) {

src/main/java/com/ctrip/fun/golf/service/order/CourseOrderService.java

@@ -410,6 +410,8 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
     }
 
     /**
+     * 赞助活动余额检查 
+     * 会员价校验
      * @param courseOrderBean
      * @return
      * @see com.ctrip.fun.golf.service.order.AbstractOrderService#beforePlaceOrder(com.ctrip.fun.common.vo.order2.courseOrderBean)
@@ -425,7 +427,7 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
         if (courseOrderBean.getUseMemberPrice() != null && courseOrderBean.getUseMemberPrice()) {
             this.checkMemberOrder(courseOrderBean);
         }
-
+        // 闪购价格校验
         FlashSaleCheckQuery flashSaleCheckQuery = new FlashSaleCheckQuery();
         flashSaleCheckQuery.setPriceDate(DateUtil.getDateStr(courseOrderBean.getResourceList().get(0).getPlayDate()));
         flashSaleCheckQuery.setResourceId(courseOrderBean.getResourceList().get(0).getResourceId());
@@ -486,7 +488,7 @@ 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().multiply(BigDecimal.valueOf(courseOrderBean.getCustomerInfoList().size())));
+                    	totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate());
                     }
 
                 }
@@ -608,6 +610,7 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
     }
 
     /**
+     * 保存订单附属表信息
      * @param courseOrderBean
      * @see com.ctrip.fun.golf.service.order.AbstractOrderService#saveOrderItems(com.ctrip.fun.common.vo.order2.courseOrderBean)
      */