set limit totalAmount>=caculateAmount and remove checkEventActivitySingelOrderLimit(Order)

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

@@ -745,7 +745,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
      */
     protected void checkTotalAmount(H abstractOrderBean) {
         BigDecimal totAmount = getTotalAmount(abstractOrderBean);
-        if (totAmount.compareTo(abstractOrderBean.getAmount()) != 1) {
+        if (totAmount.compareTo(abstractOrderBean.getAmount()) == 1) {
             throw new OrderException(-5, "订单金额计算有误");
         }
     }

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

@@ -641,14 +641,14 @@ public class EventActivityOrderService extends
             if (orderList == null || orderList.size() == 0)
                 return false;
             else {
-                for (Order order : orderList) {
+                /*for (Order order : orderList) {
                     if (order.isPaied()) {
                         logger.info("同一天只能参加一场赛事活动，不能重复参加, uid = " + uid + ", resourceId = " + resourceId
                                 + ", playDate =" + priceDate + ", orderId = " + order.getOrderId());
 //                        throw new OrderException(-25, "您已参加此赛事，请勿重复参加！");
                         throw new OrderException(-25, "同一天只能参加一场赛事活动，可以去订单中心取消更换赛事！");
                     }
-                }
+                }*/
                 return false;
             }
         }
@@ -796,7 +796,7 @@ public class EventActivityOrderService extends
                                 (BigDecimal.valueOf(resourcePrice.getCommuneGuestPrice())
                                         .subtract(BigDecimal.valueOf(resourcePrice
                                                 .getCommuneGuestMinus()))))).doubleValue();
-                if (resourceInfo.getAmount().compareTo(BigDecimal.valueOf(amount)) != -1) {  //如果金额大于或者等于实际金额正常
+                if (resourceInfo.getAmount().compareTo(BigDecimal.valueOf(amount)) == -1) {  //如果金额大于或者等于实际金额正常
                     throw new OrderException(-5, "订单金额计算有误");
                 } else if (!resourcePrice.getCommunePrice().equals(resourceInfo.getCommunePrice())
                         || !resourcePrice.getCommuneMinus().equals(resourceInfo.getCommuneMinus())

src/main/java/com/ctrip/fun/golf/service/payment/EventActivityNotifyService.java

@@ -126,7 +126,7 @@ public class EventActivityNotifyService extends AbstractNotifyService {
             Date priceDate = eventActivityOrderItems.get(0).getPlayDate();
             String uid = order.getUid();
             List<Order> orderList = getOrderDao().queryEventActivityOrders(priceDate, uid, resourceId);
-            if (orderList != null && orderList.size() > 0) {
+            /*if (orderList != null && orderList.size() > 0) {
                 for (Order otherOrder : orderList) {
                     if (otherOrder.isPaied() && otherOrder.getOrderId() != order.getOrderId()) {
                         logger.info("同一天只能参加一场赛事活动，不能重复参加, uid = " + uid + ", resourceId = " + resourceId + ", playDate =" + priceDate + ", orderId = " + otherOrder.getOrderId());
@@ -134,7 +134,7 @@ public class EventActivityNotifyService extends AbstractNotifyService {
                         throw new OrderException(-25, "同一天只能参加一场赛事活动，可以去订单中心取消更换赛事！");
                     }
                 }
-            }
+            }*/
 
             ResourceInventoryQuery resourceInventoryQuery = new ResourceInventoryQuery();
             resourceInventoryQuery.setResourceCategory(ResourceCategoryEnum.COURSE.getValue());
@@ -152,7 +152,7 @@ public class EventActivityNotifyService extends AbstractNotifyService {
 
     @Override
     protected void checkEventActivitySingelOrderLimit(Order order) {
-        List<EventActivityOrderItem> eventActivityOrderItems = this.eventActivityOrderItemDao.getOrderItemByOrderId(order.getOrderId());
+    	/*List<EventActivityOrderItem> eventActivityOrderItems = this.eventActivityOrderItemDao.getOrderItemByOrderId(order.getOrderId());
         if (eventActivityOrderItems != null && eventActivityOrderItems.size() > 0 && order.getCancelStatus() == 0) {
             int resourceId = eventActivityOrderItems.get(0).getResourceId();
             Date priceDate = eventActivityOrderItems.get(0).getPlayDate();
@@ -168,7 +168,7 @@ public class EventActivityNotifyService extends AbstractNotifyService {
                     }
                 }
             }
-        }
+        }*/
     }
 
     @Override