suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-06-25 14:01:39 +08:00
parent d466018f21
commit 40a3988a40
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDetailDTO.java
View File

@@ -22,11 +22,15 @@ public class PreFryRecordsDetailDTO {
@ApiModelProperty( "门店名称")
private String storeName;
@ApiModelProperty( "预炸产品编码")
@ApiModelProperty( "预炸产品id")
private Long productId;
@ApiModelProperty( "预炸产品编码")
private String productCode;
@ApiModelProperty( "预炸产品名称")
private String productName;
@ApiModelProperty( "预炸记录编码")
private String recordCode;

2
coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java
View File

@@ -19,7 +19,7 @@ public class PreFryRecordsDO {
private String storeCode;
/**
* 预炸产品编码
* 预炸产品id
*/
@Column(name = "product_id")
private Long productId;

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java
View File

@@ -187,7 +187,6 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService {
List<Long> productIdList = preFryRecordsDOS.stream().map(PreFryRecordsDO::getProductId).collect(Collectors.toList());
List<PreFriedProductsDO> preFriedProductsDOS = preFriedProductsDAO.selectByProductIds(productIdList);
Map<Long, PreFriedProductsDO> preFriedProductsDOSMap = preFriedProductsDOS.stream().collect(Collectors.toMap(PreFriedProductsDO::getId, x -> x));
//将数据根据recordId分组 并根据id排序
Map<Long, List<PreFryStageImagesDTO>> stageImagesDTOMap =
stageImagesDTOS.stream().collect(Collectors.groupingBy(PreFryStageImagesDTO::getRecordId));
@@ -197,6 +196,7 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService {
preFryRecordsDetailDTO.setId(x.getId());
preFryRecordsDetailDTO.setStoreCode(x.getStoreCode());
preFryRecordsDetailDTO.setProductId(x.getProductId());
preFryRecordsDetailDTO.setProductCode(preFriedProductsDOSMap.getOrDefault(x.getProductId(),new PreFriedProductsDO()).getProductCode());
preFryRecordsDetailDTO.setProductName(preFriedProductsDOSMap.getOrDefault(x.getProductId(),new PreFriedProductsDO()).getProductName());
preFryRecordsDetailDTO.setProductImageUrl(preFriedProductsDOSMap.getOrDefault(x.getProductId(),new PreFriedProductsDO()).getProductImage());
preFryRecordsDetailDTO.setFryCompleteTime(x.getFryCompleteTime());
@@ -233,6 +233,7 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService {
if (preFriedProductsDO!=null){
preFryRecordsDetailDTO.setProductName(preFriedProductsDO.getProductName());
preFryRecordsDetailDTO.setProductImageUrl(preFriedProductsDO.getProductImage());
preFryRecordsDetailDTO.setProductCode(preFriedProductsDO.getProductCode());
}
preFryRecordsDetailDTO.setFryCompleteTime(preFryRecordsDO.getFryCompleteTime());
preFryRecordsDetailDTO.setLatestSaleTime(preFryRecordsDO.getLatestSaleTime());