x

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

@@ -43,12 +43,24 @@ public class BrandServiceImpl implements BrandService {
 	
 	@Override
 	public List<Map<String, Object>> getBrandList(Map<String, Object> map) {
-		String sql=" SELECT  PinyinCode = b.sPinyinCode,BrandNO = acg.sBrandID, "
-				+ "BrandName = b.sBrandName,ImgPath = b.sLogoUrl "
-				+ "FROM tAgentContractGoods acg, tBrand b "
-				+ "WHERE acg.sBrandID = b.sBrandID and acg.sOrgNO = ? "
-				+ "group by b.sPinyinCode, acg.sBrandID, b.sBrandName, b.sLogoUrl "
-				+ "ORDER BY b.sPinyinCode ";
+		String sql="SELECT  "
+					+ "PinyinCode = b.sPinyinCode,"
+					+ "BrandNO = acg.sBrandID, "
+					+ "BrandName = b.sBrandName,"
+					+ "ImgPath = b.sLogoUrl "
+				+ "FROM "
+					+ "tAgentContractGoods acg, "
+					+ "tBrand b "
+				+ "WHERE "
+					+ "acg.sBrandID = b.sBrandID "
+					+ "and acg.sOrgNO = ? "
+				+ "group by "
+					+ "b.sPinyinCode, "
+					+ "acg.sBrandID, "
+					+ "b.sBrandName, "
+					+ "b.sLogoUrl "
+				+ "ORDER BY "
+					+ "b.sPinyinCode ";
 		String orgNO=(String) map.get("orgNO");
 		jdbcTemplate.setDialect(new SqlServerDialect());
 		return jdbcTemplate.queryForList(sql, orgNO);
@@ -57,17 +69,21 @@ public class BrandServiceImpl implements BrandService {
 	@Override
 	public List<Map<String, Object>> getHotSaleBrands(Map<String, Object> map, Page page) {
 		String sql="SELECT "
-				+ "BrandNO = b.sBrandID, "
-				+ "BrandName = b.sBrandName, "
-				+ "ImgPath = b.sLogoUrl, "
-				+ "SaleQty = sum(a.nSaleQty) "
+					+ "BrandNO = b.sBrandID, "
+					+ "BrandName = b.sBrandName, "
+					+ "ImgPath = b.sLogoUrl, "
+					+ "SaleQty = sum(a.nSaleQty) "
 				+ "FROM tAgentGoodsDailyOnline a "
-				+ "JOIN tGoods g ON a.nGoodsID = g.nGoodsID "
-				+ "JOIN tBrand b ON g.sBrandID = b.sBrandID "
-				+ "JOIN tAgentContractGoods acg ON a.sAgentContractNO = acg.sAgentContractNO "
-				+ "and a.nGoodsID = acg.nGoodsID "
-				+ "WHERE acg.sOrgNO = ? "
-				+ "GROUP BY b.sBrandID, b.sBrandName, b.sLogoUrl ";
+					+ "JOIN tGoods g ON a.nGoodsID = g.nGoodsID "
+					+ "JOIN tBrand b ON g.sBrandID = b.sBrandID "
+					+ "JOIN tAgentContractGoods acg ON "
+					+ "a.sAgentContractNO = acg.sAgentContractNO and a.nGoodsID = acg.nGoodsID "
+				+ "WHERE "
+					+ "acg.sOrgNO = ? "
+				+ "GROUP BY "
+					+ "b.sBrandID, "
+					+ "b.sBrandName, "
+					+ "b.sLogoUrl ";
 		String orgNO=(String) map.get("orgNO");
 		jdbcTemplate.setDialect(new SqlServerDialect());
 		return jdbcTemplate.limit(sql, page,orgNO);