|
@@ -160,7 +160,6 @@ class ProdApiServiceImpl implements ProdServiceI {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
rtn.setMercId(mercProd.getMercId());
|
|
rtn.setMercId(mercProd.getMercId());
|
|
|
- rtn.setMercProdId(mercProd.getMercProdId());
|
|
|
|
|
rtn.setProdId(mercProd.getProdId());
|
|
rtn.setProdId(mercProd.getProdId());
|
|
|
rtn.setProdAttrId(mercProd.getProdAttrId());
|
|
rtn.setProdAttrId(mercProd.getProdAttrId());
|
|
|
|
|
|
|
@@ -191,6 +190,8 @@ class ProdApiServiceImpl implements ProdServiceI {
|
|
|
List<ProdAttrResponse> prodAttrResponseList = new ArrayList<>();
|
|
List<ProdAttrResponse> prodAttrResponseList = new ArrayList<>();
|
|
|
|
|
|
|
|
for (MerchantProd mp : merchantProdList) {
|
|
for (MerchantProd mp : merchantProdList) {
|
|
|
|
|
+ rtn.setMercProdId(mp.getMercProdId());
|
|
|
|
|
+
|
|
|
ProdAttr prodAttr= prodAttrMapper.selectProdAttrByProdAttrId(mp.getProdAttrId());
|
|
ProdAttr prodAttr= prodAttrMapper.selectProdAttrByProdAttrId(mp.getProdAttrId());
|
|
|
|
|
|
|
|
ProdAttrResponse prodAttrResponse = new ProdAttrResponse();
|
|
ProdAttrResponse prodAttrResponse = new ProdAttrResponse();
|