'1'

zzjs-admin/src/main/java/com/miaxis/app/controller/film/NotifyController.java

@@ -9,6 +9,7 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.AesUtil;
 import com.miaxis.feign.dto.FilmDTO;
+import com.miaxis.feign.dto.FilmMcpData;
 import com.miaxis.feign.dto.FilmXdResult;
 import com.miaxis.film.domain.FilmOrder;
 import com.miaxis.film.domain.RefundRecord;
@@ -287,10 +288,15 @@ public class NotifyController {
             threadPoolTaskExecutor.execute(new Runnable() {
                 @Override
                 public void run() {
+                    FilmOrderCreateDTO filmOrderCreateDTO = filmOrderJsonData.getFilmOrderCreateDTO();
                     FilmDTO filmDTO = new FilmDTO();
-                    filmDTO.setUrl("api/order/create");
+                    if (filmOrderCreateDTO.getTicketType() ==1){
+                        filmDTO.setUrl("api/order/create");
+                    }else if (filmOrderCreateDTO.getTicketType() ==2){
+                        filmDTO.setUrl("api/order/create-soon-order");
+                    }
+
                     StringBuffer paramData =  new StringBuffer();
-                    FilmOrderCreateDTO filmOrderCreateDTO = filmOrderJsonData.getFilmOrderCreateDTO();
                     paramData.append("showId="+filmOrderCreateDTO.getShowId()+"&");
                     paramData.append("seat="+filmOrderCreateDTO.getSeat()+"&");
                     if (filmOrderCreateDTO.getReservedPhone() != null){
@@ -320,6 +326,13 @@ public class NotifyController {
                             e.printStackTrace();
                         }
                     }
+                    if (filmXdResult.getData()!= null){
+                        FilmMcpData filmMcpData = filmXdResult.getData();
+                        filmOrderJsonData.setFilmMcpData(filmMcpData);
+                        filmOrder.setOrderDataJson(JSONObject.toJSONString(filmOrderJsonData));
+
+                    }
+
                     filmOrderService.updateById(filmOrder);
 
                 }

zzjs-service/src/main/java/com/miaxis/feign/dto/FilmMcpData.java

@@ -0,0 +1,17 @@
+package com.miaxis.feign.dto;
+
+
+import lombok.Data;
+
+/**
+ * 电影秒出票数据类型
+ */
+
+@Data
+public class FilmMcpData {
+    String third_order_id;
+    String ticket;
+    int ticketStatus;
+    String order_id;
+
+}

zzjs-service/src/main/java/com/miaxis/feign/dto/FilmXdResult.java

@@ -12,4 +12,5 @@ public class FilmXdResult {
     Boolean success;
     String message;
     int code;
+    FilmMcpData data;
 }

zzjs-service/src/main/java/com/miaxis/film/dto/FilmOrderJsonData.java

@@ -1,5 +1,6 @@
 package com.miaxis.film.dto;
 
+import com.miaxis.feign.dto.FilmMcpData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,7 +17,8 @@ public class FilmOrderJsonData {
     private CinemaData cinemaData;
     //电影订单回调信息
     private FilmOrderNotifyDTO filmOrderNotifyDTO ;
-
+    //快速出票
+    private FilmMcpData filmMcpData;