fix nullpointer error

master
yixian 7 years ago
parent 347e63152f
commit 8cf06cdfce

@ -387,15 +387,17 @@ public class TradeLogServiceImpl implements TradeLogService {
} }
JSONObject customer = new JSONObject(); JSONObject customer = new JSONObject();
if (order.getString("customer_id").startsWith("olH")){ if (order.getString("customer_id") != null) {
if (order.getString("customer_id").startsWith("olH")) {
customer = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id")); customer = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id"));
}else { } else {
customer = customerMapper.findCustomerByOpenId(order.getString("customer_id")); customer = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
} }
if (customer != null && !customer.isEmpty()) { if (customer != null && !customer.isEmpty()) {
order.put("headimg", customer.getString("headimg")); order.put("headimg", customer.getString("headimg"));
order.put("nickname", customer.getString("nickname")); order.put("nickname", customer.getString("nickname"));
} }
}
JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id")); JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
if (customerAlipay != null) { if (customerAlipay != null) {
@ -474,10 +476,10 @@ public class TradeLogServiceImpl implements TradeLogService {
clientManager.validateClients(client_id, params); clientManager.validateClients(client_id, params);
params.put("client_id", client_id); params.put("client_id", client_id);
List<JSONObject> logs = transactionMapper.listTransFlow(params); List<JSONObject> logs = transactionMapper.listTransFlow(params);
logs.stream().forEach(p->{ logs.stream().forEach(p -> {
String login_id = p.getString("login_id"); String login_id = p.getString("login_id");
if(StringUtils.isNotEmpty(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+")"); 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")); 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"))); new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
JSONObject result = PageListUtils.buildPageListResult(logs); JSONObject result = PageListUtils.buildPageListResult(logs);
result.put("analysis", transactionMapper.getClientAmountAnalysis(params)); result.put("analysis", transactionMapper.getClientAmountAnalysis(params));
if (query.getPage()==1){ if (query.getPage() == 1) {
if (!logs.isEmpty() && logs.size()>0){ if (!logs.isEmpty() && logs.size() > 0) {
JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time")); JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time"));
if (sendMailLog == null) { if (sendMailLog == null) {
result.put("padding",true); result.put("padding", true);
} }
if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) { if (sendMailLog != null && sendMailLog.getIntValue("mail_status") != 1) {
result.put("padding",true); result.put("padding", true);
} }
} }
} }

Loading…
Cancel
Save