Skip to content

caosy / fun-golf-service

Go to a project
Commit 43e8ac55 by caosy
Options

APP 会员专享

parent 0eebd7e3
Inline Side-by-side
Showing with 15 additions and 15 deletions
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
...@@ -238,10 +238,11 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex ...@@ -238,10 +238,11 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
} }
public Response<PlaceOrderResponseBean> placeOrder(H abstractOrderBean) throws Exception{ public Response<PlaceOrderResponseBean> placeOrder(H abstractOrderBean) throws Exception{
if( abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0 || abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2)==0){
this.checkParameters(abstractOrderBean);
if( abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0 || abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2)==0){
abstractOrderBean.setOrderCategory(16);; abstractOrderBean.setOrderCategory(16);;
} }
this.checkParameters(abstractOrderBean);
if (this.beforePlaceOrder(abstractOrderBean)) { if (this.beforePlaceOrder(abstractOrderBean)) {
this.adjustOrderPayAmount(abstractOrderBean); this.adjustOrderPayAmount(abstractOrderBean);
if("15993911776".equals(abstractOrderBean.getUid()) ){ if("15993911776".equals(abstractOrderBean.getUid()) ){
...@@ -725,19 +726,18 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex ...@@ -725,19 +726,18 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
if (abstractOrderBean.getPrePayCardAmount().doubleValue() > 0 && (null == userExt || userExt.getPrePayCardAmount().compareTo(abstractOrderBean.getPrePayCardAmount()) < 0)) { if (abstractOrderBean.getPrePayCardAmount().doubleValue() > 0 && (null == userExt || userExt.getPrePayCardAmount().compareTo(abstractOrderBean.getPrePayCardAmount()) < 0)) {
throw new OrderException(-9, "预付卡金额不足"); throw new OrderException(-9, "预付卡金额不足");
} }
if(userExt.getVipGrade() == VipGradeEnum.NONEVIP.getKey() || userExt.getVipGrade() == VipGradeEnum.VIP1.getKey() ){ //新社员缴费 if(abstractOrderBean.getOrderCategory() == 16){
if(abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2) == 0 ){ if((userExt.getVipGrade() == 0) && (abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT2) == 0) ){
throw new OrderException(-46,"您还不是社员！"); throw new OrderException(-46,"您还不是社员！");
} }
}
if ((userExt.getVipGrade() & VipGradeEnum.VIP2.getKey()) == VipGradeEnum.VIP2.getKey() ) { //老社员续费
if((userExt.getVipGrade() != 0) && (abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0)){
if(abstractOrderBean.getAmount().compareTo(COMMUNE_AMOUNT)==0){ throw new OrderException(-45, "您已经是社员!");
throw new OrderException(-45, "您已经是社员!"); }
}
}
}
this.checkVourcher(abstractOrderBean); this.checkVourcher(abstractOrderBean);
this.checkInsurance(abstractOrderBean); this.checkInsurance(abstractOrderBean);
this.checkOrderItem(abstractOrderBean); this.checkOrderItem(abstractOrderBean);
......
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