Commit 3da122d3 authored by 王向伟's avatar 王向伟

修改日志级别

parent e10e410a
......@@ -12,11 +12,9 @@ import cn.quantgroup.customer.rest.param.phone.ModifyPhoneQuery;
import cn.quantgroup.customer.rest.param.user.UserCombinationParam;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IUserService;
import cn.quantgroup.customer.service.IXyqbService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -36,14 +34,11 @@ import static cn.quantgroup.customer.constant.Constant.GSON;
public class UserRest {
private final IUserService userService;
private final AuthenticationManager authenticationManager;
private final IXyqbService xyqbService;
@Autowired
public UserRest(AuthenticationManager authenticationManager, IUserService userService,IXyqbService xyqbService) {
this.authenticationManager = authenticationManager;
public UserRest(IUserService userService) {
this.userService = userService;
this.xyqbService = xyqbService;
}
@PostMapping(value = "/login")
......@@ -127,11 +122,12 @@ public class UserRest {
/**
* 用户综合查询
*
* @param combinationParam
* @return
*/
@GetMapping(value = "/info")
public JsonResult findUserCombination(UserCombinationParam combinationParam){
public JsonResult findUserCombination(UserCombinationParam combinationParam) {
return userService.findUserCombination(combinationParam);
}
......
......@@ -424,9 +424,9 @@ public class UserServiceImpl implements IUserService {
}
List<ApplyOrder> applyOrderList = applyOrders.getData();
if(CollectionUtils.isEmpty(applyOrderList)){
log.error("{} 不存在对应的申请订单 param={}",logPre,userCombinationParam);
return JsonResult.buildErrorStateResult("申请订单不存在",null);
if (CollectionUtils.isEmpty(applyOrderList)) {
log.info("{} 不存在对应的申请订单 param={}", logPre, userCombinationParam);
return JsonResult.buildSuccessResult("申请订单不存在", applyOrderList);
}
UserBasicInfo userBasicInfo = userInfo.getData();
......
......@@ -40,7 +40,6 @@ public class XyqbServiceImpl implements IXyqbService {
private final IHttpService httpService;
@Autowired
public XyqbServiceImpl(IHttpService httpService) {
this.httpService = httpService;
......@@ -148,7 +147,7 @@ public class XyqbServiceImpl implements IXyqbService {
try {
result = httpService.post(url, header, param);
} catch (Exception e) {
log.error("{} 远程调用异常 url={},param={}", logPre, url, param,e);
log.error("{} 远程调用异常 url={},param={}", logPre, url, param, e);
return JsonResult.buildErrorStateResult("网络异常", null);
}
......@@ -167,7 +166,7 @@ public class XyqbServiceImpl implements IXyqbService {
@Override
public JsonResult<OrderRepayment> repaymentPlanQuery(Long loanId) {
String logPre = "XyqbServiceImpl.findLoanOrder";
log.info("{} 查询还款计划result={}", logPre, loanId);
log.info("{} 查询还款计划loanId={}", logPre, loanId);
String url = xyqbSysUrl + "/ex/ka/loan_plan/query";
Map<String, String> queryParam = new HashMap<>(2);
queryParam.put("loanId", loanId.toString());
......@@ -179,8 +178,8 @@ public class XyqbServiceImpl implements IXyqbService {
TypeReference<JsonResult<OrderRepayment>> typeToken = new TypeReference<JsonResult<OrderRepayment>>() {
};
JsonResult<OrderRepayment> result1 = JSONTools.deserialize(result, typeToken);
if (result1 != null ) {
return result1;
if (result1 != null) {
return result1;
} else {
return JsonResult.buildErrorStateResult("还款计划查询失败", null);
}
......
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