repair that changeresource error when in the same time

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

@@ -1052,15 +1052,24 @@ public class OpEventActivityOrderService
                 .getOrderItemByOrderId(orderProcessBean.getOrderId());
                 .getOrderItemByOrderId(orderProcessBean.getOrderId());
         if (orderItems != null && orderItems.size() > 0) {
         if (orderItems != null && orderItems.size() > 0) {
             EventActivityOrderItem orderItem = orderItems.get(0);
             EventActivityOrderItem orderItem = orderItems.get(0);
+            String oldTeeTime = orderItem.getTeeTime();
+            String newTeeTime = orderProcessBean.getTeeTime();
+            if(oldTeeTime != null && oldTeeTime.equals(newTeeTime)){
+            	//相同的时间不需要修改了
+            	return;
+            }
             StringBuilder desc = new StringBuilder("原TeeTime[").append(orderItem.getTeeTime())
             StringBuilder desc = new StringBuilder("原TeeTime[").append(orderItem.getTeeTime())
                     .append("] 改为 [").append(orderProcessBean.getTeeTime()).append("]");
                     .append("] 改为 [").append(orderProcessBean.getTeeTime()).append("]");
-            orderItem.setTeeTime(orderProcessBean.getTeeTime());
             //非实时teetime资源不支持后台换组
             //非实时teetime资源不支持后台换组
             if(orderItem.getRealTimeTeeTimeType() == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
             if(orderItem.getRealTimeTeeTimeType() == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
+            	orderItem.setTeeTime(orderProcessBean.getTeeTime());
             	this.eventActivityOrderItemDao.update(orderItem);
             	this.eventActivityOrderItemDao.update(orderItem);
             	orderProcessBean.setProcessDesc(desc.toString());
             	orderProcessBean.setProcessDesc(desc.toString());
+            	this.processSuccessedOrderLog(orderProcessBean);
+            	if(orderProcessBean.isSendMsg()){
+		    		this.sendMsg(orderProcessBean);
+		    	}
             }else{
             }else{
-            	String newTeeTime = orderProcessBean.getTeeTime();
             	if(newTeeTime != null){
             	if(newTeeTime != null){
             		String[] teetimes = newTeeTime.split(":");
             		String[] teetimes = newTeeTime.split(":");
             		if(teetimes != null && teetimes.length ==2 ){
             		if(teetimes != null && teetimes.length ==2 ){
@@ -1079,7 +1088,12 @@ public class OpEventActivityOrderService
             				this.changeResourceInventory(newResourceId, orderItem.getPlayDate(), -size);
             				this.changeResourceInventory(newResourceId, orderItem.getPlayDate(), -size);
             				//变更后，在orderItem表里面将资源id变更掉
             				//变更后，在orderItem表里面将资源id变更掉
             				orderItem.setResourceId(newResourceId);
             				orderItem.setResourceId(newResourceId);
+            				orderItem.setTeeTime(orderProcessBean.getTeeTime());
             				this.eventActivityOrderItemDao.update(orderItem);
             				this.eventActivityOrderItemDao.update(orderItem);
+            		    	this.processSuccessedOrderLog(orderProcessBean);
+            		    	if(orderProcessBean.isSendMsg()){
+            		    		this.sendMsg(orderProcessBean);
+            		    	}
             			}else{
             			}else{
             				throw new OrderException(ResponseStatusEnum.FAIL.getValue(), "该teetime没有资源或者价格不一样，请更换！");
             				throw new OrderException(ResponseStatusEnum.FAIL.getValue(), "该teetime没有资源或者价格不一样，请更换！");
             			}
             			}
@@ -1128,8 +1142,6 @@ public class OpEventActivityOrderService
     
     
     public void confirmEventActivityOrderResourceTeeTime(EventActivityOrderProcessBean orderProcessBean) {
     public void confirmEventActivityOrderResourceTeeTime(EventActivityOrderProcessBean orderProcessBean) {
     	this.changeResource(orderProcessBean);
     	this.changeResource(orderProcessBean);
-    	this.processSuccessedOrderLog(orderProcessBean);
-    	this.sendMsg(orderProcessBean);
     }
     }
 
 
 }
 }