Commit 2453bda9 authored by 黎博's avatar 黎博

update

parent 87c8e042
...@@ -44,6 +44,7 @@ public class XinchengEncryptConvertor implements EncryptConvertor { ...@@ -44,6 +44,7 @@ public class XinchengEncryptConvertor implements EncryptConvertor {
// String requestStr = JSON.toJSONString(requestMap.get("content")); // String requestStr = JSON.toJSONString(requestMap.get("content"));
try { try {
decodeData = new String(RSA.decryptByPublicKey(Base64.decodeBase64(request.getBytes()), xinchengPublicKey), Charsets.UTF_8); decodeData = new String(RSA.decryptByPublicKey(Base64.decodeBase64(request.getBytes()), xinchengPublicKey), Charsets.UTF_8);
log.info("新增解密后的响应结果为:{}", decodeData);
} catch (Exception e) { } catch (Exception e) {
log.error("decrypt, decrypt response is error ", e); log.error("decrypt, decrypt response is error ", e);
throw new RuntimeException("解密新橙响应结果失败!"); throw new RuntimeException("解密新橙响应结果失败!");
......
...@@ -38,6 +38,7 @@ public class XinchengInterceptor implements HandlerInterceptor { ...@@ -38,6 +38,7 @@ public class XinchengInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception{ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception{
String uri = request.getRequestURI(); String uri = request.getRequestURI();
log.info("收到新橙2{} 接口请求", uri);
// Map<String, String[]> parameterMap = request.getParameterMap(); // Map<String, String[]> parameterMap = request.getParameterMap();
Map<String, String> parameterMap = getParamsMapFromReader(request); Map<String, String> parameterMap = getParamsMapFromReader(request);
QueryWrapper<Mock> mockQueryWrapper = new QueryWrapper<>(); QueryWrapper<Mock> mockQueryWrapper = new QueryWrapper<>();
...@@ -178,16 +179,16 @@ public class XinchengInterceptor implements HandlerInterceptor { ...@@ -178,16 +179,16 @@ public class XinchengInterceptor implements HandlerInterceptor {
repay.put("deadline", simpleDateFormat.parse(subjectMap.get("deadline").toString()).getTime()/1000); repay.put("deadline", simpleDateFormat.parse(subjectMap.get("deadline").toString()).getTime()/1000);
caculList.add(repay); caculList.add(repay);
} }
Integer interestAmount = 0; Float interestAmount = 0f;
Integer serviceFeeAmount = 0; Float serviceFeeAmount = 0f;
Integer principalAmount = 0; Float principalAmount = 0f;
Integer totalRepayAmount = 0; Float totalRepayAmount = 0f;
Integer otherFeeAmount = 0; Float otherFeeAmount = 0f;
for (Map map2: caculList) { for (Map map2: caculList) {
interestAmount += Integer.parseInt(map2.get("interest").toString()); interestAmount += Float.parseFloat(map2.get("interest").toString());
serviceFeeAmount += Integer.parseInt(map2.get("serviceFee").toString()); serviceFeeAmount += Float.parseFloat(map2.get("serviceFee").toString());
principalAmount += Integer.parseInt(map2.get("principal").toString()); principalAmount += Float.parseFloat(map2.get("principal").toString());
totalRepayAmount += Integer.parseInt(map2.get("totalAmount").toString()); totalRepayAmount += Float.parseFloat(map2.get("totalAmount").toString());
} }
Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();
dataMap.put("serviceFeeAmount", serviceFeeAmount); dataMap.put("serviceFeeAmount", serviceFeeAmount);
......
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