x

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

@@ -519,7 +519,7 @@ public class GoodsServiceImpl implements GoodsService {
 		List<Map<String, Object>> datas = jdbcTemplate.queryForList(sql);
 		Map<String, Map<String, Object>> mm = Util.listToMM(datas, ":", "sAgentContractNO", "nGoodsID");
 		
-		String sql1 = "select t.sAgentContractNO, t.nGoodsID, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO sPromoGroupNO from tYWPromoDtl t, tYWPromoMain p where t.sPromoPaperNO = p.sPromoPaperNO and p.nTag&3 = 2 and p.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args) + " group by t.sAgentContractNO, t.nGoodsID, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO";
+		String sql1 = "select t.sAgentContractNO, t.nGoodsID, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO sPromoGroupNO from tYWPromoDtl t, tYWPromoMain p where p.sPromoActionTypeID != '3' and t.sPromoPaperNO = p.sPromoPaperNO and p.nTag&3 = 2 and p.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args) + " group by t.sAgentContractNO, t.nGoodsID, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO";
 		List<Map<String, Object>> plist = jdbcTemplate.queryForList(sql1);
 		Map<String, List<Map<String, Object>>> pmm = Util.listToML(plist, ":", "sAgentContractNO", "nGoodsID");
 		for(String key : mm.keySet()) {