|
@@ -180,15 +180,11 @@ public class ItemService {
|
|
|
if (CollectionUtils.isEmpty(productIdList)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
-
|
|
|
List<MerchantProduct> merchantProductList = merchantProductRepository.findByPidsAndMerchantId(productIdList, merchantId);
|
|
|
}
|
|
|
-
|
|
|
- public List<ItemVo> findMerchant(String merchantId, List<String> productIdList){
|
|
|
-
|
|
|
- }
|
|
|
*/
|
|
|
|
|
|
+
|
|
|
public List<ItemVo> findByIds(String merchantId, List<String> productIdList) {
|
|
|
if (CollectionUtils.isEmpty(productIdList)) {
|
|
|
return new ArrayList<>();
|
|
@@ -366,6 +362,9 @@ public class ItemService {
|
|
|
itemVo.setType(ProductTypeEnum.TRAINING);
|
|
|
itemVo.setCoverUrl(training.getCoverUrl());
|
|
|
itemVo.setImgList(training.getImgList());
|
|
|
+ itemVo.setDateDesc(training.getDateDesc());
|
|
|
+ itemVo.setOpenTime(Optional.ofNullable(training.getOpenTime()).map(t->t.getTime()).orElse(null));
|
|
|
+ itemVo.setCloseTime(Optional.ofNullable(training.getCloseTime()).map(t->t.getTime()).orElse(null));
|
|
|
return itemVo;
|
|
|
}
|
|
|
|