x

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

@@ -190,8 +190,8 @@ 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.sPromoActionTypeID != '3' and pm.sOrgNO = ? and pm.sPromoPaperNO = pd.sPromoPaperNO and pm.nTag&3 = 2 and (pd.sAgentContractNO = ?) and (pd.nGoodsID = ?)";
-		Object[] args = new Object[] {orgNo, contractNo, goodsId};
+		String promoSql = "select pm.* from tYWPromoMain pm, tYWPromoDtl pd, tPromoCustBWList bw where pm.sPromoPaperNO = bw.sPromoPaperNO and bw.sShopNO = ? and pm.sPromoActionTypeID != '3' and pm.sOrgNO = ? and pm.sPromoPaperNO = pd.sPromoPaperNO and pm.nTag&3 = 2 and (pd.sAgentContractNO = ?) and (pd.nGoodsID = ?)";
+		Object[] args = new Object[] {custTypeId, orgNo, contractNo, goodsId};
 		List<Map<String, Object>> promoList = jdbcTemplate.queryForList(promoSql, args);
 		detail.put("promoList", promoList);
 		Rjx rjx = Rjx.jsonOk().set("goodsDetail", detail);