1：上架时上次库存数为空的bug的处理。

2：首页右侧统计数据报错的问题。

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -644,7 +644,10 @@ public class Goods implements Serializable {
 	}
 
 	public void setReserve(Goods goods) {
-		if(NumberUtil.compare(this.reserve, goods.reserve) != 0) {
+		if(NumberUtil.compare(this.reserve, goods.getReserve()) != 0) {
+			this.lastReserve = goods.getReserve();
+		}
+		if(this.lastReserve == null) {
 			this.lastReserve = goods.getReserve();
 		}
 		this.reserve = goods.getReserve();

src/main/java/com/uas/platform/b2c/prod/product/common/model/CommonCount.java

@@ -47,7 +47,7 @@ public class CommonCount implements Serializable{
      * 数量
      */
     @Column(name = "cc_count")
-    private Integer count;
+    private Long count;
 
     /**
      * 状态，是否激活（1：是；0：否）
@@ -87,11 +87,11 @@ public class CommonCount implements Serializable{
         this.sql = sql;
     }
 
-    public Integer getCount() {
+    public Long getCount() {
         return count;
     }
 
-    public void setCount(Integer count) {
+    public void setCount(Long count) {
         this.count = count;
     }
 

src/main/java/com/uas/platform/b2c/prod/product/common/service/impl/CommonCountServiceImpl.java

@@ -27,7 +27,7 @@ public class CommonCountServiceImpl implements CommonCountService{
 
         for (CommonCount commonCount : commonCounts) {
             if (commonCount.getSql() != null)
-                commonCount.setCount(jdbcTemplate.queryForInt(commonCount.getSql()));
+                commonCount.setCount(jdbcTemplate.queryForLong(commonCount.getSql()));
         }
 
         return commonCounts;