功能优化

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/BaseController.java

@@ -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/bill/BillController.java

@@ -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

@@ -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

@@ -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/vehicle/VehiclesController.java

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