backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Jack 2025-10-14 17:08:55 +08:00
commit 9e58bde9d0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductCategoryServiceImpl.java
View File

@ -485,13 +485,21 @@ public class ShopBaseProductCategoryServiceImpl extends BaseServiceImpl<ShopBase
List<Long> voucher_item_ids = productSearchDTO.getVoucher_item_id(); List<Long> voucher_item_ids = productSearchDTO.getVoucher_item_id();
if (CollUtil.isNotEmpty(voucher_item_ids)) { if (CollUtil.isNotEmpty(voucher_item_ids)) {
List<ShopProductItem> itemList = shopProductItemService.find(new QueryWrapper<ShopProductItem>().in("item_id", voucher_item_ids)); List<ShopProductItem> itemList = shopProductItemService.find(new QueryWrapper<ShopProductItem>().in("item_id", voucher_item_ids));
if (CollUtil.isNotEmpty(itemList)) { if (CollUtil.isNotEmpty(itemList)) {
product_id_row = CommonUtil.column(itemList, ShopProductItem::getProduct_id); product_id_row = CommonUtil.column(itemList, ShopProductItem::getProduct_id);
productSearchDTO.setProduct_ids(product_id_row); productSearchDTO.setProduct_ids(product_id_row);
} }
} }
// end // end
//根据itemid查询
List<Long> itemIdList = productSearchDTO.getItem_ids();
if (CollUtil.isNotEmpty(itemIdList)) {
List<ShopProductItem> itemList = shopProductItemService.find(new QueryWrapper<ShopProductItem>().in("item_id", itemIdList));
if (CollUtil.isNotEmpty(itemList)) {
product_id_row = CommonUtil.column(itemList, ShopProductItem::getProduct_id);
productSearchDTO.setProduct_ids(product_id_row);
}
}
String show_type = accountBaseConfigService.getProductShowType(); String show_type = accountBaseConfigService.getProductShowType();
productSearchDTO.setShow_type(show_type); productSearchDTO.setShow_type(show_type);