Skip to content

C
customer-service
Commit 9f68ff79 authored by 杨钧's avatar 杨钧
Browse files
Options

修改错误代码

parent c747241d
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 123 deletions
src/main/java/cn/quantgroup/customer/config/http/mvc/filter/UserTokenInterceptor.java deleted 100644 → 0
View file @ c747241d
package cn.quantgroup.customer.config.http.mvc.filter;
import cn.quantgroup.customer.config.container.UserThreadLocal;
import cn.quantgroup.customer.entity.OpUser;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IOpSystemService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Objects;
/**
* @author yangjun
* @Date 2020/4/16 9:46
* @Desc
* @Update
*/
@Slf4j
public class UserTokenInterceptor implements HandlerInterceptor {
@Autowired
private IOpSystemService IOpSystemService;
@Override
public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
if (HttpMethod.OPTIONS.toString().equals(httpServletRequest.getMethod())) {
log.info("OPTIONS请求，放行");
return true;
}
String token = httpServletRequest.getHeader("x-auth-token");
String system = httpServletRequest.getHeader("x-auth-system");
if (StringUtils.isAnyBlank(token, system)) {
log.error("缺少token信息,拦截");
return false;
}
JsonResult<OpUser> opUserResult = IOpSystemService.findUserByToken(token, system);
if (Objects.isNull(opUserResult) || !opUserResult.isSuccess()) {
log.error("根据token查询不到用户信息 token:{}", token);
return false;
} else {
OpUser opUser = opUserResult.getData();
UserThreadLocal.set(opUser);
return true;
}
}
@Override
public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
}
@Override
public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
}
}
src/main/java/cn/quantgroup/customer/config/http/mvc/filter/ValidOperatePermitFilter.java
View file @ 9f68ff79
......@@ -2,6 +2,7 @@ package cn.quantgroup.customer.config.http.mvc.filter;
import cn.quantgroup.customer.config.container.UserThreadLocal;
import cn.quantgroup.customer.entity.OpUser;
import cn.quantgroup.customer.exception.BusinessException;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.IOpSystemService;
import lombok.SneakyThrows;
......@@ -50,13 +51,13 @@ public class ValidOperatePermitFilter implements Filter {
String system = request.getHeader("x-auth-system");
if (StringUtils.isAnyBlank(token, system)) {
log.error("缺少token信息,拦截");
throw new Exception("缺少token信息,拦截");
throw new BusinessException("缺少token信息,拦截请求");
}
JsonResult<OpUser> opUserResult = IOpSystemService.findUserByToken(token, system);
if (Objects.isNull(opUserResult) || !opUserResult.isSuccess()) {
log.error("根据token查询不到用户信息 token:{}", token);
throw new Exception("鉴权失败,拦截");
throw new BusinessException("鉴权失败,拦截请求");
} else {
OpUser opUser = opUserResult.getData();
UserThreadLocal.set(opUser);
......
src/main/java/cn/quantgroup/customer/constant/Constant.java
View file @ 9f68ff79
......@@ -3,6 +3,8 @@ package cn.quantgroup.customer.constant;
import com.google.gson.Gson;
import java.text.DecimalFormat;
public interface Constant {
String HTTP = "http";
......@@ -19,6 +21,8 @@ public interface Constant {
String SUCCESS_CODE = "0000";
DecimalFormat DECIMAL_FORMAT2 = new DecimalFormat("#####0.00");
Gson GSON = new Gson();
}
src/main/java/cn/quantgroup/customer/enums/OrderFieldEnum.java deleted 100644 → 0
View file @ c747241d
package cn.quantgroup.customer.enums;
import java.util.Arrays;
import java.util.Optional;
/**
* 试算字段转换
*/
public enum OrderFieldEnum {
PRINCIPAL("principal","应还本金"),
INTEREST("interest","应还利息"),
SERVICE_FEE("serviceFee","应还担保费"),
PREMIUM("premium","应还保费"),
OVERDUE_INTEREST("overDueInterest","应还罚息"),
LIQUIDATE_DAMAGES("liquidatedDamages","结清违约金"),
OTHER_FEE("otherFee","应还其他费用"),
TOTAL_AMOUNT("totalAmount","应还总额"),
OTHER("other","其他收费项目");
private String field;
private String title;
OrderFieldEnum(String field, String title) {
this.field = field;
this.title = title;
}
public String getField() {
return field;
}
public String getTitle() {
return title;
}
public static String getValue(String field){
Optional<OrderFieldEnum> optional = Arrays.asList(OrderFieldEnum.values()).stream().filter(orderFieldEnum -> field.equalsIgnoreCase(orderFieldEnum.getField())).findFirst();
if(optional.isPresent()){
return optional.get().getTitle();
}
return OrderFieldEnum.OTHER.getTitle();
}
}
src/main/java/cn/quantgroup/customer/service/impl/OrderServiceImpl.java
View file @ 9f68ff79
package cn.quantgroup.customer.service.impl;
import cn.quantgroup.customer.aop.OperateLog;
import cn.quantgroup.customer.constant.Constant;
import cn.quantgroup.customer.entity.OpLog;
import cn.quantgroup.customer.entity.OperateLogModel;
import cn.quantgroup.customer.enums.ErrorCodeEnum;
import cn.quantgroup.customer.enums.OrderFieldEnum;
import cn.quantgroup.customer.model.kaordermapping.ApplyRequestHistory;
import cn.quantgroup.customer.model.kaordermapping.ChannelConfigurationResult;
import cn.quantgroup.customer.model.kaordermapping.LoanOrderMapping;
......@@ -16,7 +14,6 @@ import cn.quantgroup.customer.rest.param.ordermapping.OrderQueryParam;
import cn.quantgroup.customer.rest.param.user.UserQueryParam;
import cn.quantgroup.customer.rest.vo.JsonResult;
import cn.quantgroup.customer.service.*;
import cn.quantgroup.customer.util.DateUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -24,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.security.Timestamp;
import java.util.*;
import java.util.stream.Collectors;
......@@ -47,6 +43,18 @@ public class OrderServiceImpl implements IOrderService {
@Autowired
private IUserService userService;
private static Map<String, String> earlySettleUpFieldMap = new HashMap<>();
static {
earlySettleUpFieldMap.put("principal","应还本金");
earlySettleUpFieldMap.put("interest","应还利息");
earlySettleUpFieldMap.put("serviceFee","应还担保费");
earlySettleUpFieldMap.put("premium","应还保费");
earlySettleUpFieldMap.put("overDueInterest","应还罚息");
earlySettleUpFieldMap.put("liquidatedDamages","结清违约金");
earlySettleUpFieldMap.put("otherFee","应还其他费用");
earlySettleUpFieldMap.put("totalAmount","应还总额");
}
@Override
public JsonResult<List<FlowNode>> findFlowChart(String applyOrderNo) {
String logPre = "OrderServiceImpl.findFlowChart";
......@@ -356,12 +364,15 @@ public class OrderServiceImpl implements IOrderService {
Map.Entry<String, Object> me = iterator.next();
String key = me.getKey();
Object value = me.getValue();
Map<String, Object> fieldDataMap = new HashMap<>();
fieldDataMap.put("title", OrderFieldEnum.getValue(key));
fieldDataMap.put("value", value);
if(Objects.nonNull(value) && new BigDecimal(String.valueOf(value)).compareTo(new BigDecimal(0))>0){
Map<String, Object> fieldDataMap = new HashMap<>(4);
fieldDataMap.put("title", earlySettleUpFieldMap.get(key));
fieldDataMap.put("value", Constant.DECIMAL_FORMAT2.format(value));
dataList.add(fieldDataMap);
}
}
return dataList;
}
......
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