|
@@ -87,16 +87,12 @@ public class CallbackAdapterImpl implements CallbackAdapter {
|
|
|
@Override
|
|
|
public List<GoodsRet> gRet(String uploadId) {
|
|
|
List<GoodsRet> rets = Lists.newArrayList();
|
|
|
- QueryWrapper<UpGoods> ugWrapper = new QueryWrapper<>();
|
|
|
- ugWrapper.lambda().eq(UpGoods::getUploadId, uploadId).orderByAsc(UpGoods::getId);
|
|
|
- List<UpGoods> upGoods = upGoodsMapper.selectList(ugWrapper);
|
|
|
+ List<UpGoods> upGoods = upGoodsMapper.selectByUploadId(uploadId);
|
|
|
if (CollectionUtils.isNotEmpty(upGoods)) {
|
|
|
for (UpGoods upGood : upGoods) {
|
|
|
GoodsRet ret = new GoodsRet();
|
|
|
ret.setGoodsImg(upGood.getGoodsImg());
|
|
|
- QueryWrapper<SubImg> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.lambda().eq(SubImg::getGoodsId, upGood.getId()).orderByAsc(SubImg::getId);
|
|
|
- List<SubImg> subImgs = subImgMapper.selectList(wrapper);
|
|
|
+ List<SubImg> subImgs = subImgMapper.selectByGid(upGood.getId());
|
|
|
ret.setSubGoodsList(dto(subImgs));
|
|
|
rets.add(ret);
|
|
|
}
|
|
@@ -111,13 +107,9 @@ public class CallbackAdapterImpl implements CallbackAdapter {
|
|
|
Axis axis = JSONObject.parseObject(subImg.getAxis(), Axis.class);
|
|
|
dto.setAxis(axis);
|
|
|
dto.setFmcgScore(subImg.getFmcgScore());
|
|
|
- QueryWrapper<SubImgRet> retQueryWrapper = new QueryWrapper<>();
|
|
|
- retQueryWrapper.lambda().eq(SubImgRet::getSubImgId, subImg.getId()).orderByAsc(SubImgRet::getId);
|
|
|
- List<SubImgRet> subImgRets = subImgRetMapper.selectList(retQueryWrapper);
|
|
|
+ List<SubImgRet> subImgRets = subImgRetMapper.selectBySid(subImg.getId());
|
|
|
dto.setTop5Result(top5Result(subImgRets));
|
|
|
- QueryWrapper<SubImgCat> catQueryWrapper = new QueryWrapper<>();
|
|
|
- catQueryWrapper.lambda().eq(SubImgCat::getSubImgId, subImg.getId()).orderByAsc(SubImgCat::getId);
|
|
|
- List<SubImgCat> subImgCats = subImgCatMapper.selectList(catQueryWrapper);
|
|
|
+ List<SubImgCat> subImgCats = subImgCatMapper.selectBySid(subImg.getId());
|
|
|
dto.setTop3Category(top3Category(subImgCats));
|
|
|
dtos.add(dto);
|
|
|
}
|