Commit 30cbfd62 authored by Quxl's avatar Quxl

x

parent 15404ddb
...@@ -182,6 +182,8 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -182,6 +182,8 @@ public class GoodsServiceImpl implements GoodsService {
} catch (EmptyResultDataAccessException e) { } catch (EmptyResultDataAccessException e) {
throw new XException("商品已下架"); throw new XException("商品已下架");
} }
List<Map<String, Object>> specList = jdbcTemplate.queryForList("select t.* from tGoodsSubCode t, tGoodsSubCode p where t.nParentID = p.nParentID and p.nGoodsID = ? and t.nTag&1 = 0", goodsId);
BigDecimal nMarketPrice = (BigDecimal)detail.get("nMarketPrice"); BigDecimal nMarketPrice = (BigDecimal)detail.get("nMarketPrice");
BigDecimal nRealSalePrice = (BigDecimal)detail.get("nRealSalePrice"); BigDecimal nRealSalePrice = (BigDecimal)detail.get("nRealSalePrice");
BigDecimal nProfitMargin = BigDecimal.ZERO; BigDecimal nProfitMargin = BigDecimal.ZERO;
...@@ -194,7 +196,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -194,7 +196,7 @@ public class GoodsServiceImpl implements GoodsService {
Object[] args = new Object[] {custTypeId, orgNo, contractNo, goodsId}; Object[] args = new Object[] {custTypeId, 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).set("specList", specList);
rjx.putAll(picList); rjx.putAll(picList);
return rjx.toJson(); return rjx.toJson();
} }
......
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