Skip to content

T
travel-cloud
提交 16f932f5 authored 作者: hzh's avatar hzh
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 509e08b2 a4728704
显示空白字符变更
内嵌 并排
正在显示 包含 67 行增加 和 63 行删除
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/config/ProdConfig.java
浏览文件 @ 16f932f5
......@@ -10,14 +10,17 @@ public interface ProdConfig {
/**
* 请求来源
*/
String REQ_TYPE = "8" ;
String REQ_TYPE = "8";
/**
* 企业ID
*/
String CORP_ID = "c619f1b600cf483eab6a142fa0e8e10b" ;
String CORP_ID = "c619f1b600cf483eab6a142fa0e8e10b";
/**
* 签名key
*/
String SIGN_KEY = "1729128597852" ;
String SIGN_KEY = "1729128597852";
/**
* 默认用户id
*/
String USE_ID = "15301818478";
}
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java
浏览文件 @ 16f932f5
......@@ -30,7 +30,7 @@ public class AirPortServiceImpl implements IAirportService {
public QueryFlightModel queryFlight(String userId, org.dromara.common.ys.model.req.airport.QueryFlightModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.QUERY_FLIGHT.getUrl(),
userId,
null,
......@@ -46,7 +46,7 @@ public class AirPortServiceImpl implements IAirportService {
public QueryFlightMinPriceModel queryFlightMinPrice(String userId, org.dromara.common.ys.model.req.airport.QueryFlightMinPriceModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.QUERY_FLIGHT_MIN_PRICE.getUrl(),
userId,
null,
......@@ -62,7 +62,7 @@ public class AirPortServiceImpl implements IAirportService {
public List<BookOrderModel> bookOrder(String userId, org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.BOOK_ORDER.getUrl(),
userId,
null,
......@@ -78,7 +78,7 @@ public class AirPortServiceImpl implements IAirportService {
public PageInfo<OrderListModel> orderList(String userId, org.dromara.common.ys.model.req.airport.OrderListModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.QUERY_ORDER_LIST.getUrl(),
userId,
null,
......@@ -110,7 +110,7 @@ public class AirPortServiceImpl implements IAirportService {
public QueryTkOrderModel detail(String userId, org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.QUERY_TK_ORDER.getUrl(),
userId,
null,
......@@ -142,7 +142,7 @@ public class AirPortServiceImpl implements IAirportService {
public void cancelOrder(String userId, CancelOrderModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.CANCEL_TK_ORDER.getUrl(),
userId,
null,
......@@ -157,7 +157,7 @@ public class AirPortServiceImpl implements IAirportService {
public OrderCheckPriceModel checkPrice(String userId, org.dromara.common.ys.model.req.airport.OrderCheckPriceModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.CHECK_PRICE_FOR_ORDER.getUrl(),
userId,
null,
......@@ -173,7 +173,7 @@ public class AirPortServiceImpl implements IAirportService {
public void confirmOrder(String userId, OrderConfirmModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.CONFIRM_TICKET.getUrl(),
userId,
null,
......@@ -188,7 +188,7 @@ public class AirPortServiceImpl implements IAirportService {
public RefundOfVoyageModel orderRefundOfVoyage(String userId, org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.GET_VOYAGE_FOR_REFUND.getUrl(),
userId,
null,
......@@ -204,7 +204,7 @@ public class AirPortServiceImpl implements IAirportService {
public OrderRefundAddModel orderRefundAdd(String userId, org.dromara.common.ys.model.req.airport.OrderRefundAddModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.ADD_REFUND_ORDER.getUrl(),
userId,
null,
......@@ -220,7 +220,7 @@ public class AirPortServiceImpl implements IAirportService {
public List<OrderRefundDetailModel> orderRefundDetail(String userId, org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.QUERY_REFUND_ORDER.getUrl(),
userId,
null,
......@@ -236,7 +236,7 @@ public class AirPortServiceImpl implements IAirportService {
public Boolean orderRefundCancel(String userId, org.dromara.common.ys.model.req.airport.OrderRefundCancelModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.CANCEL_REFUND_ORDER.getUrl(),
userId,
null,
......@@ -252,7 +252,7 @@ public class AirPortServiceImpl implements IAirportService {
public PageInfo<OrderRefundListModel> orderRefundList(String userId, org.dromara.common.ys.model.req.airport.OrderRefundListModel model) {
ApiHttpResponse res = Api.v1(
RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
AirportApiEnum.REFUND_QUERY_LIST.getUrl(),
userId,
null,
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/CommonResourceServiceImpl.java
浏览文件 @ 16f932f5
......@@ -26,7 +26,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.CountryModel> getCountryList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.COUNTRY_DATA.getUrl(),
userId,
JSON.toJSONString(new CountryModel())
......@@ -41,7 +41,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.ProvinceModel> getProvinceList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.PROVINCE_DATA.getUrl(),
userId,
JSON.toJSONString(new ProvinceModel())
......@@ -56,7 +56,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.CityModel> getCityList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.CITY_DATA.getUrl(),
userId,
JSON.toJSONString(new CityModel())
......@@ -74,7 +74,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.AirportModel> getAirportList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.AIRPORT_DATA.getUrl(),
userId,
JSON.toJSONString(new AirportModel())
......@@ -92,7 +92,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.StationModel> getStationList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.STATION_DATA.getUrl(),
userId,
null,
......@@ -111,7 +111,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
public List<org.dromara.common.ys.model.res.comomResource.TrainBaseModel> getTrainBaseList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.TRAIN_BASE_DATA.getUrl(),
userId,
null,
......@@ -131,7 +131,7 @@ public class CommonResourceServiceImpl implements ICommonResourceService {
DictModel model = new DictModel().setParType(parType);
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
CommonResourceApiEnum.DICT_DATA.getUrl(),
userId,
null,
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/HotelServiceImpl.java
浏览文件 @ 16f932f5
......@@ -31,7 +31,7 @@ public class HotelServiceImpl implements IHotelService {
public HotelDetailModel hotelDetail(String userId, org.dromara.common.ys.model.req.hotel.HotelDetailModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.HOTEL_DETAIL.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -49,7 +49,7 @@ public class HotelServiceImpl implements IHotelService {
public HotelShoppingPricePlanModel hotelPricePlan(String userId, org.dromara.common.ys.model.req.hotel.HotelShoppingPricePlanModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.PRICE_PLAN.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -64,7 +64,7 @@ public class HotelServiceImpl implements IHotelService {
public PageInfo<HotelShoppingBaseListModel> hotelList(String userId, org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.QUERY_LIST.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -95,7 +95,7 @@ public class HotelServiceImpl implements IHotelService {
public HotelOrderBookModel orderBook(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.BOOK.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -110,7 +110,7 @@ public class HotelServiceImpl implements IHotelService {
public CancelOrderModel orderCancel(String userId, org.dromara.common.ys.model.req.hotel.CancelOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.CANCEL_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -125,7 +125,7 @@ public class HotelServiceImpl implements IHotelService {
public boolean orderPay(String userId, PayOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.PAY_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -140,7 +140,7 @@ public class HotelServiceImpl implements IHotelService {
public HotelOrderQueryDetailModel hotelOrderDetail(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderQueryDetailModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.QUERY_DETAIL.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -155,7 +155,7 @@ public class HotelServiceImpl implements IHotelService {
public PageInfo<HotelOrderQueryListModel> orderList(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.ORDER_QUERY_LIST.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -186,7 +186,7 @@ public class HotelServiceImpl implements IHotelService {
public List<HtOrderInfoModel> orderDetail(String userId, HotelQueryOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.QUERY_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -201,7 +201,7 @@ public class HotelServiceImpl implements IHotelService {
public List<HtRefundInfoModel> orderRefundDetail(String userId, HotelQueryRefundOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.QUERY_REFUND_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -216,7 +216,7 @@ public class HotelServiceImpl implements IHotelService {
public HotelOrderXjdModel orderXjd(String userId, org.dromara.common.ys.model.req.hotel.HotelOrderXjdModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
HotelApiEnum.XJD.getUrl(),
userId,
JSON.toJSONString(model)
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/InsuranceServiceImpl.java
浏览文件 @ 16f932f5
......@@ -24,7 +24,7 @@ public class InsuranceServiceImpl implements IInsuranceService {
public List<org.dromara.common.ys.model.res.insurance.BxcpModel> list(String userId, BxcpModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
InsuranceApiEnum.GET_BX_CP.getUrl(),
userId,
null,
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/OrgServiceImpl.java
浏览文件 @ 16f932f5
......@@ -22,7 +22,7 @@ public class OrgServiceImpl implements IOrgService {
public boolean saveOrUpdateEmployee(String userId, EditEmployeeModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
OrgApiEnum.EDIT_EMPLOYEE.getUrl(),
userId,
null,
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/TrainServiceImpl.java
浏览文件 @ 16f932f5
......@@ -34,7 +34,7 @@ public class TrainServiceImpl implements ITrainService {
public List<QueryModel> queryModel(String userId, org.dromara.common.ys.model.req.train.QueryModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.QUERY.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -52,7 +52,7 @@ public class TrainServiceImpl implements ITrainService {
public List<AllStationModel> getAllStation(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.FIND_ALL_STATION.getUrl(),
userId,
JSON.toJSONString(new AllStationModel())
......@@ -67,7 +67,7 @@ public class TrainServiceImpl implements ITrainService {
public CheckAccountResModel checkAccount(String userId, TrainSetCheckAccountDTOModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.CHECK_ACCOUNT.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -82,7 +82,7 @@ public class TrainServiceImpl implements ITrainService {
public OrderBookResModel bookOrder(String userId, OrderBookReqModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.ORDER_BOOK.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -97,7 +97,7 @@ public class TrainServiceImpl implements ITrainService {
public void confirmOrder(String userId, ConfirmOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.CONFIRM.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -111,7 +111,7 @@ public class TrainServiceImpl implements ITrainService {
public PageInfo<OrderListQueryResModel> orderList(String userId, OrderListQueryModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.QUERY_ORDER_LIST.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -142,7 +142,7 @@ public class TrainServiceImpl implements ITrainService {
public OrderInfoModel detail(String userId, OrderQueryModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.QUERY_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -157,7 +157,7 @@ public class TrainServiceImpl implements ITrainService {
public Boolean cancelOrder(String userId, CancelOrderModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.ORDER_CANCEL.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -172,7 +172,7 @@ public class TrainServiceImpl implements ITrainService {
public List<TrainStopModel> queryTrainStop(String userId, org.dromara.common.ys.model.req.train.TrainStopModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.QUERY_BY_TRAIN_NO.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -187,7 +187,7 @@ public class TrainServiceImpl implements ITrainService {
public OrderRefundApplyModel orderRefundApply(String userId, org.dromara.common.ys.model.req.train.OrderRefundApplyModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.REFUND_APPLY.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -202,7 +202,7 @@ public class TrainServiceImpl implements ITrainService {
public List<OrderRefundDetailModel> orderRefundDetail(String userId, org.dromara.common.ys.model.req.train.OrderRefundDetailModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.REFUND_QUERY_REFUND_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -217,7 +217,7 @@ public class TrainServiceImpl implements ITrainService {
public Boolean orderRefundCancel(String userId, OrderRefundCancelModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.REFUND_CANCEL.getUrl(),
userId,
JSON.toJSONString(model)
......@@ -232,7 +232,7 @@ public class TrainServiceImpl implements ITrainService {
public PageInfo<OrderRefundListModel> orderRefundList(String userId, org.dromara.common.ys.model.req.train.OrderRefundListModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
TrainApiEnum.REFUND_QUERY_REFUND_ORDER.getUrl(),
userId,
JSON.toJSONString(model)
......
ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/VehiclesServiceImpl.java
浏览文件 @ 16f932f5
......@@ -29,7 +29,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public org.dromara.common.ys.model.res.vehicles.EstimateYyycPriceModel estimateYyycPrice(String userId, EstimateYyycPriceModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.ESTIMATE_YYYC_PRICE.getUrl(),
userId,
null,
......@@ -45,7 +45,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public org.dromara.common.ys.model.res.vehicles.EstimateJsycPriceModel estimateJsycPrice(String userId, EstimateJsycPriceModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.ESTIMATE_JSYC_PRICE.getUrl(),
userId,
null,
......@@ -61,7 +61,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public OrderDetailModel detail(String userId, org.dromara.common.ys.model.req.vehicles.OrderDetailModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.QUERY_DETAIL.getUrl(),
userId,
null,
......@@ -77,7 +77,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public PageInfo<OrderListModel> orderList(String userId, org.dromara.common.ys.model.req.vehicles.OrderListModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.QUERY_LIST.getUrl(),
userId,
null,
......@@ -109,7 +109,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public OrderBookJsycModel bookJsyc(String userId, org.dromara.common.ys.model.req.vehicles.OrderBookJsycModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.BOOK_JSYC.getUrl(),
userId,
null,
......@@ -125,7 +125,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public OrderBookYyycModel bookYyyc(String userId, org.dromara.common.ys.model.req.vehicles.OrderBookYyycModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.BOOK_YYYC.getUrl(),
userId,
null,
......@@ -141,7 +141,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public DriverLocationModel getDriverLocation(String userId, org.dromara.common.ys.model.req.vehicles.DriverLocationModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.GET_DRIVER_LOCATION.getUrl(),
userId,
null,
......@@ -157,7 +157,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public CancelFeeModel getCancelFee(String userId, org.dromara.common.ys.model.req.vehicles.CancelFeeModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.GET_CANCEL_FEE.getUrl(),
userId,
null,
......@@ -173,7 +173,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public OrderCancelModel cancel(String userId, org.dromara.common.ys.model.req.vehicles.OrderCancelModel model) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.CANCEL.getUrl(),
userId,
null,
......@@ -189,7 +189,7 @@ public class VehiclesServiceImpl implements IVehiclesService {
public List<OrderGetQxyyModel> getCancelReasonList(String userId) {
ApiHttpResponse res = Api.v1(
com.wenhe.base.base.RequestMethodEnum.POST,
DomainEnum.TEST.getDomain(),
DomainEnum.PROD.getDomain(),
VehiclesApiEnum.GET_QXYY.getUrl(),
userId,
null,
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java
浏览文件 @ 16f932f5
......@@ -13,6 +13,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.ys.common.PageInfo;
import org.dromara.common.ys.config.ProdConfig;
import org.dromara.common.ys.constant.Cplx;
import org.dromara.common.ys.constant.TripType;
import org.dromara.common.ys.model.req.airport.OrderConfirmModel;
......@@ -208,7 +209,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/queryFlightStop")
public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopModel model) {
return R.ok(airPortService.queryFlightStop("15301818478", model));
return R.ok(airPortService.queryFlightStop(ProdConfig.USE_ID, model));
}
/**
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/dubbo/RemoteServerServiceImpl.java
浏览文件 @ 16f932f5
......@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.seata.spring.annotation.GlobalTransactional;
import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.ys.config.Config;
import org.dromara.common.ys.config.ProdConfig;
import org.dromara.common.ys.constant.Status;
import org.dromara.common.ys.model.req.org.EditEmployeeModel;
import org.dromara.common.ys.service.IOrgService;
......@@ -46,7 +46,7 @@ public class RemoteServerServiceImpl implements RemoteServerService {
entity.setPhonenumber(user.getPhoneNumber());
userMapper.insert(entity);
//新增用户
orgService.saveOrUpdateEmployee(Config.USE_ID,
orgService.saveOrUpdateEmployee(ProdConfig.USE_ID,
new EditEmployeeModel()
.setEmpNo(entity.getUserNo())
.setEmpName(entity.getUserName())
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论