From 8cf06cdfceca228d4c995c86b8e0b90e32880219 Mon Sep 17 00:00:00 2001 From: yixian Date: Mon, 4 Jun 2018 14:45:37 +1000 Subject: [PATCH] fix nullpointer error --- .../core/impls/TradeLogServiceImpl.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 5fc2e3f8b..6264b3f83 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -387,14 +387,16 @@ public class TradeLogServiceImpl implements TradeLogService { } JSONObject customer = new JSONObject(); - if (order.getString("customer_id").startsWith("olH")){ - customer = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id")); - }else { - customer = customerMapper.findCustomerByOpenId(order.getString("customer_id")); - } - if (customer != null && !customer.isEmpty()) { - order.put("headimg", customer.getString("headimg")); - order.put("nickname", customer.getString("nickname")); + if (order.getString("customer_id") != null) { + if (order.getString("customer_id").startsWith("olH")) { + customer = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id")); + } else { + customer = customerMapper.findCustomerByOpenId(order.getString("customer_id")); + } + if (customer != null && !customer.isEmpty()) { + order.put("headimg", customer.getString("headimg")); + order.put("nickname", customer.getString("nickname")); + } } JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id")); @@ -474,10 +476,10 @@ public class TradeLogServiceImpl implements TradeLogService { clientManager.validateClients(client_id, params); params.put("client_id", client_id); List logs = transactionMapper.listTransFlow(params); - logs.stream().forEach(p->{ + logs.stream().forEach(p -> { String login_id = p.getString("login_id"); - if(StringUtils.isNotEmpty(login_id)) { - p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail"))?"":p.getString("order_detail"))+"(alipay_id:"+login_id+")"); + if (StringUtils.isNotEmpty(login_id)) { + p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")"); } }); TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time")); @@ -826,14 +828,14 @@ public class TradeLogServiceImpl implements TradeLogService { new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc"))); JSONObject result = PageListUtils.buildPageListResult(logs); result.put("analysis", transactionMapper.getClientAmountAnalysis(params)); - if (query.getPage()==1){ - if (!logs.isEmpty() && logs.size()>0){ + if (query.getPage() == 1) { + if (!logs.isEmpty() && logs.size() > 0) { JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time")); if (sendMailLog == null) { - result.put("padding",true); + result.put("padding", true); } - if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) { - result.put("padding",true); + if (sendMailLog != null && sendMailLog.getIntValue("mail_status") != 1) { + result.put("padding", true); } } }