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

bug fix --商品是否可售控制

Browse Source
This commit is contained in:
Tankaikai
2025-04-17 10:14:20 +08:00
parent 855d7e7ea4
commit 9615aa33b3
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
View File

@@ -2,7 +2,6 @@ package com.czg.controller.admin;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.thread.ThreadUtil;
import com.czg.account.service.ShopConfigService;
import com.czg.annotation.SaStaffCheckPermission;
import com.czg.config.RabbitPublisher;
import com.czg.exception.CzgException;
@@ -15,6 +14,7 @@ import com.czg.product.param.*;
import com.czg.product.service.ProdConsRelationService;
import com.czg.product.service.ProductService;
import com.czg.product.service.ShopSyncService;
import com.czg.product.service.UProductService;
import com.czg.product.vo.ProductStatisticsVo;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
@@ -48,7 +48,7 @@ public class ProductController {
@Resource
private ShopSyncService shopSyncService;
@Resource
private ShopConfigService shopConfigService;
private UProductService uProductService;
/**
* 商品-分页
@@ -72,6 +72,9 @@ public class ProductController {
param.setShopId(shopId);
List<ProductDTO> productList = productService.getProductCacheList(param);
productService.refreshProductStock(param, productList);
productList.forEach(prod -> {
prod.setIsSaleTime(uProductService.calcIsSaleTime(prod.getDays(), prod.getStartTime(), prod.getEndTime()));
});
return CzgResult.success(productList);
}

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

@@ -61,7 +61,7 @@ public class UProductController {
uProductService.refreshProductStock(productStock, item.getProductList());
item.getProductList().forEach(prod -> {
prod.setIsSaleTime(uProductService.calcIsSaleTime(prod.getDays(), prod.getStartTime(), prod.getEndTime()));
prod.setIsSaleTime(uProductService.calcIsSaleTime(item.getUseTime(), item.getSaleStartTime(), item.getSaleEndTime()));
prod.setIsSaleTime(uProductService.calcIsSaleTime(prod.getIsSaleTime(), item.getUseTime(), item.getSaleStartTime(), item.getSaleEndTime()));
});
});
return CzgResult.success(list);