修复首页列表问题

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -92,7 +92,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         criteria.andIsDeletedEqualTo(false);
         criteria.andIsOnSaleEqualTo(true);
         SupplierItemExample.Criteria orCriteria = supplierItemExample.or();
-        orCriteria.andIdIn(dto.getIds());
+        JdbcHelper.ifPresent(dto.getIds(), orCriteria::andIdIn);
         orCriteria.andTypeIn(dto.getTypeList());
         orCriteria.andStockGreaterThan(0);
         orCriteria.andIsDeletedEqualTo(false);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -113,6 +113,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setSupplyPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getSupplyPrice()));
                 supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                BigDecimal decimal = supplierItem.getRebate().divide(new BigDecimal("100")).multiply(new BigDecimal(supplierItem.getDistributionPrice().toString()));
+                supplierItemVo.setRebateAmount(PriceUtil.convertDoubleToString(decimal.doubleValue()));
+                supplierItemVo.setRebate(supplierItem.getRebate().toPlainString() + "%");
                 //竞拍商品需要展示当前价
                 if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
                     AuctionRecord auctionRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
@@ -760,6 +763,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             supplierItemList.forEach(supplierItem -> {
                 SupplierItemVo supplierItemVo = new SupplierItemVo();
                 EntityMapper.copyAttribute(supplierItem, supplierItemVo);
+                supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
                 supplierItemVo.setItemId(supplierItem.getId());
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVo.setShareId(map.get(supplierItem.getId())== null?"":map.get(supplierItem.getId()).getShareId());