diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 8267fc2d2..7f12a9c40 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -133,15 +133,16 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 条件查询订单基本信息 + * * @param info * @return */ - @Override - public OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info) { - return orderBasicInfoMapper.getOrderBasicInfo(info); - } + @Override + public OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info) { + return orderBasicInfoMapper.getOrderBasicInfo(info); + } - /** + /** * 查询订单列表 * * @param dto 订单 @@ -226,6 +227,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 通过订单号查询订单信息（小程序发送消息用） + * * @param orderCode * @return */ @@ -236,6 +238,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 充电桩启动失败 + * * @param orderCode * @param failedReasonMsg */ @@ -263,6 +266,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 充电桩启动成功 + * * @param orderCode */ @Override @@ -279,18 +283,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { updateOrderBasicInfo(orderInfo); } - public static void main(String[] args) { - Date date = DateUtils.addMinute(new Date(), -10); - System.out.println(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, date)); - long currentTimeMillis = System.currentTimeMillis(); - if (currentTimeMillis - date.getTime() > 1000 * 60 * 15) { - // 已经支付超过15分钟 - System.out.println("已经支付超过15分钟"); - } else { - System.out.println("已经支付, 不到15分钟"); - } - } - @Override public void closeStartFailedOrder(String startTime, String endTime) { List orderList = orderBasicInfoMapper.selectOrderListByTimeRangeAndStatus(startTime, endTime, OrderStatusEnum.NOT_START.getValue(), OrderPayStatusEnum.paid.getValue()); @@ -395,7 +387,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 根据充电桩编号和枪口号查询正在充电中的订单 - * @param pileSn 桩编号 + * + * @param pileSn 桩编号 * @param connectorCode 枪口号 * @return */ @@ -406,6 +399,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 根据枪口编号查询正在充电中的订单 + * * @param pileConnectorCode * @return */ @@ -538,17 +532,33 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); // 总用电量 orderDetail.setTotalOrderAmount(orderAmount); // 订单总金额 orderDetail.setSharpUsedElectricity(new BigDecimal(data.getSharpUsedElectricity())); // 尖时段用电量 - orderDetail.setSharpPrice(new BigDecimal(data.getSharpPrice())); - orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); + if (data.getSharpPrice() != null) { + orderDetail.setSharpPrice(new BigDecimal(data.getSharpPrice())); + } + if (data.getSharpAmount() != null) { + orderDetail.setSharpAmount(new BigDecimal(data.getSharpAmount())); + } orderDetail.setPeakUsedElectricity(new BigDecimal(data.getPeakUsedElectricity())); // 峰时段用电量 - orderDetail.setPeakPrice(new BigDecimal(data.getPeakPrice())); - orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); + if (data.getPeakPrice() != null) { + orderDetail.setPeakPrice(new BigDecimal(data.getPeakPrice())); + } + if (data.getPeakAmount() != null) { + orderDetail.setPeakAmount(new BigDecimal(data.getPeakAmount())); + } orderDetail.setFlatUsedElectricity(new BigDecimal(data.getFlatUsedElectricity())); // 平时段用电量 - orderDetail.setFlatPrice(new BigDecimal(data.getFlatPrice())); - orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); + if (data.getFlatPrice() != null) { + orderDetail.setFlatPrice(new BigDecimal(data.getFlatPrice())); + } + if (data.getFlatAmount() != null) { + orderDetail.setFlatAmount(new BigDecimal(data.getFlatAmount())); + } orderDetail.setValleyUsedElectricity(new BigDecimal(data.getValleyUsedElectricity())); // 谷时段用电量 - orderDetail.setValleyPrice(new BigDecimal(data.getValleyPrice())); - orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); + if (data.getValleyPrice() != null) { + orderDetail.setValleyPrice(new BigDecimal(data.getValleyPrice())); + } + if (data.getValleyAmount() != null) { + orderDetail.setValleyAmount(new BigDecimal(data.getValleyAmount())); + } } catch (Exception e) { logger.error("设置订单详情参数发生异常", e); } @@ -565,7 +575,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { wechatSendMsgDTO.setOrderCode(orderCode); Map resultMap = wxAppletRemoteService.stopChargingSendMsg(wechatSendMsgDTO); logger.info("小程序发送充电停止推送消息 result:{}", JSON.toJSONString(resultMap)); - }catch (Exception e) { + } catch (Exception e) { logger.error("小程序发送充电停止推送消息 error", e); } } @@ -650,6 +660,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 根据订单编号获取充电实时数据 时间倒序 * 订单只有在充电中，才会把实时数据保存到redis + * * @param orderCode 订单编号 * @return */ @@ -945,6 +956,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 个人桩查询充电数据 + * * @param dto * @return */ @@ -958,8 +970,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * * @param pileSn */ - @Override - public void updateOrderStatusAsAbnormal(String pileSn) { + @Override + public void updateOrderStatusAsAbnormal(String pileSn) { // 将此桩正在进行充电的订单状态改为 异常 List orderListVOS = selectChargingOrder(pileSn); if (CollectionUtils.isEmpty(orderListVOS)) { @@ -976,5 +988,5 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { logger.info("充电桩:{}退出, 修改充电桩正在充电的订单状态为异常, orderCode: {}", pileSn, orderListVO.getOrderCode()); } } - } + } }