散客服务费修改

ruoyi-api/ruoyi-api-order/src/main/java/org/dromara/order/api/domain/RemoteSaveOrder.java

@@ -49,6 +49,10 @@ public class RemoteSaveOrder implements Serializable {
      * 订单交易类型
      */
     private TradeType tradeType;
+    /**
+     * 是否是虚拟用户
+     */
+    private Boolean virtual;
     /**
      * 费用列表
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteOrderServiceImpl.java

@@ -106,6 +106,9 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
 
         //获取服务费信息
         RemoteSaveOrder.Fee serviceFee = IOrderServiceFeeStrategy.calcServiceFee(remoteOrder.getSource(), remoteOrder.getOrderType(), list);
+        if (remoteOrder.getVirtual()) {
+            serviceFee.setFeeAmount(BigDecimal.ZERO);
+        }
         list.add(serviceFee);
 
 

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

@@ -14,6 +14,7 @@ import org.dromara.common.core.utils.StreamUtils;
 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.satoken.utils.LoginHelper;
 import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.config.ProdConfig;
 import org.dromara.common.ys.constant.Cplx;
@@ -92,7 +93,7 @@ public class AirportController extends BaseController {
         List<AirportModel> airPortList = getAirPortList();
         model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
         model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
-        model.setTripType(TripType.PUBLIC.getCode());
+        model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
         return R.ok(airportService.queryFlight(getUserId(), model));
     }
 
@@ -105,7 +106,7 @@ public class AirportController extends BaseController {
         List<AirportModel> airPortList = getAirPortList();
         model.setArriveAirport(getCode(model.getArriveAirport(), airPortList));
         model.setDepartAirport(getCode(model.getDepartAirport(), airPortList));
-        model.setTripType(TripType.PUBLIC.getCode());
+        model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
         return R.ok(airportService.queryFlightMinPrice(getUserId(), model));
     }
 
@@ -178,7 +179,7 @@ public class AirportController extends BaseController {
     @GlobalTransactional(timeoutMills = 600000, rollbackFor = Exception.class)
     @PostMapping("/bookOrder")
     public R<List<org.dromara.common.ys.model.res.airport.BookOrderModel>> bookOrder(@RequestBody BookOrderModel model) {
-        model.setTripType(TripType.PUBLIC.getCode());
+        model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
         String travelNo = model.getSubjectCode();
         model.setSubjectCode(null);
         List<org.dromara.common.ys.model.res.airport.BookOrderModel> orderList = airportService.bookOrder(getUserId(), model);

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/hotel/HotelController.java

@@ -7,7 +7,9 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.ys.common.PageInfo;
+import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.res.hotel.*;
 import org.dromara.common.ys.service.IHotelService;
 import org.dromara.server.base.BaseController;
@@ -70,6 +72,7 @@ public class HotelController extends BaseController {
     public R<HotelOrderBookModel> orderBook(@RequestBody org.dromara.common.ys.model.req.hotel.HotelOrderBookModel model) {
         String subjectCode = model.getSubjectCode();
         model.setSubjectCode(null);
+        model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         HotelOrderBookModel book = hotelService.orderBook(getUserId(), model);
         orderHotelService.batchSaveOrder(getUserId(), subjectCode, List.of(book.getOrderId()));
         return R.ok(book);

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/qz/QzController.java

@@ -2,7 +2,9 @@ package org.dromara.server.controller.qz;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.ys.common.PageInfo;
+import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.qz.*;
 import org.dromara.common.ys.model.res.qz.GetAssociatDetailModel;
 import org.dromara.common.ys.model.res.qz.GetProdDetailModel;
@@ -73,6 +75,7 @@ public class QzController extends BaseController {
      */
     @PostMapping("/bookOrder")
     public R<Void> bookOrder(@RequestBody QzOrderBookOrderModel model) {
+        model.setTripType(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode());
         qzService.bookOrder(getUserId(), model);
         return R.ok();
     }

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

@@ -12,6 +12,7 @@ import org.dromara.common.core.utils.StreamUtils;
 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.satoken.utils.LoginHelper;
 import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.train.QueryModel;
@@ -214,6 +215,7 @@ public class TrainController extends BaseController {
     public R<OrderBookResModel> bookOrder(@RequestBody OrderBookReqModel model) {
         String subjectCode = model.getSubjectCode();
         model.setSubjectCode(null);
+        model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         OrderBookResModel res = trainService.bookOrder(getUserId(), model);
         orderTrainService.batchSaveOrder(getUserId(),subjectCode, List.of(res.getOrderId()));
         return R.ok(res);

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java

@@ -7,6 +7,7 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.vehicles.ConfirmPayApiModel;
@@ -83,7 +84,7 @@ public class VehiclesController extends BaseController {
     @GlobalTransactional(rollbackFor = Exception.class)
     @PostMapping("/order/bookJsyc")
     public R<OrderBookJsycModel> bookOrderJsyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookJsycModel model) {
-        model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
+        model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         String subjectCode = model.getSubjectCode();
         model.setSubjectCode(null);
         OrderBookJsycModel order = vehiclesService.bookJsyc(getUserId(), model);
@@ -97,7 +98,7 @@ public class VehiclesController extends BaseController {
     @GlobalTransactional(rollbackFor = Exception.class)
     @PostMapping("/order/bookYyyc")
     public R<OrderBookYyycModel> bookOrderYyyc(@RequestBody org.dromara.common.ys.model.req.vehicles.OrderBookYyycModel model) {
-        model.setTripType(Integer.parseInt(TripType.PUBLIC.getCode()));
+        model.setTripType(Integer.parseInt(LoginHelper.isVirtual() ? TripType.PRIVATE.getCode() : TripType.PUBLIC.getCode()));
         String subjectCode = model.getSubjectCode();
         model.setSubjectCode(null);
         OrderBookYyycModel order = vehiclesService.bookYyyc(getUserId(), model);