|
@@ -37,14 +37,18 @@ public class ProductConverter {
|
|
|
|
|
|
ProductVO.Price productPrice = new ProductVO.Price();
|
|
|
|
|
|
- ProductVO.Price.TimeFilter timeFilter = new ProductVO.Price.TimeFilter();
|
|
|
+ if (Objects.nonNull(product.getBeginTime())) {
|
|
|
+ ProductVO.Price.TimeFilter timeFilter = new ProductVO.Price.TimeFilter();
|
|
|
timeFilter.setBeginTime(product.getBeginTime());
|
|
|
timeFilter.setEndTime(product.getEndTime());
|
|
|
+ productPrice.setTimeFilter(timeFilter);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
productPrice.setCurrency(product.getCurrency());
|
|
|
productPrice.setPromotion(product.getPromotion());
|
|
|
productPrice.setPriceGroupDescription(product.getPriceGroupDescription());
|
|
|
- productPrice.setTimeFilter(timeFilter);
|
|
|
+
|
|
|
|
|
|
ProductVO.Price.PriceItem priceItem = new ProductVO.Price.PriceItem();
|
|
|
priceItem.setAmount(product.getAmount());
|