From 2fd204a6be4f9384c111ca808defe796e569861c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 31 Aug 2023 16:27:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1e35c5435..443b94f9b 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 @@ -105,7 +105,7 @@ public class PayController extends BaseController { */ @PostMapping("/payOrder") public RestApiResponse payOrder(HttpServletRequest request, @RequestBody PayOrderDTO dto) { - logger.info("wechatpay支付订单 param:{}", dto.toString()); + logger.info("支付订单接口 param:{}", dto.toString()); RestApiResponse response; // 支付订单加锁 @@ -131,10 +131,10 @@ public class PayController extends BaseController { } response = new RestApiResponse<>(map); } catch (BusinessException e) { - logger.warn("wechatpay支付订单 warn param:{}", dto, e); + logger.warn("支付订单接口 warn param:{}", dto, e); response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { - logger.error("wechatpay支付订单 error param:{}", dto, e); + logger.error("支付订单接口 error param:{}", dto, e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR); } finally { // 支付订单解锁 From 82e6a5b42ab9f2fa96508bf43443f355c6da0e0c Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 31 Aug 2023 16:31:00 +0800 Subject: [PATCH 2/3] update --- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0e5e9d663..a4deed405 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 @@ -3133,7 +3133,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } }*/ - private void balancePayOrderV2(PayOrderDTO dto) { + @Transactional(rollbackFor = Exception.class) + public void balancePayOrderV2(PayOrderDTO dto) { String orderCode = dto.getOrderCode(); // 订单编号 BigDecimal chargeAmount = dto.getPayAmount(); // 支付金额 // 查询该会员的余额 From 5968eaf2a674bd890ed9f7d7d71a7db6ffdf342a Mon Sep 17 00:00:00 2001 From: admin-lmm <2497833386@QQ.com> Date: Thu, 31 Aug 2023 16:42:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/order/order/orderDetail.vue | 70 +++++++++---------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 3c6658d2f..053c6f652 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -192,37 +192,36 @@
+

实时订单数据

- - - - - - - - - - - - + + {{ + orderRealTimeInfo.time + }} + {{ + orderRealTimeInfo.orderAmount === "0.0000" + ? "0" + : orderRealTimeInfo.orderAmount + }} + {{ + orderRealTimeInfo.chargedDegree === "0.0000" + ? "0" + : orderRealTimeInfo.chargedDegree + }} + {{ + orderRealTimeInfo.chargingTime + }} + {{ + orderRealTimeInfo.soc + }} +
@@ -480,21 +479,20 @@ export default { }, async getOrderDetail() { const { data } = await getOrder(this.orderCode); - - // console.log("getOrder", data); + console.log("getOrder", data); this.obj = data; this.orderInfo = data.orderInfo; - this.payDetail = data.payRecordList; - this.orderRefundInfoList = data.orderRefundInfoList; + this.payDetail = data.payRecordList; // 数组 + this.orderRefundInfoList = data.orderRefundInfoList; // 数组 this.userInfo = [data.memberInfo]; // console.log("this.userInfo", this.userInfo); this.pileIn = [data.pileInfo]; // console.log("this.pileIn", this.pileIn); this.orderRealTimeInfo = data.orderRealTimeInfo; this.orderDetail = [data.billingDetails]; - this.tableData = data.chargeDetails; + this.tableData = data.chargeDetails; // array this.lastMonitorData = data.lastMonitorData; - + console.log("orderInfo.orderStatus", this.orderInfo.orderStatus); // 是否显示重试退款按钮 // if (data.orderInfo.orderStatus === '6' && data.payRecordList[0].payMode === '4' && data.orderRefundInfoList.length === 0) { // this.retryRefundFlag = true; @@ -510,7 +508,7 @@ export default { if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") { return false; } - if (this.payDetail[0] == null || this.payDetail.payMode[0] !== "4") { + if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") { return false; } if (