gongfuzhu 1 жил өмнө
parent
commit
af6806d764

+ 4 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/CreateOrderNewRequest.java

@@ -36,6 +36,10 @@ public class CreateOrderNewRequest {
     @NotNull
     @NotNull
     private int productId;
     private int productId;
 
 
+    @ApiModelProperty(required = true)
+    @NotNull
+    private String scenicId;
+
     // 出游日期. “YYYY-MM-DD”。请在前台限制,只有价格日历中存在的团期,才能作为出游日期。
     // 出游日期. “YYYY-MM-DD”。请在前台限制,只有价格日历中存在的团期,才能作为出游日期。
     private String startTime;
     private String startTime;
 
 

+ 2 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/DfyTicketServiceImpl.java

@@ -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()));