|
@@ -78,6 +78,7 @@ public class CmHeheCollageProductService extends CrudService<CmHeheCollageProduc
|
|
// 已参与限时特价活动商品id
|
|
// 已参与限时特价活动商品id
|
|
List<Integer> discountProductIds = heheProductDao.findDiscountProductIds();
|
|
List<Integer> discountProductIds = heheProductDao.findDiscountProductIds();
|
|
productIds.addAll(actProductIds);
|
|
productIds.addAll(actProductIds);
|
|
|
|
+ productIds.addAll(discountProductIds);
|
|
product.setIds(productIds);
|
|
product.setIds(productIds);
|
|
List<Product> productList = cmHeheFloorProductDao.findAllProduct(product);
|
|
List<Product> productList = cmHeheFloorProductDao.findAllProduct(product);
|
|
if (productList != null && productList.size() > 0) {
|
|
if (productList != null && productList.size() > 0) {
|