diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index c3cc821..38f6225 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -119,8 +119,8 @@ public class OrderInfoController { // 循环遍历 for (Map.Entry entry : orderHashMap.entrySet()) { CGPayOrder cgPayOrder = entry.getValue(); - int server = cgPayOrder.getServerId(); // 服务器验证 + int server = cgPayOrder.getServerId(); if(Integer.parseInt(serverId) != 0 && server != Integer.parseInt(serverId)) { continue; } @@ -139,18 +139,11 @@ public class OrderInfoController { if (payTime < startTime || payTime > endTime){ continue; } - // 金额获取 String amount = cgPayOrder.getAmount(); - double amountDouble; - if(amount==null){ - amountDouble = 0d; - }else{ - if(!amount.contains(".")){ - amountDouble = Integer.parseInt(amount)/100D; - } else{ - amountDouble = Double.parseDouble(amount); - } + double amountDouble = 0d; + if(amount != null){ + amountDouble = !amount.contains(".") ? Integer.parseInt(amount)/100D : Double.parseDouble(amount); } // 订单初始化 Corder corder = new Corder(); @@ -161,6 +154,12 @@ public class OrderInfoController { corder.setServerId(String.valueOf(server)); corder.setPaySdk(cgPayOrder.getPaySdk()); corder.setPlatform(cgPayOrder.getPlatform()); + corder.setRecharge_type(cgPayOrder.getRecharge_type()); + // 空值下面有处理 + corder.setRegisterTime(""); + corder.setOpenId(""); + // 渠道id赋值 + corder.setCc_id(channelMap.getOrDefault(Integer.valueOf(ccId),ccId)); // 获取订单配置 SRechargeCommodityConfig config = SRechargeCommodityConfig.sdkRechargeCommodityConfigMap.get(cgPayOrder.getGoodsId()); @@ -184,18 +183,12 @@ public class OrderInfoController { // 礼包内容文字化 corder.setProductContent(builder.substring(0,builder.length()-1).toString()); } - corder.setRecharge_type(cgPayOrder.getRecharge_type()); - corder.setRegisterTime(""); - corder.setOpenId(""); // 用户信息获取 GSUserFinal gsUser = gsUserDao.findUserInfoCache(server,Integer.valueOf(accountid)); if (gsUser != null){ corder.setRegisterTime(gsUser.getCreateTime()); corder.setOpenId(gsUser.getOpenId()); } - // 渠道id赋值 - corder.setCc_id(Optional.ofNullable(channelMap.get(Integer.valueOf(ccId))).orElse(ccId)); - cgPayOrders.add(corder); } LOGGER.info("导出订单操作,redis查询耗时:{}毫秒",DateUtil.now()-now);