diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDetailDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDetailDTO.java index 3d49477ea..eb3d2079c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDetailDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/PreFryRecordsDetailDTO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java index 65e9bc17f..fa7829ff7 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PreFryRecordsDO.java @@ -19,7 +19,7 @@ public class PreFryRecordsDO { private String storeCode; /** - * 预炸产品编码 + * 预炸产品id */ @Column(name = "product_id") private Long productId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java index d21360efe..47cb52e7c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java @@ -187,7 +187,6 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService { List productIdList = preFryRecordsDOS.stream().map(PreFryRecordsDO::getProductId).collect(Collectors.toList()); List preFriedProductsDOS = preFriedProductsDAO.selectByProductIds(productIdList); Map preFriedProductsDOSMap = preFriedProductsDOS.stream().collect(Collectors.toMap(PreFriedProductsDO::getId, x -> x)); - //将数据根据recordId分组 并根据id排序 Map> 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());