optimize the part refund

src/main/java/com/ctrip/fun/golf/dao/order/EventCustomerInfoDao.java

@@ -64,7 +64,6 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
         String hql = " from EventCustomerInfo where orderId =:orderId and validFlag=true";
         return this.getSession().createQuery(hql).setParameter("orderId", orderId).list();
     }
-
     public List<EventCustomerInfo> getAllCustomerInfoListByOrderId(int orderId) {
         String hql = " from EventCustomerInfo where orderId =:orderId";
         return this.getSession().createQuery(hql).setParameter("orderId", orderId).list();

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

@@ -117,15 +117,17 @@ public class EventCustomerInfoService extends
     	return num;
     }
     
-    public void updateEventCustomerByPlayerNum(Integer orderId, List<Integer> playerNum){
+    public int updateEventCustomerByPlayerNum(Integer orderId, List<Integer> playerNum){
     	List<EventCustomerInfo> eventCustomerInfos = eventCustomerInfoDao
-    			.getCustomerInfoListByOrderId(orderId);
+    			.getAllCustomerInfoListByOrderId(orderId);
+    	int validNum=0;
     	if(eventCustomerInfos!=null){
     		for (int i = 0; i < playerNum.size(); i++) {
 				int playerId = playerNum.get(i).intValue();
 				for (int j = 0; j < eventCustomerInfos.size(); j++) {
-					if(playerId == (j+1)){
+					if((playerId == (j+1)) && eventCustomerInfos.get(j).getValidFlag()){
 						//取消站位
+						validNum++;
 						this.eventCustomerInfoDao.updateCustomerById(eventCustomerInfos.get(j).getEventCustomerId(), false);
 						break;
 					}
@@ -133,6 +135,7 @@ public class EventCustomerInfoService extends
 			}
     		
     	}
+    	return validNum;
     }
     
 

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

@@ -489,28 +489,15 @@ public class OpEventActivityOrderService
                 this.courseResourceService.addInventory(resourceInventoryQuery, orderItems.get(0)
                         .getQuantity());
             }
-		} else if ((orderProcessBean.getRefundAmount() != null && orderProcessBean
+		} else if (/*(orderProcessBean.getRefundAmount() != null && orderProcessBean
 				.getRefundAmount() > 0)
 				|| (orderProcessBean.getPrePayCardRefundAmount() != null && orderProcessBean
-						.getPrePayCardRefundAmount() > 0)) {
-			//add by caosy 预付中的非全部退款,返还库存 
-			   List<EventActivityOrderItem> orderItems = this.eventActivityOrderItemDao
-	                    .getOrderItemByOrderId(order.getOrderId());
-	            if (orderItems != null && orderItems.size() > 0
-	                    && order.getConfirmType() == ResourceConfirmTypeEnum.AUTO.getValue()) {
-	                ResourceInventoryQuery resourceInventoryQuery = new ResourceInventoryQuery();
-	                resourceInventoryQuery.setResourceCategory(ResourceCategoryEnum.COURSE.getValue());
-	                resourceInventoryQuery.setResourceId(orderItems.get(0).getResourceId());
-	                resourceInventoryQuery.setTheDate(orderItems.get(0).getPlayDate());
-	                logger.info("addInventory1 orderNo=" + order.getOrderNo() + "ResourceId="
-	                        + orderItems.get(0).getResourceId());
-	                this.courseResourceService.addInventory(resourceInventoryQuery, orderItems.get(0).getQuantity() 
-	                		- orderProcessBean.getQuantity());
-	            }
+						.getPrePayCardRefundAmount() > 0)*/orderProcessBean.getOperateType() == OrderProcessEnum.REFUND_PART.getOperationCode()) {
+			    //部分退款逻辑
 	            //取消占位
 			    String playerNum = orderProcessBean.getPlayerNum();
 			    String[] playerNumArray = playerNum.split(",");
-                List<Integer> players = new ArrayList<Integer>();
+	            List<Integer> players = new ArrayList<Integer>();
 			    if(playerNumArray.length == 0){
 			    	if(playerNum.trim() != null && !"".equals(playerNum)){
 			    		players.add(Integer.valueOf(playerNum.trim()));
@@ -522,8 +509,25 @@ public class OpEventActivityOrderService
 	            		}
 					}
 	            }
-			    
-			    this.eventCustomerInfoService.updateEventCustomerByPlayerNum(order.getOrderId(), players);
+			    //add by caosy 预付中的非全部退款,返还库存 
+			    List<EventActivityOrderItem> orderItems = this.eventActivityOrderItemDao
+	                    .getOrderItemByOrderId(order.getOrderId());
+	            if (orderItems != null && orderItems.size() > 0
+	                    && order.getConfirmType() == ResourceConfirmTypeEnum.AUTO.getValue()) {
+	            	
+	            	//重新设置退款人数
+	            	int validNum = this.eventCustomerInfoService.updateEventCustomerByPlayerNum(order.getOrderId(), players);
+	            	orderProcessBean.setQuantity(orderItems.get(0).getQuantity()-validNum);
+	            	
+	                ResourceInventoryQuery resourceInventoryQuery = new ResourceInventoryQuery();
+	                resourceInventoryQuery.setResourceCategory(ResourceCategoryEnum.COURSE.getValue());
+	                resourceInventoryQuery.setResourceId(orderItems.get(0).getResourceId());
+	                resourceInventoryQuery.setTheDate(orderItems.get(0).getPlayDate());
+	                logger.info("addInventory1 orderNo=" + order.getOrderNo() + "ResourceId="
+	                        + orderItems.get(0).getResourceId());
+	                this.courseResourceService.addInventory(resourceInventoryQuery, orderItems.get(0).getQuantity() 
+	                		- orderProcessBean.getQuantity());
+	            }
 			    
 		}
     }