From cea0fb282184de6ca4d9594e85034d781b742463 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 31 Aug 2023 09:15:20 +0800 Subject: [PATCH 01/10] =?UTF-8?q?update=20=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/api/uniapp/PayController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java index 0fff346f5..1e35c5435 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java @@ -247,7 +247,7 @@ public class PayController extends BaseController { */ @PostMapping("/rechargeBalance") public RestApiResponse rechargeBalance(HttpServletRequest request, @RequestBody WeixinPayDTO dto) { - logger.info("adapay会员充值余额 param:{}", dto.toString()); + logger.info("adapay会员充值余额 param:{}", JSONObject.toJSONString(dto)); RestApiResponse response; try { if (StringUtils.isBlank(dto.getCode()) || StringUtils.isBlank(dto.getAmount())) { From 8bfd87232c57cbfcc793bb8a43880ed0628f0750 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 31 Aug 2023 09:59:30 +0800 Subject: [PATCH 02/10] =?UTF-8?q?bugfix=20=20=E4=BF=AE=E5=A4=8D=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 e2447676c..84dc9fe24 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,8 +1187,9 @@ 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"); - memberAdapayRecordService.unfreezeAmount(paymentId, new BigDecimal(unfreezeAmount)); + // String unfreezeAmount = (String) map.get("unfreezeAmount"); + BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount"); + memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount); } } From 73b203dd441f466f99120b5d0454ce6458ca3389 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 31 Aug 2023 10:29:17 +0800 Subject: [PATCH 03/10] =?UTF-8?q?update=20=20=20=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=20=E5=AE=9E=E6=97=B6=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/service/OrderService.java | 1 + .../src/test/java/SpringBootTestController.java | 12 ++++++------ .../pile/service/impl/OrderBasicInfoServiceImpl.java | 1 - .../com/jsowell/pile/vo/web/OrderDetailInfoVO.java | 1 + jsowell-ui/src/views/order/order/orderDetail.vue | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) 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 @@

实时订单数据

+