会员专享分区

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

@@ -44,7 +44,10 @@ public class BuyVoucherActivityDao extends GenericHibernateDao<BuyVoucherActivit
         if (null != queryBean.getUserLimit()) {
             criteria.add(Restrictions.eq("userLimit", queryBean.getUserLimit()));
         }  
- 
+        if (null != queryBean.getRegionCode()) {
+            criteria.add(Restrictions.or(Restrictions.eq("regionCode", queryBean.getRegionCode())
+            		,Restrictions.eq("regionCode", "0")));
+        } 
         criteria.setFirstResult(queryBean.getPagerOffset());
         criteria.setMaxResults(queryBean.getPagerPerPage());
         if (queryBean.getSortDirection().equals(SortDirectionEnum.ASC)) {

src/main/java/com/ctrip/fun/golf/domain/product/BuyVoucherActivity.java

@@ -48,7 +48,7 @@ public class BuyVoucherActivity implements java.io.Serializable {
 	private String actName;//活动名称
 	private String wishing;//祝福语
 	private BigDecimal grossPrice;// 毛利价
-
+	private String regionCode;  //区域   0-全区域,100-上海 ，110-广州，120-北京
 
 	@Id
 	@GeneratedValue(strategy = IDENTITY)
@@ -246,4 +246,12 @@ public class BuyVoucherActivity implements java.io.Serializable {
 		this.grossPrice = grossPrice;
 	}
 	
+	public String getRegionCode() {
+		return regionCode;
+	}
+
+	public void setRegionCode(String regionCode) {
+		this.regionCode = regionCode;
+	}
+	
 }

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

@@ -240,17 +240,8 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
     public Response<PlaceOrderResponseBean> placeOrder(H abstractOrderBean) throws Exception{
     	
         this.checkParameters(abstractOrderBean);
-        if( abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0 || abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2)==0){
-    		abstractOrderBean.setOrderCategory(16);;
-    	}
         if (this.beforePlaceOrder(abstractOrderBean)) {
         	this.adjustOrderPayAmount(abstractOrderBean);
-        	if("15993911776".equals(abstractOrderBean.getUid()) ){
-        		abstractOrderBean.setTotalAmount(new BigDecimal("0.01"));
-        		abstractOrderBean.setAmount(new BigDecimal("0.01"));
-        		abstractOrderBean.setAdjustAmount(new BigDecimal("0.01"));
-        		abstractOrderBean.setPrePayAmount(new BigDecimal("0.01"));
-        	}
             Order order = this.saveOrder(abstractOrderBean);
             this.saveOrUpdateInvoice(abstractOrderBean.getInvoice(), order);
             this.saveOrderItems(abstractOrderBean, order.getOrderId());
@@ -725,19 +716,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
         
         if (abstractOrderBean.getPrePayCardAmount().doubleValue() > 0 && (null == userExt || userExt.getPrePayCardAmount().compareTo(abstractOrderBean.getPrePayCardAmount()) < 0)) {
             throw new OrderException(-9, "预付卡金额不足");
-        }
-        if(abstractOrderBean.getOrderCategory() == 16){
-        	 	
-         	if((userExt.getVipGrade() == 0) && (abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2) == 0) ){
-         		throw new OrderException(-46,"您还不是社员！");
-         	}
-         
-         	
-         	if((userExt.getVipGrade() != 0) && (abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0)){
-         		throw new OrderException(-45, "您已经是社员!");
-         	}
-             	        
-        }       
+        }          
         this.checkVourcher(abstractOrderBean);
         this.checkInsurance(abstractOrderBean);
         this.checkOrderItem(abstractOrderBean);