Commit 23ba5ce7 by lixian7

Merge branch 'feature-20200720' into 'test'

绑定接口调整

See merge request !29
parents e58a6101 13dbd551
package com.hikcreate.edl.pub.web.mobile.api.exception; package com.hikcreate.edl.pub.web.mobile.api.exception;
import com.hikcreate.common.sdk.exception.DefaultExceptionHandler; import com.hikcreate.common.sdk.exception.BusinessException;
import com.hikcreate.common.sdk.response.apiparam.Response; import com.hikcreate.common.sdk.response.apiparam.Response;
import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator; import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator;
import com.hikcreate.common.sdk.response.statuscode.StatusCode; import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result; import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result;
import com.hikcreate.edl.pub.web.mobile.infra.core.Result.ResultCode;
import com.hikcreate.edl.pub.web.mobile.infra.core.Result.ResultGenerator; import com.hikcreate.edl.pub.web.mobile.infra.core.Result.ResultGenerator;
import feign.RetryableException; import feign.RetryableException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -88,6 +87,13 @@ public class GlobalExceptionHandler { ...@@ -88,6 +87,13 @@ public class GlobalExceptionHandler {
return ResultGenerator.fail(StatusCode.SYSTEM_ERROR.getCode(), "服务请求超时或不可用"); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR.getCode(), "服务请求超时或不可用");
} }
@ExceptionHandler({BusinessException.class})
@ResponseBody
public Response<Object> handle(BusinessException e) {
log.warn(e.toString(), e);
return ResponseGenerator.fail(e.getCode(), e.getMsg(), e.getErrorMsg(), e.getParam());
}
/** /**
* 从{@code @BindingResult}中构建异常信息 * 从{@code @BindingResult}中构建异常信息
* on field 'verifyCode': null]; * on field 'verifyCode': null];
......
...@@ -202,6 +202,13 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -202,6 +202,13 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
return ResultGenerator.fail(ResultCode.CAR_HAVE_BIND); return ResultGenerator.fail(ResultCode.CAR_HAVE_BIND);
} }
//发送验证码
SendVerifyCodeMicReq sendMicReq = new SendVerifyCodeMicReq();
sendMicReq.setPhone(info.getOwnerPhone());
sendMicReq.setVerifyCode(VerifyCodeUtil.getCode());
sendMicReq.setTemplateCode("PARK_BIND_VEHICLE");
smsFeign.sendVerifyCode(sendMicReq).fallback();
//保存至redis //保存至redis
try { try {
String key = bindKeyPrefix.concat(info.getPhone()).concat("-").concat(info.getOwnerPhone()); String key = bindKeyPrefix.concat(info.getPhone()).concat("-").concat(info.getOwnerPhone());
...@@ -210,12 +217,6 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -210,12 +217,6 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
log.error("绑定异常:{}", e.getMessage()); log.error("绑定异常:{}", e.getMessage());
return ResultGenerator.fail(StatusCode.SYSTEM_ERROR); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
} }
//发送验证码
SendVerifyCodeMicReq sendMicReq = new SendVerifyCodeMicReq();
sendMicReq.setPhone(info.getOwnerPhone());
sendMicReq.setVerifyCode(VerifyCodeUtil.getCode());
sendMicReq.setTemplateCode("PARK_BIND_VEHICLE");
smsFeign.sendVerifyCode(sendMicReq).fallback();
return ResultGenerator.success(); return ResultGenerator.success();
} }
...@@ -253,6 +254,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -253,6 +254,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
log.error("车辆绑定短信验证失败:绑定信息入库失败"); log.error("车辆绑定短信验证失败:绑定信息入库失败");
return ResultGenerator.fail(StatusCode.SYSTEM_ERROR); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
} }
//清除redis
redisTemplate.delete(key);
return ResultGenerator.success(new BindInfoRes(bindInfo.getUnqId())); return ResultGenerator.success(new BindInfoRes(bindInfo.getUnqId()));
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
log.error("车辆绑定短信验证异常:{}", e.getMessage()); log.error("车辆绑定短信验证异常:{}", e.getMessage());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment