|
|
@@ -87,10 +87,8 @@ public class YhShopGoodsController {
|
|
|
long userId = StpYhShopManageUser.getLoginIdAsLong();
|
|
|
YhShop yhShop = yhShopMapper.selectOne(Wrappers.lambdaQuery(YhShop.class)
|
|
|
.eq(YhShop::getUserId, userId).last("limit 1"));
|
|
|
- List<YhShopGoodsSku> list = yhShopGoodsSkuService.list(Wrappers.lambdaQuery(YhShopGoodsSku.class)
|
|
|
- .eq(YhShopGoodsSku::getUserId, userId)
|
|
|
- .eq(YhShopGoodsSku::getGoodsId, goodsId)
|
|
|
- .eq(YhShopGoodsSku::getDeleted, true));
|
|
|
+ List<YhShopGoodsView.YhShopGoodsSkuView> list = beanSearcher.searchAll(YhShopGoodsView.YhShopGoodsSkuView.class, MapUtils.builder().put("uid", String.format("and ysgs.user_id = %s", userId))
|
|
|
+ .field(YhShopGoodsView.YhShopGoodsSkuView::getGoodsId, goodsId).build());
|
|
|
list.forEach(sku -> {
|
|
|
YhShopGoodsRateView.YhShopGoodsSkuRateView yhShopGoodsSkuRateView = beanSearcher.searchFirst(YhShopGoodsRateView.YhShopGoodsSkuRateView.class, MapUtils.builder().field(YhShopGoodsRateView.YhShopGoodsSkuRateView::getSkuId, sku.getSkuId()).build());
|
|
|
if (sku.getPrice().compareTo(yhShopGoodsSkuRateView.getMaxPrice()) > 0 || sku.getPrice().compareTo(yhShopGoodsSkuRateView.getMinPrice()) < 0) {
|