diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java index 6a40ff4..b9362c2 100644 --- a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/ApiDriverApplication.java @@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @EnableFeignClients public class ApiDriverApplication { - public static void main(String[] args) { + public static void main(String[] args) { SpringApplication.run(ApiDriverApplication.class); } } diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDriverUserClient.java similarity index 58% rename from online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java rename to online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDriverUserClient.java index 8944a58..4e1ff0b 100644 --- a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDirverUserClient.java +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/remote/ServiceDriverUserClient.java @@ -2,13 +2,12 @@ package com.taxi.apidriver.remote; import com.internal.dto.DriverUser; import com.internal.dto.ResponseResult; +import com.internal.response.DriverUserExistsResponse; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.*; @FeignClient("service-driver-user") -public interface ServiceDirverUserClient { +public interface ServiceDriverUserClient { @RequestMapping(method = RequestMethod.POST,value = "/users") ResponseResult addDriverUser(@RequestBody DriverUser driverUser); @@ -16,4 +15,7 @@ public interface ServiceDirverUserClient { @RequestMapping(method = RequestMethod.PUT,value = "/user") ResponseResult updateDriverUser(@RequestBody DriverUser driverUser); + @RequestMapping(method = RequestMethod.GET,value = "/check-driver/{driverPhone}") + ResponseResult getUser(@PathVariable("driverPhone") String driverPhone); + } diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java index b07750c..d30a424 100644 --- a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/UserService.java @@ -2,17 +2,16 @@ package com.taxi.apidriver.service; import com.internal.dto.DriverUser; import com.internal.dto.ResponseResult; -import com.taxi.apidriver.remote.ServiceDirverUserClient; +import com.taxi.apidriver.remote.ServiceDriverUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; @Service public class UserService { @Autowired - private ServiceDirverUserClient serviceDirverUserClient; + private ServiceDriverUserClient serviceDirverUserClient; public ResponseResult addDriverUser(DriverUser driverUser) { return serviceDirverUserClient.addDriverUser(driverUser); diff --git a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java index 0913d46..3c0e72b 100644 --- a/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java +++ b/online-taxi-public/api-driver/src/main/java/com/taxi/apidriver/service/VerficationCodeService.java @@ -1,18 +1,34 @@ package com.taxi.apidriver.service; +import com.internal.contant.CommonStatusEnum; +import com.internal.contant.DriverCarConstant; import com.internal.dto.ResponseResult; -import com.internal.request.VerificationCodeDTO; +import com.internal.response.DriverUserExistsResponse; +import com.taxi.apidriver.remote.ServiceDriverUserClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; @Service +@Slf4j public class VerficationCodeService { + @Autowired + private ServiceDriverUserClient serviceDriverUserClient; - public ResponseResult checkSendVerficationCode(String driverPhone){ + public ResponseResult checkSendVerficationCode(String driverPhone) { //查询该手机号的司机是否存在 - - + DriverUserExistsResponse data = + serviceDriverUserClient.getUser(driverPhone).getData(); + if (data != null) { + driverPhone = data.getDriverPhone(); + int ifExists = data.getIfExists(); + if (ifExists == DriverCarConstant.DRIVER_NOT_EXISTS) { + return ResponseResult.fail(CommonStatusEnum.DRIVER_USER_NOT_EXITST); + }else{ + log.info(driverPhone+"driverPhone"); + } + } //获取验证码 //调用三方,获取验证码 diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/contant/DriverCarConstant.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/DriverCarConstant.java index 9c11ed5..63703ac 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/contant/DriverCarConstant.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/DriverCarConstant.java @@ -21,4 +21,13 @@ public class DriverCarConstant { public static final int DRIVER_USER_STATE_VALID = 1; public static final int DRIVER_USER_STATE_INVALID = 0; + /** + * 司机存在 + */ + public static final int DRIVER_EXISTS = 1; + /** + * 司机不存在 + */ + public static final int DRIVER_NOT_EXISTS = 0; + } diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/response/DriverUserExistsResponse.java b/online-taxi-public/internal-common/src/main/java/com/internal/response/DriverUserExistsResponse.java index 03b9637..f4895f9 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/response/DriverUserExistsResponse.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/response/DriverUserExistsResponse.java @@ -9,5 +9,5 @@ import lombok.Data; public class DriverUserExistsResponse { private String driverPhone; - private int ifExits; + private int ifExists; } diff --git a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/controller/DriverUserController.java b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/controller/DriverUserController.java index 6833455..957a872 100644 --- a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/controller/DriverUserController.java +++ b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/controller/DriverUserController.java @@ -1,5 +1,6 @@ package com.taxi.servicedriveruser.controller; +import com.internal.contant.DriverCarConstant; import com.internal.dto.DriverUser; import com.internal.dto.ResponseResult; import com.internal.response.DriverUserExistsResponse; @@ -42,17 +43,17 @@ public class DriverUserController { * @return */ @GetMapping("/check-driver/{driverPhone}") - public ResponseResult getUser(@PathVariable("driverPhone") String driverPhone){ + public ResponseResult getUser(@PathVariable("driverPhone") String driverPhone){ DriverUser driverUserDB = driverUserService.getUser(driverPhone).getData(); DriverUserExistsResponse driverUserExistsResponse = new DriverUserExistsResponse(); - int ifExists = 1; + int ifExists = DriverCarConstant.DRIVER_EXISTS; if(driverUserDB == null){ - ifExists = 0; + ifExists = DriverCarConstant.DRIVER_NOT_EXISTS; driverUserExistsResponse.setDriverPhone(driverPhone); - driverUserExistsResponse.setIfExits(ifExists); + driverUserExistsResponse.setIfExists(ifExists); }else{ driverUserExistsResponse.setDriverPhone(driverUserDB.getDriverPhone()); - driverUserExistsResponse.setIfExits(ifExists); + driverUserExistsResponse.setIfExists(ifExists); } return ResponseResult.success(driverUserExistsResponse); } diff --git a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/DriverUserService.java b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/DriverUserService.java index 9f3aae0..42e9d3e 100644 --- a/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/DriverUserService.java +++ b/online-taxi-public/service-driver-user/src/main/java/com/taxi/servicedriveruser/service/DriverUserService.java @@ -4,7 +4,6 @@ import com.internal.contant.CommonStatusEnum; import com.internal.contant.DriverCarConstant; import com.internal.dto.DriverUser; import com.internal.dto.ResponseResult; -import com.taxi.servicedriveruser.controller.DriverUserController; import com.taxi.servicedriveruser.mapper.DriverUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;