Merge branch 'dev' into dev-mall

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/enums/airport/AirportApiEnum.java

@@ -58,6 +58,10 @@ public enum AirportApiEnum implements ApiEnum {
      * 订单详情
      */
     QUERY_TK_ORDER("/open/plane/order/queryTkOrder", "根据订单编号查看机票订单详情信息，订单不存在时，data为null"),
+    /**
+     * 根据航班号获取航班信息
+     */
+    QUERY_FLIGHT_BY_HBH("/open/plane/shopping/queryFlightByHbh", "根据航班号获取航班信息"),
     /**
      * 订单验票
      */

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/QueryFlightByHbhModel.java

+package org.dromara.common.ys.model.req.airport;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.dromara.common.ys.model.BaseModel;
+
+/**
+ * @author hzh
+ * @date 2024-11-15
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QueryFlightByHbhModel extends BaseModel {
+
+    /**
+     * 到达机场三字码 按起降地查询的时候 不能为空
+     **/
+    private String arriveAirport;
+
+    /**
+     * 出发机场三字码 按起降地查询的时候 不能为空
+     **/
+    private String departAirport;
+
+    /**
+     * 起飞时间
+     */
+    private String departTime;
+
+    /**
+     * 航班号 按航班号查询的时候不能为空
+     */
+    private String flightNo;
+
+    /**
+     * 是否隐藏已起飞的航班
+     */
+    private Boolean ifHideObsolete;
+
+}

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/QueryFlightByHbhModel.java

+package org.dromara.common.ys.model.res.airport;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author hzh
+ * @date 2024-11-15
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QueryFlightByHbhModel {
+    /**
+     * 中转城市名称
+     **/
+    private String transferCityName;
+    /**
+     * 到达机场三字码
+     **/
+    private String arriveAirport;
+    /**
+     * 中转城市ID
+     **/
+    private String transferCity;
+    /**
+     * 飞行天数 到达时间比出发时间大几天
+     **/
+    private String travelDay;
+    /**
+     * 适用班期
+     **/
+    private String week;
+    /**
+     * 出发城市ID
+     **/
+    private String departCity;
+    /**
+     * 中转机场名称
+     **/
+    private String transferAirportName;
+    /**
+     * 是否共享航班
+     **/
+    private Integer isApplyShare;
+    /**
+     * 出发航站楼
+     **/
+    private String departTerminal;
+    /**
+     * 到达城市名称
+     **/
+    private String arriveCityName;
+    /**
+     * 到达时间
+     **/
+    private String arriveTime;
+    /**
+     * 航司图片
+     **/
+    private String airlineImg;
+    /**
+     * 到达机场名称
+     **/
+    private String arriveAirportName;
+    /**
+     * 实际承运航班号
+     **/
+    private String actualFlightNo;
+    /**
+     * 飞机机型
+     **/
+    private String model;
+    /**
+     * 航司二字码
+     **/
+    private String airline;
+    /**
+     * 国内国际 0国际 1国内
+     **/
+    private Integer international;
+    /**
+     * 经停到达时间
+     **/
+    private String stopArriveTime;
+    /**
+     * 出发城市名称
+     **/
+    private String departCityName;
+    /**
+     * 出发时间
+     **/
+    private String departTime;
+    /**
+     * 经停城市ID
+     **/
+    private String stopCity;
+    /**
+     * 到达航站楼
+     **/
+    private String arriveTerminal;
+    /**
+     * 经停起飞时间
+     **/
+    private String stopDepartTime;
+    /**
+     * 经停城市名称
+     **/
+    private String stopCityName;
+    /**
+     * 中转机场三字码
+     **/
+    private String transferAirport;
+    /**
+     * 到达城市ID
+     **/
+    private String arriveCity;
+    /**
+     * 出发机场三字码
+     **/
+    private String departAirport;
+    /**
+     * 航班号 不能为空
+     **/
+    private String flightNo;
+    /**
+     * 经停机场三字码
+     **/
+    private String stopAirport;
+    /**
+     * 出发机场名称中文
+     **/
+    private String departAirportName;
+    /**
+     * 经停机场名称
+     **/
+    private String stopAirportName;
+    /**
+     * 航司名称
+     **/
+    private String airlineName;
+
+}

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IAirportService.java

@@ -69,6 +69,15 @@ public interface IAirportService {
      */
     QueryTkOrderModel detail(String userId, org.dromara.common.ys.model.req.airport.QueryTkOrderModel model);
 
+    /**
+     * 查询航班列表
+     *
+     * @param userId 用户id
+     * @param model  查询参数
+     * @return 查询结果
+     */
+    List<QueryFlightByHbhModel> queryFlightByHbh(String userId, org.dromara.common.ys.model.req.airport.QueryFlightByHbhModel model);
+
     /**
      * 取消订单
      *

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java

@@ -139,6 +139,22 @@ public class AirPortServiceImpl implements IAirportService {
         return JSON.parseObject(res.getData(), QueryTkOrderModel.class);
     }
 
+    @Override
+    public List<QueryFlightByHbhModel> queryFlightByHbh(String userId, org.dromara.common.ys.model.req.airport.QueryFlightByHbhModel model) {
+        ApiHttpResponse res = Api.v1(
+            RequestMethodEnum.POST,
+            DomainEnum.TEST.getDomain(),
+            AirportApiEnum.QUERY_FLIGHT_BY_HBH.getUrl(),
+            userId,
+            null,
+            JSON.toJSONString(model)
+        );
+        if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
+            throw new RuntimeException(res.getTips());
+        }
+        return JSON.parseArray(JSON.parseObject(res.getData()).getString("list"), QueryFlightByHbhModel.class);
+    }
+
     @Override
     public QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopModel model) {
         ApiHttpResponse res = Api.v1(

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

@@ -232,6 +232,14 @@ public class AirportController extends BaseController {
         return R.ok(orderAirportService.queryPageList(bo, pageQuery));
     }
 
+    /**
+     * 查询航班列表
+     */
+    @GetMapping("/queryFlightByHbh")
+    public R<List<QueryFlightByHbhModel>> queryFlightByHbh(org.dromara.common.ys.model.req.airport.QueryFlightByHbhModel model) {
+        return R.ok(airPortService.queryFlightByHbh(getUserId(), model));
+    }
+
     /**
      * 订单详情
      */