Merge remote-tracking branch 'origin/developerB' into developerB

src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -67,6 +67,8 @@ public class ProductServiceImpl implements ProductService {
         Integer min = Collections.min(integers);
         product.setPriceGrade(min);
         product.setSkus(skus);
+        product.setStock(skus.get(0).getStock());
+        product.setMinBuyNumber(skus.get(0).getMinBuyNumber());
         log.info(product.getName());
         if (null != product) {
             if (!StringUtil.isNullOrEmpty(product.getTags())) {

src/main/resources/mapper/ProductMapper.xml

@@ -133,7 +133,8 @@
 		select recommendType from product where productId=#{productId}
 	</select>
 	<select id="findSkus" resultType="com.caimei.www.pojo.page.Sku">
-		select unit,price,stock,minBuyNumber
+		select unit,price,ifnull(stock,0) as stock,
+		       ifnull(minBuyNumber,(select buyNum from product_ladder_price where productId=#{productId} order by buynum asc limit 1)) as minBuyNumber
 		from cm_sku
 		where productId= #{productId}
 	</select>