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 
# Conflicts:
#	cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
This commit is contained in:
Tankaikai
2025-04-07 17:26:21 +08:00
parent 91ec453948 3bcdb04f71
commit 22da0ae2d5
3 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
package com.czg.controller.user;
import com.czg.product.dto.GroupIsSaleTimeDTO;
import com.czg.product.dto.ProdIsSaleTimeDTO;
import com.czg.product.param.ShopProductSkuParam;
import com.czg.product.service.UProductService;
import com.czg.product.vo.ShopGroupProductVo;
@@ -43,8 +41,7 @@ public class UProductController {
Long shopId = StpKit.USER.getShopId(0L);
List<ShopProductVo> 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 +58,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);