Merge branch 'test6.9.8' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.8

@@ -854,6 +854,11 @@ public class ProductServiceImpl implements ProductService {
         if (price == null || price.compareTo(BigDecimal.ZERO) <= 0) {
             throw new ServiceException(400, "价格不合法:" + price);
         }
+        //allow status =1, as seleable when create skup
+        Integer status = skupBo.getStatus();
+        if (status == null || status.intValue() != 1){
+            status = 0;
+        }
         LOGGER.info("skupBo 校验通过：skup = {}", skupBo.getSkup());
 
         StoragePrice sp = new StoragePrice();
@@ -866,7 +871,7 @@ public class ProductServiceImpl implements ProductService {
         sp.setSkup(skup);
         sp.setCreateTime((int) (System.currentTimeMillis() / 1000));
         sp.setUpdateTime(0);
-        sp.setStatus(0);
+        sp.setStatus(status);
         
 		sp.setPreSaleFlag(skupBo.getPreSaleFlag() == null ? Integer.valueOf(0) : skupBo.getPreSaleFlag());
         sp.setRegion(skupBo.getRegion() == null ? Integer.valueOf(0) : skupBo.getRegion());