czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/prod'

Browse Source
This commit is contained in:
Tankaikai
2025-04-07 16:57:02 +08:00
parent 243cd5dc91 3f6de96bd6
commit ef9b45a907
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
View File

@@ -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()));
});
});

2
cash-common/cash-common-service/src/main/java/com/czg/product/dto/GroupIsSaleTimeDTO.java
View File

@@ -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 {

2
cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProdIsSaleTimeDTO.java
View File

@@ -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 {