Commit cb0a5785 authored by Quxl's avatar Quxl

x

parent 6760b68b
...@@ -384,8 +384,8 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -384,8 +384,8 @@ public class GoodsServiceImpl implements GoodsService {
} }
detail.put("nProfitMargin", nProfitMargin); detail.put("nProfitMargin", nProfitMargin);
Map<String, List<Map<String, Object>>> picList = goodsPicList(goodsId, contractNo); 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 = ? 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 = ?) and (pd.nGoodsID = ?)";
Object[] args = new Object[] {orgNo, contractNo, goodsId, categoryNo, brandId}; Object[] args = new Object[] {orgNo, contractNo, goodsId};
List<Map<String, Object>> promoList = jdbcTemplate.queryForList(promoSql, args); List<Map<String, Object>> promoList = jdbcTemplate.queryForList(promoSql, args);
detail.put("promoList", promoList); detail.put("promoList", promoList);
Rjx rjx = Rjx.jsonOk().set("goodsDetail", detail); Rjx rjx = Rjx.jsonOk().set("goodsDetail", detail);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment