x

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

@@ -506,7 +506,7 @@ public class GoodsServiceImpl implements GoodsService {
 	@Override
 	public Map<String, Map<String, Object>> queryStockPrice(String orgNo, String shopNo, String[] uidAry) {
 		List<String> args = new ArrayList<String>();
-		args.add("((t.sAgentContractNO is null or t.sAgentContractNO = '') and t.nGoodsID is null)");
+		//args.add("((t.sAgentContractNO is null or t.sAgentContractNO = '') and t.nGoodsID is null)");
 		for(String uid : uidAry) {
 			if(StringUtil.isBlank(uid)) {
 				continue;
@@ -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.sPromoPaperNO, t.sPromoActionTypeID, t.sPromoGroupNO from tPromoRuleGoods t, tPromo p where t.sPromoPaperNO = p.sPromoPaperNO and p.sOrgNO = '" + orgNo + "' " + StringUtil.join(" OR ",  " and (", ")", " and (1 = 0) ", args) + " group by t.sPromoPaperNO, t.sPromoActionTypeID, t.sPromoGroupNO";
+		String sql1 = "select 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 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()) {