Skip to content

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

功能优化

上级 7eac860b
隐藏空白字符变更
内嵌 并排
正在显示 包含 97 行增加 和 89 行删除
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/BaseController.java
浏览文件 @ e1b617a9
......@@ -37,4 +37,12 @@ public class BaseController {
return userNo;
}
public String getQueryUserId(){
String userNo = LoginHelper.getUserNo();
if (StringUtils.isEmpty(userNo)) {
throw new RuntimeException("未获取到第三方用户编码");
}
return userNo;
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java
浏览文件 @ e1b617a9
......@@ -94,7 +94,7 @@ public class AirportController extends BaseController {
model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
return R.ok(airportService.queryFlight(getUserId(), model));
return R.ok(airportService.queryFlight(getQueryUserId(), model));
}
/**
......@@ -107,7 +107,7 @@ public class AirportController extends BaseController {
model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
return R.ok(airportService.queryFlightMinPrice(getUserId(), model));
return R.ok(airportService.queryFlightMinPrice(getQueryUserId(), model));
}
/**
......@@ -116,7 +116,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000)
@GetMapping("queryMoreCabin")
public R<QueryMoreCabinModel> queryMoreCabin(org.dromara.common.ys.model.req.airport.QueryMoreCabinModel model) {
return R.ok(airportService.queryMoreCabin(getUserId(), model));
return R.ok(airportService.queryMoreCabin(getQueryUserId(), model));
}
private String getCode(String cityName, List<AirportModel> airPortList) {
......@@ -137,7 +137,7 @@ public class AirportController extends BaseController {
private List<AirportModel> getAirPortList() {
List<AirportModel> airPortList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(AIRPORT)), AirportModel.class);
if (CollectionUtils.isEmpty(airPortList)) {
airPortList = commonResourceService.getAirportList(getUserId());
airPortList = commonResourceService.getAirportList(getQueryUserId());
RedisUtils.setCacheObject(AIRPORT, airPortList, Duration.ofMinutes(60 * 60 * 24L));
}
return airPortList;
......@@ -148,7 +148,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/insuranceList")
public R<List<org.dromara.common.ys.model.res.insurance.BxcpModel>> insuranceList() {
return R.ok(insuranceService.list(getUserId(), new BxcpModel().setCplx(Cplx.DOMESTIC.getCode())));
return R.ok(insuranceService.list(getQueryUserId(), new BxcpModel().setCplx(Cplx.DOMESTIC.getCode())));
}
/**
......@@ -195,7 +195,7 @@ public class AirportController extends BaseController {
@GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
@PostMapping("/checkPrice")
public R<OrderCheckPriceModel> checkPrice(@RequestBody org.dromara.common.ys.model.req.airport.OrderCheckPriceModel model) {
return R.ok(airportService.checkPrice(getUserId(), model));
return R.ok(airportService.checkPrice(getQueryUserId(), model));
}
/**
......@@ -239,8 +239,8 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderList")
public R<PageInfo<org.dromara.common.ys.model.res.airport.OrderListModel>> orderList(OrderListModel model) {
model.setBookNo(getUserId());
return R.ok(airportService.orderList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(airportService.orderList(getQueryUserId(), model));
}
/**
......@@ -248,7 +248,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/local/orderList")
public R<TableDataInfo<OrderAirportVo>> list(OrderAirportBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
bo.setPersonCode(getQueryUserId());
return R.ok(orderAirportService.queryPageList(bo, pageQuery));
}
......@@ -257,7 +257,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/queryFlightByHbh")
public R<List<QueryFlightByHbhModel>> queryFlightByHbh(org.dromara.common.ys.model.req.airport.QueryFlightByHbhModel model) {
return R.ok(airportService.queryFlightByHbh(getUserId(), model));
return R.ok(airportService.queryFlightByHbh(getQueryUserId(), model));
}
/**
......@@ -265,7 +265,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderDetail")
public R<QueryTkOrderModel> orderDetail(org.dromara.common.ys.model.req.airport.QueryTkOrderModel model) {
QueryTkOrderModel detail = airportService.detail(getUserId(), model);
QueryTkOrderModel detail = airportService.detail(getQueryUserId(), model);
//跟新到订单表
orderAirportService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(detail);
......@@ -284,7 +284,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderRefundOfVoyage")
public R<RefundOfVoyageModel> orderRefundOfVoyage(org.dromara.common.ys.model.req.airport.RefundOfVoyageModel model) {
return R.ok(airportService.orderRefundOfVoyage(getUserId(), model));
return R.ok(airportService.orderRefundOfVoyage(getQueryUserId(), model));
}
......@@ -304,7 +304,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderRefund/detail")
public R<List<OrderRefundDetailModel>> orderRefundDetail(org.dromara.common.ys.model.req.airport.OrderRefundDetailModel model) {
return R.ok(airportService.orderRefundDetail(getUserId(), model));
return R.ok(airportService.orderRefundDetail(getQueryUserId(), model));
}
/**
......@@ -323,8 +323,8 @@ public class AirportController extends BaseController {
*/
@GetMapping("/orderRefund/list")
public R<PageInfo<OrderRefundListModel>> orderRefundList(org.dromara.common.ys.model.req.airport.OrderRefundListModel model) {
model.setBookNo(getUserId());
return R.ok(airportService.orderRefundList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(airportService.orderRefundList(getQueryUserId(), model));
}
/**
......@@ -332,7 +332,7 @@ public class AirportController extends BaseController {
*/
@GetMapping("/refund/local/orderList")
public R<TableDataInfo<OrderAirportRefundVo>> list(OrderAirportRefundBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
bo.setPersonCode(getQueryUserId());
return R.ok(orderAirportRefundService.queryPageList(bo, pageQuery));
}
......@@ -343,7 +343,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/local/refresh")
public R<Boolean> refresh() throws InterruptedException {
List<OrderAirportVo> orderList = orderAirportService.queryList(new OrderAirportBo().setPersonCode(getUserId()));
List<OrderAirportVo> orderList = orderAirportService.queryList(new OrderAirportBo().setPersonCode(getQueryUserId()));
List<String> orderStatusList = RemoteYsOrderServiceImpl.AIRPORT_ORDER_STATUS_LIST;
List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderAirportVo::getOrderNo).collect(Collectors.toList());
orderAirportRefundService.updateOrderInfo(orderNoList);
......@@ -371,7 +371,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/queryFlightRule")
public R<QueryFlightRuleModel> queryFlightRule(@RequestBody org.dromara.common.ys.model.req.airport.QueryFlightRuleModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.queryFlightRule(userId, model));
}
......@@ -380,7 +380,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/matchClbz")
public R<MatchClbzModel> matchClbz(@RequestBody org.dromara.common.ys.model.req.airport.MatchClbzModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.matchClbz(userId, model));
}
......@@ -389,7 +389,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/checkPriceForFlight")
public R<CheckPriceForFlightModel> checkPriceForFlight(@RequestBody org.dromara.common.ys.model.req.airport.CheckPriceForFlightModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.checkPriceForFlight(userId, model));
}
......@@ -398,7 +398,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/checkCabin")
public R<CheckCabinModel> checkCabin(@RequestBody org.dromara.common.ys.model.req.airport.CheckCabinModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.checkCabin(userId, model));
}
......@@ -407,7 +407,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/checkXyhBmd")
public R<CheckXyhBmdModel> checkXyhBmd(@RequestBody org.dromara.common.ys.model.req.airport.CheckXyhBmdModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.checkXyhBmd(userId, model));
}
......@@ -416,7 +416,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/planeCheckState")
public R<PlaneCheckStateModel> planeCheckState(@RequestBody org.dromara.common.ys.model.req.airport.PlaneCheckStateModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.planeCheckState(userId, model));
}
......@@ -425,7 +425,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/getTicketStatus")
public R<GetTicketStatusModel> getTicketStatus(@RequestBody org.dromara.common.ys.model.req.airport.GetTicketStatusModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.getTicketStatus(userId, model));
}
......@@ -434,7 +434,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/getVoyageForChange")
public R<GetVoyageForChangeModel> getVoyageForChange(@RequestBody org.dromara.common.ys.model.req.airport.GetVoyageForChangeModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.getVoyageForChange(userId, model));
}
......@@ -443,7 +443,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/queryFlightForChange")
public R<QueryFlightForChangeModel> queryFlightForChange(@RequestBody org.dromara.common.ys.model.req.airport.QueryFlightForChangeModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.queryFlightForChange(userId, model));
}
......@@ -461,7 +461,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/queryChangeOrder")
public R<QueryChangeOrderModel> queryChangeOrder(@RequestBody org.dromara.common.ys.model.req.airport.QueryChangeOrderModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.queryChangeOrder(userId, model));
}
......@@ -490,7 +490,7 @@ public class AirportController extends BaseController {
*/
@PostMapping("/changeQueryList")
public R<PageInfo<PlaneOrderQueryChangeOrderApiBeanModel>> changeQueryList(@RequestBody PlaneOrderQueryChangeOrderApiModel model) {
String userId = getUserId();
String userId = getQueryUserId();
return R.ok(airportService.changeQueryList(userId, model));
}
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/bill/BillController.java
浏览文件 @ e1b617a9
......@@ -28,7 +28,7 @@ public class BillController extends BaseController {
*/
@GetMapping("/queryBill")
public R<QueryBillModel> queryBill(@RequestBody org.dromara.common.ys.model.req.bill.QueryBillModel model) {
return R.ok(billService.queryBill(getUserId(), model));
return R.ok(billService.queryBill(getQueryUserId(), model));
}
/**
......@@ -36,7 +36,7 @@ public class BillController extends BaseController {
*/
@GetMapping("/queryBillAll")
public R<QueryBillAllModel> queryBillAll(@RequestBody org.dromara.common.ys.model.req.bill.QueryBillAllModel model) {
return R.ok(billService.queryBillAll(getUserId(), model));
return R.ok(billService.queryBillAll(getQueryUserId(), model));
}
/**
......@@ -44,7 +44,7 @@ public class BillController extends BaseController {
*/
@GetMapping("/accountDetail")
public R<PageInfo<AccountDetailBeanModel>> accountDetail(@RequestBody org.dromara.common.ys.model.req.bill.AccountDetailModel model) {
return R.ok(billService.accountDetail(getUserId(), model));
return R.ok(billService.accountDetail(getQueryUserId(), model));
}
/**
......@@ -52,7 +52,7 @@ public class BillController extends BaseController {
*/
@GetMapping("/consTicketList")
public R<ConsTicketListModel> consTicketList(@RequestBody org.dromara.common.ys.model.req.bill.ConsTicketListModel model) {
return R.ok(billService.consTicketList(getUserId(), model));
return R.ok(billService.consTicketList(getQueryUserId(), model));
}
/**
......@@ -68,7 +68,7 @@ public class BillController extends BaseController {
*/
@GetMapping("/getCompareResult")
public R<TravelBillGetCompareResultModel> getCompareResult(@RequestBody org.dromara.common.ys.model.req.bill.TravelBillGetCompareResultModel model) {
return R.ok(billService.getCompareResult(getUserId(), model));
return R.ok(billService.getCompareResult(getQueryUserId(), model));
}
/**
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java
浏览文件 @ e1b617a9
......@@ -45,7 +45,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/hotel/detail")
public R<HotelDetailModel> hotelDetail(org.dromara.common.ys.model.req.hotel.HotelDetailModel model) {
return R.ok(hotelService.hotelDetail(getUserId(), model));
return R.ok(hotelService.hotelDetail(getQueryUserId(), model));
}
/**
......@@ -53,7 +53,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/hotel/pricePlan")
public R<HotelShoppingPricePlanModel> hotelPricePlan(org.dromara.common.ys.model.req.hotel.HotelShoppingPricePlanModel model) {
return R.ok(hotelService.hotelPricePlan(getUserId(), model));
return R.ok(hotelService.hotelPricePlan(getQueryUserId(), model));
}
/**
......@@ -61,7 +61,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/hotel/list")
public R<PageInfo<HotelShoppingBaseListModel>> hotelList(org.dromara.common.ys.model.req.hotel.HotelShoppingBaseListModel model) {
return R.ok(hotelService.hotelList(getUserId(), model));
return R.ok(hotelService.hotelList(getQueryUserId(), model));
}
/**
......@@ -105,7 +105,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/order/hotelDetail")
public R<HotelOrderQueryDetailModel> orderHotelDetail(org.dromara.common.ys.model.req.hotel.HotelOrderQueryDetailModel model) {
HotelOrderQueryDetailModel detail = hotelService.hotelOrderDetail(getUserId(), model);
HotelOrderQueryDetailModel detail = hotelService.hotelOrderDetail(getQueryUserId(), model);
orderHotelService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(detail);
}
......@@ -115,8 +115,8 @@ public class HotelController extends BaseController {
*/
@GetMapping("/order/list")
public R<PageInfo<HotelOrderQueryListModel>> orderList(org.dromara.common.ys.model.req.hotel.HotelOrderQueryListModel model) {
model.setBookNo(getUserId());
return R.ok(hotelService.orderList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(hotelService.orderList(getQueryUserId(), model));
}
/**
......@@ -126,7 +126,7 @@ public class HotelController extends BaseController {
*/
@PostMapping("/local/refresh")
public R<Boolean> refresh() throws InterruptedException {
List<OrderHotelVo> orderList = orderHotelService.queryList(new OrderHotelBo().setPersonCode(getUserId()));
List<OrderHotelVo> orderList = orderHotelService.queryList(new OrderHotelBo().setPersonCode(getQueryUserId()));
List<String> orderStatusList = RemoteYsOrderServiceImpl.HOTEL_ORDER_STATUS_LIST;
List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderHotelVo::getOrderNo).collect(Collectors.toList());
orderHotelService.updateOrderInfo(orderNoList);
......@@ -139,7 +139,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/order/local/list")
public R<TableDataInfo<OrderHotelVo>> orderLocalList(OrderHotelBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
bo.setPersonCode(getQueryUserId());
return R.ok(orderHotelService.queryPageList(bo, pageQuery));
}
......@@ -148,7 +148,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/order/detail")
public R<List<HtOrderInfoModel>> orderDetail(org.dromara.common.ys.model.req.hotel.HotelQueryOrderModel model) {
return R.ok(hotelService.orderDetail(getUserId(), model));
return R.ok(hotelService.orderDetail(getQueryUserId(), model));
}
/**
......@@ -156,7 +156,7 @@ public class HotelController extends BaseController {
*/
@GetMapping("/order/refundDetail")
public R<List<HtRefundInfoModel>> orderRefundDetail(org.dromara.common.ys.model.req.hotel.HotelQueryRefundOrderModel model) {
return R.ok(hotelService.orderRefundDetail(getUserId(), model));
return R.ok(hotelService.orderRefundDetail(getQueryUserId(), model));
}
/**
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/qz/QzController.java
浏览文件 @ e1b617a9
......@@ -35,7 +35,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/queryProdList")
public R<PageInfo<VisaProdBeanModel>> queryProdList(@RequestBody QueryProdListModel model) {
return R.ok(qzService.queryProdList(getUserId(), model));
return R.ok(qzService.queryProdList(getQueryUserId(), model));
}
/**
......@@ -43,7 +43,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/getProdDetail")
public R<GetProdDetailModel> getProdDetail(@RequestBody org.dromara.common.ys.model.req.qz.GetProdDetailModel model) {
return R.ok(qzService.getProdDetail(getUserId(), model));
return R.ok(qzService.getProdDetail(getQueryUserId(), model));
}
/**
......@@ -51,7 +51,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/queryAssociation")
public R<PageInfo<AssocitionBeanModel>> queryAssociation(@RequestBody QueryAssociationModel model) {
return R.ok(qzService.queryAssociation(getUserId(), model));
return R.ok(qzService.queryAssociation(getQueryUserId(), model));
}
/**
......@@ -59,7 +59,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/getAssociatDetail")
public R<GetAssociatDetailModel> getAssociatDetail(@RequestBody org.dromara.common.ys.model.req.qz.GetAssociatDetailModel model) {
return R.ok(qzService.getAssociatDetail(getUserId(), model));
return R.ok(qzService.getAssociatDetail(getQueryUserId(), model));
}
/**
......@@ -67,7 +67,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/queryNewAppointment")
public R<List<NewAppointmentBeanModel>> queryNewAppointment(@RequestBody QueryNewAppointmentModel model) {
return R.ok(qzService.queryNewAppointment(getUserId(), model));
return R.ok(qzService.queryNewAppointment(getQueryUserId(), model));
}
/**
......@@ -85,7 +85,7 @@ public class QzController extends BaseController {
*/
@GetMapping("/queryList")
public R<PageInfo<OrderListBeanModel>> queryList(@RequestBody QzOrderQueryListModel model) {
return R.ok(qzService.queryList(getUserId(), model));
return R.ok(qzService.queryList(getQueryUserId(), model));
}
/**
......@@ -102,6 +102,6 @@ public class QzController extends BaseController {
*/
@GetMapping("/getDetail")
public R<QzOrderGetDetailModel> getDetail(@RequestBody org.dromara.common.ys.model.req.qz.QzOrderGetDetailModel model) {
return R.ok(qzService.getDetail(getUserId(), model));
return R.ok(qzService.getDetail(getQueryUserId(), model));
}
}
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java
浏览文件 @ e1b617a9
......@@ -111,7 +111,7 @@ public class TrainController extends BaseController {
private List<AllStationModel> getStationList() {
List<AllStationModel> stationList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(TRAIN)), AllStationModel.class);
if (CollectionUtils.isEmpty(stationList)) {
stationList = trainService.getAllStation(getUserId());
stationList = trainService.getAllStation(getQueryUserId());
RedisUtils.setCacheObject(TRAIN, stationList, Duration.ofMinutes(60 * 60 * 24L));
}
return stationList;
......@@ -141,7 +141,7 @@ public class TrainController extends BaseController {
//获取目的站点
String toStationCode = getStationCodeList(toStationCodeList, toCity);
String userId = getUserId();
String userId = getQueryUserId();
QueryModel query = new QueryModel()
.setFromDate(fromDate)
......@@ -193,7 +193,7 @@ public class TrainController extends BaseController {
private List<CityModel> getCityList() {
List<CityModel> cityList = JSON.parseArray(JSON.toJSONString(RedisUtils.getCacheObject(CITY)), CityModel.class);
if (CollectionUtils.isEmpty(cityList)) {
cityList = commonResourceService.getCityList(getUserId());
cityList = commonResourceService.getCityList(getQueryUserId());
RedisUtils.setCacheObject(CITY, cityList, Duration.ofMinutes(60 * 60 * 24L));
}
return cityList;
......@@ -204,7 +204,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("checkAccount")
public R<CheckAccountResModel> checkAccount(@RequestBody CheckAccountReqModel model) {
return R.ok(trainService.checkAccount(getUserId(), new TrainSetCheckAccountDTOModel().setTrainAccount(model)));
return R.ok(trainService.checkAccount(getQueryUserId(), new TrainSetCheckAccountDTOModel().setTrainAccount(model)));
}
/**
......@@ -226,8 +226,8 @@ public class TrainController extends BaseController {
*/
@GetMapping("orderList")
public R<PageInfo<OrderListQueryResModel>> orderList(OrderListQueryModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.orderList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(trainService.orderList(getQueryUserId(), model));
}
/**
......@@ -235,7 +235,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/orderDetail")
public R<OrderInfoModel> orderDetail(OrderQueryModel model) {
OrderInfoModel detail = trainService.detail(getUserId(), model);
OrderInfoModel detail = trainService.detail(getQueryUserId(), model);
orderTrainService.updateOrderInfo(List.of(model.getOrderNO()));
return R.ok(detail);
}
......@@ -278,7 +278,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/local/orderList")
public R<TableDataInfo<OrderTrainVo>> localList(PageQuery pageQuery) {
OrderTrainBo bo = new OrderTrainBo().setPersonCode(getUserId());
OrderTrainBo bo = new OrderTrainBo().setPersonCode(getQueryUserId());
return R.ok(orderTrainService.queryPageList(bo, pageQuery));
}
......@@ -289,7 +289,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/local/refresh")
public R<Boolean> refresh() throws InterruptedException {
List<OrderTrainVo> orderList = orderTrainService.queryList(new OrderTrainBo().setPersonCode(getUserId()));
List<OrderTrainVo> orderList = orderTrainService.queryList(new OrderTrainBo().setPersonCode(getQueryUserId()));
List<String> orderStatusList = RemoteYsOrderServiceImpl.TRAIN_ORDER_STATUS_LIST;
List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderTrainVo::getOrderNo).collect(Collectors.toList());
orderTrainService.updateOrderInfo(orderNoList);
......@@ -302,7 +302,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/queryTrainStop")
public R<List<TrainStopModel>> queryTrainStop(org.dromara.common.ys.model.req.train.TrainStopModel model) {
return R.ok(trainService.queryTrainStop(getUserId(), model));
return R.ok(trainService.queryTrainStop(getQueryUserId(), model));
}
/**
......@@ -321,7 +321,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/orderRefund/detail")
public R<List<OrderRefundDetailModel>> orderRefundDetail(org.dromara.common.ys.model.req.train.OrderRefundDetailModel model) {
return R.ok(trainService.orderRefundDetail(getUserId(), model));
return R.ok(trainService.orderRefundDetail(getQueryUserId(), model));
}
/**
......@@ -340,8 +340,8 @@ public class TrainController extends BaseController {
*/
@GetMapping("/orderRefund/list")
public R<PageInfo<OrderRefundListModel>> orderRefundList(org.dromara.common.ys.model.req.train.OrderRefundListModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.orderRefundList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(trainService.orderRefundList(getQueryUserId(), model));
}
/**
......@@ -349,7 +349,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/local/orderRefund/list")
public R<TableDataInfo<OrderTrainRefundVo>> list(PageQuery pageQuery) {
OrderTrainRefundBo bo = new OrderTrainRefundBo().setPersonCode(getUserId());
OrderTrainRefundBo bo = new OrderTrainRefundBo().setPersonCode(getQueryUserId());
return R.ok(orderTrainRefundService.queryPageList(bo, pageQuery));
}
......@@ -359,7 +359,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/changeOrder/detail")
public R<List<TrChangeInfoBeanModel>> queryChangeOrder(TrainQueryChangeOrderModel model) {
return R.ok(trainService.queryChangeOrder(getUserId(), model));
return R.ok(trainService.queryChangeOrder(getQueryUserId(), model));
}
/**
......@@ -367,7 +367,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/orderChangeOrder/detail")
public R<List<TrChangeInfoBeanModel>> orderQueryChangeOrder(TrainQueryChangeOrderModel model) {
return R.ok(trainService.orderQueryChangeOrder(getUserId(), model));
return R.ok(trainService.orderQueryChangeOrder(getQueryUserId(), model));
}
/**
......@@ -375,7 +375,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/refundOrder/detail")
public R<List<TrRefundInfoBeanModel>> queryRefundOrder(TrainQueryRefundOrderModel model) {
return R.ok(trainService.queryRefundOrder(getUserId(), model));
return R.ok(trainService.queryRefundOrder(getQueryUserId(), model));
}
/**
......@@ -383,7 +383,7 @@ public class TrainController extends BaseController {
*/
@GetMapping("/12306/findClk")
public R<List<TrainSetFindClkBeanModel>> findClk(TrainSetFindClkModel model) {
return R.ok(trainService.findClk(getUserId(), model));
return R.ok(trainService.findClk(getQueryUserId(), model));
}
/**
......@@ -391,7 +391,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/saveClk")
public R<List<TrainSetSaveClkResBeanModel>> saveClk(@RequestBody TrainSetSaveClkModel model) {
return R.ok(trainService.saveClk(getUserId(), model));
return R.ok(trainService.saveClk(getQueryUserId(), model));
}
/**
......@@ -399,7 +399,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/register")
public R<TrainSetRegisterModel> register(@RequestBody org.dromara.common.ys.model.req.train.TrainSetRegisterModel model) {
return R.ok(trainService.register(getUserId(), model));
return R.ok(trainService.register(getQueryUserId(), model));
}
/**
......@@ -434,7 +434,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/checkAccountCode")
public R<Boolean> checkAccountCode(@RequestBody TrainSetCheckAccountCodeModel model) {
trainService.checkAccountCode(getUserId(), model);
trainService.checkAccountCode(getQueryUserId(), model);
return R.ok(true);
}
......@@ -443,7 +443,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/checkRegisterCode")
public R<Boolean> checkRegisterCode(@RequestBody TrainSetCheckRegisterCodeModel model) {
trainService.checkRegisterCode(getUserId(), model);
trainService.checkRegisterCode(getQueryUserId(), model);
return R.ok(true);
}
......@@ -452,7 +452,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/checkResetPwd")
public R<Boolean> checkResetPwd(@RequestBody TrainSetCheckResetPwdModel model) {
trainService.checkResetPwd(getUserId(), model);
trainService.checkResetPwd(getQueryUserId(), model);
return R.ok(true);
}
......@@ -461,7 +461,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/deleteClk")
public R<Boolean> deleteClk(@RequestBody TrainSetDeleteClkModel model) {
trainService.deleteClk(getUserId(), model);
trainService.deleteClk(getQueryUserId(), model);
return R.ok(true);
}
......@@ -470,7 +470,7 @@ public class TrainController extends BaseController {
*/
@PostMapping("/12306/resetPwd")
public R<Boolean> resetPwd(@RequestBody TrainSetResetPwdModel model) {
trainService.resetPwd(getUserId(), model);
trainService.resetPwd(getQueryUserId(), model);
return R.ok(true);
}
......@@ -479,8 +479,8 @@ public class TrainController extends BaseController {
*/
@GetMapping("/refundOrder/list")
public R<PageInfo<TrainRefundQueryRefundListApiBeanModel>> queryRefundList(TrainRefundQueryRefundListApiModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.queryRefundList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(trainService.queryRefundList(getQueryUserId(), model));
}
/**
......@@ -488,8 +488,8 @@ public class TrainController extends BaseController {
*/
@GetMapping("/changeOrder/list")
public R<PageInfo<TrainChangeQueryChangeListApiBeanModel>> queryChangeList(TrainoChangeQueryChangeListApiModel model) {
model.setBookNo(getUserId());
return R.ok(trainService.queryChangeList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(trainService.queryChangeList(getQueryUserId(), model));
}
......
ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java
浏览文件 @ e1b617a9
......@@ -46,7 +46,7 @@ public class VehiclesController extends BaseController {
@GetMapping("/immediate")
public R<org.dromara.common.ys.model.res.vehicles.EstimateJsycPriceModel> immediate(EstimateJsycPriceModel model) {
model.setTripType(TripType.PUBLIC.getCode());
return R.ok(vehiclesService.estimateJsycPrice(getUserId(), model));
return R.ok(vehiclesService.estimateJsycPrice(getQueryUserId(), model));
}
/**
......@@ -56,7 +56,7 @@ public class VehiclesController extends BaseController {
@GetMapping("/prebook")
public R<org.dromara.common.ys.model.res.vehicles.EstimateYyycPriceModel> prebook(EstimateYyycPriceModel model) {
model.setTripType(TripType.PUBLIC.getCode());
return R.ok(vehiclesService.estimateYyycPrice(getUserId(), model));
return R.ok(vehiclesService.estimateYyycPrice(getQueryUserId(), model));
}
/**
......@@ -64,7 +64,7 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/order/detail")
public R<org.dromara.common.ys.model.res.vehicles.OrderDetailModel> orderDetail(OrderDetailModel model) {
org.dromara.common.ys.model.res.vehicles.OrderDetailModel detail = vehiclesService.detail(getUserId(), model);
org.dromara.common.ys.model.res.vehicles.OrderDetailModel detail = vehiclesService.detail(getQueryUserId(), model);
orderVehiclesService.updateOrderInfo(List.of(model.getOrderNo()));
return R.ok(detail);
}
......@@ -74,8 +74,8 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/order/list")
public R<PageInfo<OrderListModel>> orderList(org.dromara.common.ys.model.req.vehicles.OrderListModel model) {
model.setBookNo(getUserId());
return R.ok(vehiclesService.orderList(getUserId(), model));
model.setBookNo(getQueryUserId());
return R.ok(vehiclesService.orderList(getQueryUserId(), model));
}
/**
......@@ -111,7 +111,7 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/order/getDriverLocation")
public R<DriverLocationModel> getDriverLocation(org.dromara.common.ys.model.req.vehicles.DriverLocationModel model) {
return R.ok(vehiclesService.getDriverLocation(getUserId(), model));
return R.ok(vehiclesService.getDriverLocation(getQueryUserId(), model));
}
/**
......@@ -119,7 +119,7 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/order/getCancelFee")
public R<CancelFeeModel> getCancelFee(org.dromara.common.ys.model.req.vehicles.CancelFeeModel model) {
return R.ok(vehiclesService.getCancelFee(getUserId(), model));
return R.ok(vehiclesService.getCancelFee(getQueryUserId(), model));
}
/**
......@@ -141,7 +141,7 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/getCancelReasonList")
public R<List<OrderGetQxyyModel>> getCancelReason() {
return R.ok(vehiclesService.getCancelReasonList(getUserId()));
return R.ok(vehiclesService.getCancelReasonList(getQueryUserId()));
}
/**
......@@ -149,7 +149,7 @@ public class VehiclesController extends BaseController {
*/
@GetMapping("/local/orderList")
public R<TableDataInfo<OrderVehiclesVo>> list(OrderVehiclesBo bo, PageQuery pageQuery) {
bo.setPersonCode(getUserId());
bo.setPersonCode(getQueryUserId());
return R.ok(orderVehiclesService.queryPageList(bo, pageQuery));
}
......@@ -160,7 +160,7 @@ public class VehiclesController extends BaseController {
*/
@PostMapping("/local/refresh")
public R<Boolean> refresh() throws InterruptedException {
List<OrderVehiclesVo> orderList = orderVehiclesService.queryList(new OrderVehiclesBo().setPersonCode(getUserId()));
List<OrderVehiclesVo> orderList = orderVehiclesService.queryList(new OrderVehiclesBo().setPersonCode(getQueryUserId()));
List<String> orderStatusList = RemoteYsOrderServiceImpl.VEHICLES_ORDER_STATUS_LIST;
List<String> orderNoList = StreamUtils.filter(orderList, o -> !orderStatusList.contains(o.getOrderStatus())).stream().map(OrderVehiclesVo::getOrderNo).collect(Collectors.toList());
orderVehiclesService.updateOrderInfo(orderNoList);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论