Skip to content

caosy / fun-golf-service

Go to a project
Commit 2e56d3e4 by unknown
Options

resolve the null ponit of orderlist in adjustAmount

parent 9bad3376
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/main/java/com/ctrip/fun/golf/service/order/CourseOrderService.java
...@@ -470,10 +470,12 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co ...@@ -470,10 +470,12 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
BigDecimal vipDiscountAmount = new BigDecimal(0); BigDecimal vipDiscountAmount = new BigDecimal(0);
List<Order> orderList = this.getOrderDao().queryOrders(resInfo.getPlayDate(), orderBean.getUid()); List<Order> orderList = this.getOrderDao().queryOrders(resInfo.getPlayDate(), orderBean.getUid());
boolean isFirstOrderToday = true; boolean isFirstOrderToday = true;
for (Order order : orderList) { if(orderList != null){
if(order.isPay()&&order.getDiscountAmount().compareTo(BigDecimal.ZERO)>0){ for (Order order : orderList) {
isFirstOrderToday = false; if(order.isPay()&&order.getDiscountAmount().compareTo(BigDecimal.ZERO)>0){
break; isFirstOrderToday = false;
break;
}
} }
} }
if(isVipMember && isFirstOrderToday){ if(isVipMember && isFirstOrderToday){
......
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