From b50161853ca61a9f76de402c86293f1b0552a89a Mon Sep 17 00:00:00 2001 From: lulz1 Date: Tue, 27 Feb 2024 17:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/chint/application/out/FSSCController.java | 5 ++--- .../chint/domain/service/amount_estimate/CTripEstimate.java | 4 ++-- .../java/com/chint/infrastructure/constant/FSSCConstant.java | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chint/application/out/FSSCController.java b/src/main/java/com/chint/application/out/FSSCController.java index 287b172e..745f1ba3 100644 --- a/src/main/java/com/chint/application/out/FSSCController.java +++ b/src/main/java/com/chint/application/out/FSSCController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import static com.chint.infrastructure.constant.CommonMessageConstant.SUCCESS; -import static com.chint.infrastructure.constant.FSSCConstant.FSSC_LOGIN_PATH; +import static com.chint.infrastructure.constant.FSSCConstant.FSSC_LOGIN_PATH_APPROVAL; @RestController @RequestMapping("/fssc") @@ -24,9 +24,8 @@ public class FSSCController { @PostMapping("/login") public Result loginToFSSC() { User currentUser = BaseContext.getCurrentUser(); - return Result.Success(SUCCESS, LoginResponse.success(FSSCUrl +FSSC_LOGIN_PATH + currentUser.getEmployeeNo().toString())); + return Result.Success(SUCCESS, LoginResponse.success(FSSCUrl + FSSC_LOGIN_PATH_APPROVAL + currentUser.getEmployeeNo().toString())); } - } diff --git a/src/main/java/com/chint/domain/service/amount_estimate/CTripEstimate.java b/src/main/java/com/chint/domain/service/amount_estimate/CTripEstimate.java index 114dcdb4..a53b942e 100644 --- a/src/main/java/com/chint/domain/service/amount_estimate/CTripEstimate.java +++ b/src/main/java/com/chint/domain/service/amount_estimate/CTripEstimate.java @@ -36,8 +36,8 @@ public class CTripEstimate implements AmountEstimate { Integer legType = leg.getLegType(); return switch (legType) { case LEG_TYPE_TRAIN -> queryTrainPrice(leg); - case LEG_TYPE_AIRPLANE -> queryTrainPrice(leg); - case LEG_TYPE_HOTEL -> queryTrainPrice(leg); + case LEG_TYPE_AIRPLANE -> queryFlightPrice(leg); + case LEG_TYPE_HOTEL -> queryHotelPrice(leg); default -> throw new IllegalStateException("Unexpected value: " + legType); }; } diff --git a/src/main/java/com/chint/infrastructure/constant/FSSCConstant.java b/src/main/java/com/chint/infrastructure/constant/FSSCConstant.java index 1fd71e7a..fcfe67ab 100644 --- a/src/main/java/com/chint/infrastructure/constant/FSSCConstant.java +++ b/src/main/java/com/chint/infrastructure/constant/FSSCConstant.java @@ -10,4 +10,5 @@ public class FSSCConstant { public static final String TRIP_CALLBACK_TRAIN_TYPE = "Train";//出租车 public static final String TRIP_CALLBACK_OTHER_TYPE = "Other";//其他 public static final String FSSC_LOGIN_PATH = "/ecs-console/api/rest/loginWeaver?loginName=";//申请单类型 + public static final String FSSC_LOGIN_PATH_APPROVAL = "/ecs-console/api/rest/pushNewOA?billDefineId=fcc76666fb1211e98e2019f4db5548fd&loginName=";//申请单类型 }