Merge branch 'master' of http://gitlab.egolm.com/key/shop.git

src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java

@@ -49,7 +49,7 @@ public class BrandServiceImpl implements BrandService {
 	@Override
 	public List<Map<String, Object>> getHotSaleBrands(Map<String, Object> map) {
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
-		String sql="SELECT TOP 20 "
+		String sql="SELECT "// TOP 20 
 				+ "BrandNO = b.sBrandID, "
 				+ "BrandName = b.sBrandName, "
 				+ "ImgPath = b.sLogoUrl, "
@@ -61,7 +61,7 @@ public class BrandServiceImpl implements BrandService {
 				+ "and a.nGoodsID = acg.nGoodsID "
 				+ "WHERE acg.sOrgNO = ? "
 				+ "GROUP BY b.sBrandID, b.sBrandName, b.sLogoUrl "
-				+ "ORDER BY sum(a.nSaleQty) DESC ";
+				+ "ORDER BY sum(a.nSaleQty) DESC limit 0,20 ";
 		String OrgNO=(String) map.get("OrgNO");
 		listMap=jdbcTemplate.queryForList(sql, OrgNO);
 		return listMap;

src/main/java/com/egolm/shop/service/impl/GoodsServiceImpl.java

@@ -51,13 +51,14 @@ public class GoodsServiceImpl implements GoodsService {
 	@Override
 	public List<Map<String, Object>> getHotSaleGoods(Map<String, Object> map) {
 		List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
-		String sql="SELECT TOP 20 " 
+		String sql="SELECT " // TOP 20
 				+"GoodsID = a.nGoodsID, " 
 				+"GoodsNO = g.sGoodsNO, " 
 				+"GoodsName = g.sGoodsDesc, " 
 				+"Price = acg.nSalePrice, " 
 				+"MinQty = acg.nMinSaleQty, " 
 				+"SaleUnit = acg.nSaleUnits, " 
+				+"Unit = acg.sUnit, " 
 				+"MarketPrice = acg.nMarketPrice, " 
 				+"MarketUnit = acg.sMarketUnit, " 
 				+"SaleQty = sum(a.nSaleQty) " 
@@ -67,8 +68,8 @@ public class GoodsServiceImpl implements GoodsService {
 				+"and a.nGoodsID = acg.nGoodsID " 
 				+"WHERE acg.sOrgNO = ? " 
 				+"GROUP BY a.nGoodsID, g.sGoodsNO, g.sGoodsDesc, " 
-				+"acg.nSalePrice, acg.nMinSaleQty, acg.nSaleUnits, acg.nMarketPrice, acg.sMarketUnit " 
-				+"ORDER BY sum(a.nSaleQty) DESC ";
+				+"acg.nSalePrice, acg.nMinSaleQty, acg.nSaleUnits,acg.sUnit, acg.nMarketPrice, acg.sMarketUnit " 
+				+"ORDER BY sum(a.nSaleQty) DESC  limit 0,20";
 		String OrgNO=(String) map.get("OrgNO");
 		listMap=jdbcTemplate.queryForList(sql, OrgNO);
 		return listMap;