|
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@Log4j2
|
|
@Log4j2
|
|
@@ -72,7 +73,12 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
createOrderNewRequest.setSourceOrderId(orderNo);
|
|
createOrderNewRequest.setSourceOrderId(orderNo);
|
|
|
|
|
|
DetailResponse detailResponse = ticketApi.detail(new DetailRequest(createOrderNewRequest.getProductId()));
|
|
DetailResponse detailResponse = ticketApi.detail(new DetailRequest(createOrderNewRequest.getProductId()));
|
|
- BigDecimal salePrice = detailResponse.getData().getSalePrice();
|
|
|
|
|
|
+ List<DetailResponse.PriceCalendar> priceCalendar = detailResponse.getData().getPriceCalendar();
|
|
|
|
+ List<DetailResponse.PriceCalendar> collect = priceCalendar.stream().filter(it -> it.getDepartDate().equals(createOrderNewRequest.getStartTime())).collect(Collectors.toList());
|
|
|
|
+ if (collect.isEmpty()) {
|
|
|
|
+ return ResultContent.build(ResultState.Fail,"未找到对应的价格日历!");
|
|
|
|
+ }
|
|
|
|
+ BigDecimal salePrice = collect.get(0).getSalePrice();
|
|
BigDecimal payAmount = salePrice.subtract(BigDecimal.valueOf(createOrderNewRequest.getBookNumber()));
|
|
BigDecimal payAmount = salePrice.subtract(BigDecimal.valueOf(createOrderNewRequest.getBookNumber()));
|
|
|
|
|
|
ShopDetailVo shopDetailVo = shopService.detail(createOrderNewRequest.getEpId()).getContent();
|
|
ShopDetailVo shopDetailVo = shopService.detail(createOrderNewRequest.getEpId()).getContent();
|