后台修改资源操作，能记录操作人;修复因日期格式不对导致数据库存储无效数据（priceDate = null）的bug

src/main/java/com/ctrip/fun/golf/dao/product/CourseResourceDao.java

@@ -55,17 +55,28 @@ public class CourseResourceDao extends GenericHibernateDao<CourseResource, Integ
     }
 
     public void setStatus(CourseResourceStatusBean courseResourceStatusBean) {
-        String hql = "update CourseResource set status=:status where id in ("
-                + StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")";
+//        String hql = "update CourseResource set status=:status,updateUser=:updateUser where id in ("
+//                + StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")";
+    	StringBuffer hql = new StringBuffer();
+        hql.append( "update CourseResource set status=:status where id in ("
+                + StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")");
+        if(org.apache.commons.lang.StringUtils.isNotBlank( courseResourceStatusBean.getUpdateUser())){
+        	hql.append(" ,updateUser=:updateUser");
+        }
+        hql.append(" where id in ("+ StringUtils.escapeSql(courseResourceStatusBean.getResourceIds()) + ")");
+        
         Session session = this.getSession();
         String[] ids = courseResourceStatusBean.getResourceIds().split(",");
         Integer[] ia = new Integer[ids.length];
         for (int i = 0; i < ids.length; i++) {
             ia[i] = Integer.parseInt(ids[i]);
         }
-        session.createQuery(hql)
-                .setParameter("status", courseResourceStatusBean.getResourceStatus())
-                .executeUpdate();
+        Query query = session.createQuery(hql.toString())
+                .setParameter("status", courseResourceStatusBean.getResourceStatus());
+        if(org.apache.commons.lang.StringUtils.isNotBlank( courseResourceStatusBean.getUpdateUser())){
+        	query.setParameter("updateUser", courseResourceStatusBean.getUpdateUser());
+        }
+        query.executeUpdate();
     }
 
     public int minusInvtory(Integer id, int num) {

src/main/java/com/ctrip/fun/golf/dao/product/ResourceInventoryDao.java

@@ -7,12 +7,15 @@ import java.util.Map;
 
 import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
 import com.ctrip.fun.common.vo.product.ResourceTypeEnum;
+
+import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
 
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.vo.product.ResourceInventoryBean;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.domain.product.ResourceInventory;
+
 import org.hibernate.criterion.CriteriaSpecification;
 
 /**
@@ -114,15 +117,20 @@ public class ResourceInventoryDao extends GenericHibernateDao<ResourceInventory,
      * @param model
      */
     public void saveOrUpdateByUniqueKey(ResourceInventory model) {
-        String sql = new StringBuilder().append("INSERT INTO prd_resourceInventory (ResourceCategory, ResourceID, Size, TheDate, Used) VALUES (:resourceCategory, :resourceId, :size, :theDate, :used) ")
-                                        .append("ON DUPLICATE KEY UPDATE Size = :size, Used = :used").toString();
-        Query query = this.getSession().createSQLQuery(sql);
+    	StringBuilder sql = new StringBuilder().append("INSERT INTO prd_resourceInventory (ResourceCategory, ResourceID, Size, TheDate, Used) VALUES (:resourceCategory, :resourceId, :size, :theDate, :used) ")
+                                        .append("ON DUPLICATE KEY UPDATE Size = :size, Used = :used");
+        if(StringUtils.isNotBlank( model.getUpdateUser())){
+        	sql.append(",updateUser=:updateUser");
+        }
+        Query query = this.getSession().createSQLQuery(sql.toString());
         query.setParameter("resourceCategory", model.getResourceCategory());
         query.setParameter("resourceId", model.getResourceId());
         query.setParameter("size", model.getSize());
         query.setParameter("theDate", model.getTheDate());
         query.setParameter("used", model.getUsed());
-
+        if(StringUtils.isNotBlank( model.getUpdateUser())){
+        	query.setParameter("updateUser", model.getUpdateUser());
+        }
         query.executeUpdate();
     }
 }

src/main/java/com/ctrip/fun/golf/domain/product/CourseResource.java

@@ -190,6 +190,8 @@ public class CourseResource implements java.io.Serializable {
      */
     private Boolean hotEvent;
     
+    private String updateUser;
+
     /**
      * 赛事限制人员uid
      */
@@ -579,4 +581,12 @@ public class CourseResource implements java.io.Serializable {
         this.eventLimitUids = eventLimitUids;
     }
 
+	public String getUpdateUser() {
+		return updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/domain/product/ResourceInventory.java

@@ -56,6 +56,8 @@ public class ResourceInventory implements java.io.Serializable {
      */
     private Date createdTime;
     
+    private String updateUser;
+
     @Id
     @GeneratedValue(strategy = IDENTITY)
     @Column(name = "ID", unique = true)
@@ -134,4 +136,12 @@ public class ResourceInventory implements java.io.Serializable {
         this.used = used;
     }
 
+	public String getUpdateUser() {
+		return updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/domain/product/ResourcePrice.java

@@ -115,6 +115,9 @@ public class ResourcePrice implements java.io.Serializable {
      */
     private Double communeGuestMinus;
     
+    
+    private String updateUser;
+
     @Id
     @GeneratedValue(strategy = IDENTITY)
     @Column(name = "ID", unique = true)
@@ -313,4 +316,12 @@ public class ResourcePrice implements java.io.Serializable {
         this.communeGuestMinus = communeGuestMinus;
     }
 
+	public String getUpdateUser() {
+		return updateUser;
+	}
+
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/service/product/CourseResourceService.java

@@ -157,6 +157,7 @@ public class CourseResourceService extends
                 .getResourceSiblings(resourceInventoryBean.getResourceId());
 
         for (Date date : dates) {
+        	if(date!=null){
 	            for (Integer resourceId : siblingResourceIds) {
 	                ResourceInventory resourceInventory = new ResourceInventory();
 	                BeanConverter.copyProperties(resourceInventory, resourceInventoryBean);
@@ -175,6 +176,7 @@ public class CourseResourceService extends
 	            // this.resourceInventoryDao.save(resourceInventory);
 	            // }
 	        }
+        }
 
     }
     
@@ -1126,6 +1128,7 @@ public class CourseResourceService extends
 //        Date[] dates = DateUtil.getDates(resourcePriceBean.getStartDate(),resourcePriceBean.getEndDate(), resourcePriceBean.getWeekdayStr());
     	Date[] dates = resourcePriceBean.getTheDate();
         for (Date date : dates) {
+        	if(date!=null){
 	            ResourcePrice resourcePrice = new ResourcePrice();
 	            BeanConverter.copyProperties(resourcePrice, resourcePriceBean);
 	            resourcePrice.setPriceDate(date);
@@ -1137,6 +1140,7 @@ public class CourseResourceService extends
 	            } else {
 	                this.resourcePriceDao.save(resourcePrice);
 	            }
+        	}
 
         }