x

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

@@ -384,7 +384,7 @@ public class GoodsServiceImpl implements GoodsService {
 		}
 		detail.put("nProfitMargin", nProfitMargin);
 		Map<String, List<Map<String, Object>>>  picList =  goodsPicList(goodsId, contractNo);
-		String promoSql = "select pm.* from tYWPromoMain pm, tYWPromoDtl pd where pm.sOrgNO = ? and pm.sPromoPaperNO = pd.sPromoPaperNO and pm.nTag&3 = 2 and (pd.sAgentContractNO = ? or pd.sAgentContractNO is null) and (pd.nGoodsID = ? or pd.sCategoryNO = ? or pd.sBrandID = ?)";
+		String promoSql = "select pm.* from tYWPromoMain pm, tYWPromoDtl pd where pm.sPromoActionTypeID != '3' and pm.sOrgNO = ? and pm.sPromoPaperNO = pd.sPromoPaperNO and pm.nTag&3 = 2 and (pd.sAgentContractNO = ? or pd.sAgentContractNO is null) and (pd.nGoodsID = ? or pd.sCategoryNO = ? or pd.sBrandID = ?)";
 		Object[] args = new Object[] {orgNo, contractNo, goodsId, categoryNo, brandId};
 		List<Map<String, Object>> promoList = jdbcTemplate.queryForList(promoSql, args);
 		detail.put("promoList", promoList);