diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/home/HomePageVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/home/HomePageVO.java index 6448981e..5fe8d4c5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/home/HomePageVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/home/HomePageVO.java @@ -33,7 +33,7 @@ public class HomePageVO { /** * 今日上新商品信息 */ - private List todayProInfo; + private HotRankingVO todayProInfo; /** * 菜单列表 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/RecommendProVO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/RecommendProVO.java index 4d08c29c..71993d1c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/RecommendProVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/RecommendProVO.java @@ -61,7 +61,7 @@ public class RecommendProVO { /** * 折扣 */ - private float discount; + private Integer discount; @Column(ignore = true) private Long endTime = 1741391999999L; } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java index 02f12881..3552ee5a 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java @@ -102,7 +102,11 @@ public class HomePageServiceImpl implements HomePageService { } homeUpVO.setMenuList(sysDictList); - homeUpVO.setTodayProInfo(productMapper.getTodayProInfo()); + HotRankingVO tody = new HotRankingVO(); + tody.setHotList(productMapper.getTodayProInfo()); + tody.setName("今日上线"); + tody.setDate("十点更新"); + homeUpVO.setTodayProInfo(hotRankingVO); return homeUpVO; } diff --git a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml index 6918139e..6900b750 100644 --- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml +++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml @@ -154,7 +154,7 @@ select 1000 AS distance, c.name, a.origin_price, a.sale_price, b.shop_name, b.districts, c.cover_img, b.logo, c.id, - a.real_sales_number saleNum, round(a.sale_price / a.origin_price, 2) discount, + a.real_sales_number saleNum, round(a.sale_price / a.origin_price, 2) * 10 discount, c.id productId, a.id skuId, b.id shopId from tb_prod_sku as a left join tb_product c on c.id=a.product_id