diff --git a/cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java index 171b0c04..d2e4406a 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java @@ -43,8 +43,7 @@ public class UProductController { Long shopId = StpKit.USER.getShopId(0L); List list = uProductService.queryHotsProductList(shopId); list.forEach(prod -> { - ProdIsSaleTimeDTO prodSaleTime = prod.getProdIsSaleTimeDTO() == null ? new ProdIsSaleTimeDTO() : prod.getProdIsSaleTimeDTO(); - prod.setIsSaleTime(uProductService.calcIsSaleTime(prodSaleTime.getDays(), prodSaleTime.getStartTime(), prodSaleTime.getEndTime())); + prod.setIsSaleTime(uProductService.calcIsSaleTime(prod.getDays(), prod.getStartTime(), prod.getEndTime())); }); uProductService.refreshProductStock(shopId, list); return CzgResult.success(list); @@ -61,10 +60,8 @@ public class UProductController { list.forEach(item -> { uProductService.refreshProductStock(productStock, item.getProductList()); item.getProductList().forEach(prod -> { - ProdIsSaleTimeDTO prodSaleTime = prod.getProdIsSaleTimeDTO() == null ? new ProdIsSaleTimeDTO() : prod.getProdIsSaleTimeDTO(); - prod.setIsSaleTime(uProductService.calcIsSaleTime(prodSaleTime.getDays(), prodSaleTime.getStartTime(), prodSaleTime.getEndTime())); - GroupIsSaleTimeDTO groupSaleTime = prod.getGroupIsSaleTimeDTO() == null ? new GroupIsSaleTimeDTO() : prod.getGroupIsSaleTimeDTO(); - prod.setIsSaleTime(uProductService.calcIsSaleTime(groupSaleTime.getUseTime(), groupSaleTime.getStartTime(), groupSaleTime.getEndTime())); + prod.setIsSaleTime(uProductService.calcIsSaleTime(prod.getDays(), prod.getStartTime(), prod.getEndTime())); + prod.setIsSaleTime(uProductService.calcIsSaleTime(item.getUseTime(), item.getSaleStartTime(), item.getSaleEndTime())); }); }); return CzgResult.success(list); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java index cce763c2..d5db7fdd 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java @@ -115,10 +115,4 @@ public class ShopProductVo implements Serializable { * 销量 */ private BigDecimal salesVolume; - - @JSONField(serialize = false) - private ProdIsSaleTimeDTO prodIsSaleTimeDTO; - - @JSONField(serialize = false) - private GroupIsSaleTimeDTO groupIsSaleTimeDTO; } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java index db66f209..f51f3c08 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/UProductServiceImpl.java @@ -63,7 +63,6 @@ public class UProductServiceImpl extends ServiceImpl imp public List queryHotsProductList(Long shopId) { List list = productMapper.selectHotsProductList(shopId); list.forEach(item -> { - item.setProdIsSaleTimeDTO(new ProdIsSaleTimeDTO(item.getDays(), item.getStartTime(), item.getEndTime())); List skuList = prodSkuMapper.selectListByQueryAs(query() .eq(ProdSku::getProductId, item.getId()) .eq(ProdSku::getIsGrounding, YesNoEnum.YES.value()) @@ -82,7 +81,6 @@ public class UProductServiceImpl extends ServiceImpl imp .orderBy(ProdGroup::getSort, true), ShopGroupProductVo.class); List productAllList = productMapper.selectGroupProductList(shopId); productAllList.forEach(item -> { - item.setProdIsSaleTimeDTO(new ProdIsSaleTimeDTO(item.getDays(), item.getStartTime(), item.getEndTime())); List skuList = prodSkuMapper.selectListByQueryAs(query() .eq(ProdSku::getProductId, item.getId()) .eq(ProdSku::getIsGrounding, YesNoEnum.YES.value()) @@ -109,13 +107,6 @@ public class UProductServiceImpl extends ServiceImpl imp productList.add(product); } } - Integer useTime = group.getUseTime(); - LocalTime saleStartTime = group.getSaleStartTime(); - LocalTime saleEndTime = group.getSaleEndTime(); - productList.parallelStream().forEach(product -> { - product.setGroupIsSaleTimeDTO(new GroupIsSaleTimeDTO(useTime, saleStartTime, saleEndTime)); - }); - // 1-价格从高到低; 2-价格从低到高; 3-销量由高到低;4-销量由低到高; if ("1".equals(group.getSortMode())) { productList = productList.stream().sorted(Comparator.comparing(ShopProductVo::getSalePrice).reversed()).toList();