From 3f6de96bd61baad0c28bb34fb71ce5c1560762d0 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Mon, 7 Apr 2025 16:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=8F=AF=E5=94=AE=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/controller/user/UProductController.java | 4 ++-- .../src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java | 2 ++ .../src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) 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 b2608d21..208c1ecd 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 @@ -61,9 +61,9 @@ public class UProductController { list.forEach(item -> { uProductService.refreshProductStock(productStock, item.getProductList()); item.getProductList().forEach(prod -> { - ProdIsSaleTimeDTO prodSaleTime = prod.getProdIsSaleTimeDTO(); + ProdIsSaleTimeDTO prodSaleTime = prod.getProdIsSaleTimeDTO() == null ? new ProdIsSaleTimeDTO() : prod.getProdIsSaleTimeDTO(); prod.setIsSaleTime(uProductService.calcIsSaleTime(prodSaleTime.getDays(), prodSaleTime.getStartTime(), prodSaleTime.getEndTime())); - GroupIsSaleTimeDTO groupSaleTime = prod.getGroupIsSaleTimeDTO(); + GroupIsSaleTimeDTO groupSaleTime = prod.getGroupIsSaleTimeDTO() == null ? new GroupIsSaleTimeDTO() : prod.getGroupIsSaleTimeDTO(); prod.setIsSaleTime(uProductService.calcIsSaleTime(groupSaleTime.getUseTime(), groupSaleTime.getStartTime(), groupSaleTime.getEndTime())); }); }); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java index 75bd505a..a28afe2c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java @@ -2,6 +2,7 @@ package com.czg.product.dto; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; @@ -13,6 +14,7 @@ import java.time.LocalTime; * @since 2025-04-07 16:04 */ @Data +@NoArgsConstructor @AllArgsConstructor public class GroupIsSaleTimeDTO implements Serializable { diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java index 3b639139..14fcfcf7 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java @@ -2,6 +2,7 @@ package com.czg.product.dto; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; @@ -13,6 +14,7 @@ import java.time.LocalTime; * @since 2025-04-07 16:03 */ @Data +@NoArgsConstructor @AllArgsConstructor public class ProdIsSaleTimeDTO implements Serializable {