diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 40eb3c82d..df68f2500 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -401,6 +401,7 @@ public class OrderService { realTimeInfo.setOrderAmount(realTimeMonitorData.getChargingAmount()); realTimeInfo.setChargedDegree(realTimeMonitorData.getChargingDegree()); realTimeInfo.setChargingTime(realTimeMonitorData.getSumChargingTime()); + realTimeInfo.setTime(realTimeMonitorData.getDateTime()); vo.setOrderRealTimeInfo(realTimeInfo); // 根据时间进行正序排序 diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index fd18bf2f0..c90920d21 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -441,14 +441,14 @@ public class SpringBootTestController { @Test public void createSettleAccountRequestTest() throws BaseAdaPayException { SettleAccountDTO dto = new SettleAccountDTO(); - dto.setCardId("10534201040009200"); - dto.setCardName("苏州远慧物联智能科技有限公司"); - dto.setTelNo("13915742562"); - dto.setBankCode("01030000"); + dto.setCardId("408060100100034609"); + dto.setCardName("江苏敦顺建设工程有限公司"); + dto.setTelNo("18021373333"); + dto.setBankCode("03090000"); dto.setBankAcctType("1"); dto.setProvCode("0032"); - dto.setAreaCode("3206"); - String adapayMemberId = "ACM48720983"; + dto.setAreaCode("3210"); + String adapayMemberId = "ACM40991242"; String wechatAppId = "wxbb3e0d474569481d"; adapayService.createSettleAccountRequest(dto, adapayMemberId, wechatAppId); } 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 84dc9fe24..c5a589971 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 @@ -1187,7 +1187,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { List> list = calculateUnfreezeAmount(orderAmount, payRecordList); for (Map map : list) { String paymentId = (String) map.get("paymentId"); - // String unfreezeAmount = (String) map.get("unfreezeAmount"); BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount"); memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index 46321da75..7dcf34e23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -84,6 +84,7 @@ public class OrderDetailInfoVO { @Data public static class OrderRealTimeInfo{ + private String time; private String orderAmount; // 订单金额 private String totalElectricityAmount; // 总电费 private String totalServiceAmount; // 总服务费 diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 35ed258a3..ce7b020d8 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -110,6 +110,7 @@

实时订单数据

+