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 1c24cb9..0913d46 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 @@ -12,6 +12,7 @@ public class VerficationCodeService { public ResponseResult checkSendVerficationCode(String driverPhone){ //查询该手机号的司机是否存在 + //获取验证码 //调用三方,获取验证码 diff --git a/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java index 5915103..d326f02 100644 --- a/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java +++ b/online-taxi-public/internal-common/src/main/java/com/internal/contant/CommonStatusEnum.java @@ -32,6 +32,8 @@ CommonStatusEnum { DRIVER_CAR_UNBIND_EXISTS(1503,"司机和车辆绑定关系已绑定"), + DRIVER_USER_NOT_EXITST(1501,"司机不存在"), + /** * 成功 */ 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 902ad53..9c11ed5 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 @@ -13,4 +13,12 @@ public class DriverCarConstant { */ public static final int DRIVER_CAR_UNBIND = 2; + /** + * 1:有效 + * 0:无效 + * 司机状态 + */ + public static final int DRIVER_USER_STATE_VALID = 1; + public static final int DRIVER_USER_STATE_INVALID = 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 new file mode 100644 index 0000000..03b9637 --- /dev/null +++ b/online-taxi-public/internal-common/src/main/java/com/internal/response/DriverUserExistsResponse.java @@ -0,0 +1,13 @@ +package com.internal.response; + +import lombok.Data; + +/** + * + */ +@Data +public class DriverUserExistsResponse { + private String driverPhone; + + private int ifExits; +} 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 e5db4c4..6833455 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 @@ -2,12 +2,11 @@ package com.taxi.servicedriveruser.controller; import com.internal.dto.DriverUser; import com.internal.dto.ResponseResult; +import com.internal.response.DriverUserExistsResponse; import com.taxi.servicedriveruser.service.DriverUserService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @@ -16,15 +15,46 @@ public class DriverUserController { @Autowired private DriverUserService driverUserService; + /** + * 新增司机 + * @param driverUser + * @return + */ @PostMapping("/users") public ResponseResult addDriverUser(@RequestBody DriverUser driverUser){ return driverUserService.addDriverUser(driverUser); } + /** + * 修改司机信息 + * @param driverUser + * @return + */ @PutMapping("/user") public ResponseResult updateDriverUser(@RequestBody DriverUser driverUser){ return driverUserService.updateDriverUser(driverUser); } + /** + * 查询司机 + * @param driverPhone + * @return + */ + @GetMapping("/check-driver/{driverPhone}") + public ResponseResult getUser(@PathVariable("driverPhone") String driverPhone){ + DriverUser driverUserDB = driverUserService.getUser(driverPhone).getData(); + DriverUserExistsResponse driverUserExistsResponse = new DriverUserExistsResponse(); + int ifExists = 1; + if(driverUserDB == null){ + ifExists = 0; + driverUserExistsResponse.setDriverPhone(driverPhone); + driverUserExistsResponse.setIfExits(ifExists); + }else{ + driverUserExistsResponse.setDriverPhone(driverUserDB.getDriverPhone()); + driverUserExistsResponse.setIfExits(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 31440ff..9f3aae0 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 @@ -1,12 +1,18 @@ package com.taxi.servicedriveruser.service; +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; import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Service public class DriverUserService { @@ -30,4 +36,17 @@ public class DriverUserService { return ResponseResult.success(); } + + public ResponseResult getUser(String driverPhone){ + Map queryMap = new HashMap<>(); + queryMap.put("driver_phone",driverPhone); + queryMap.put("state", DriverCarConstant.DRIVER_USER_STATE_VALID); + List driverList = driverUserMapper.selectByMap(queryMap); + if(driverList.isEmpty()){ + return ResponseResult.fail(CommonStatusEnum.DRIVER_USER_NOT_EXITST); + }else{ + return ResponseResult.success(driverList.get(0)); + } + } + }