|
@@ -74,6 +74,7 @@ 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()));
|
|
|
|
+ ScenicDetailResponse scenicDetailResponse = ticketApi.scenicDetail(new ScenicDetailRequest(createOrderNewRequest.getScenicId()));
|
|
List<DetailResponse.PriceCalendar> priceCalendar = detailResponse.getData().getPriceCalendar();
|
|
List<DetailResponse.PriceCalendar> priceCalendar = detailResponse.getData().getPriceCalendar();
|
|
List<DetailResponse.PriceCalendar> collect = priceCalendar.stream().filter(it -> it.getDepartDate().equals(createOrderNewRequest.getStartTime())).collect(Collectors.toList());
|
|
List<DetailResponse.PriceCalendar> collect = priceCalendar.stream().filter(it -> it.getDepartDate().equals(createOrderNewRequest.getStartTime())).collect(Collectors.toList());
|
|
if (collect.isEmpty()) {
|
|
if (collect.isEmpty()) {
|
|
@@ -110,6 +111,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
|
|
JSONObject goodsInfo = JSONUtil.parseObj(createOrderNewRequest2);
|
|
JSONObject goodsInfo = JSONUtil.parseObj(createOrderNewRequest2);
|
|
goodsInfo.set("orderId",createOrderNewResponse.getData().getOrderId());
|
|
goodsInfo.set("orderId",createOrderNewResponse.getData().getOrderId());
|
|
goodsInfo.set("goodsName",detailResponse.getData().getProductName());
|
|
goodsInfo.set("goodsName",detailResponse.getData().getProductName());
|
|
|
|
+ goodsInfo.set("goodsPath",scenicDetailResponse.getData().getDefaultPic());
|
|
|
|
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
|
|
goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
|
|
goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
|