From 4337f212b3aabbe8ce2cbf0179d4a934dc3f5492 Mon Sep 17 00:00:00 2001 From: jkcdev Date: Fri, 23 May 2025 09:24:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AF=A6=E6=83=85=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/service/impl/WxPayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java index cf83b19e..1a03477e 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java @@ -617,7 +617,7 @@ public class WxPayServiceImpl implements WxPayService { //1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用 switch (detailDto.getItemType()) { case 1, 4, 5 -> orderDto.setDurationCost(orderDto.getDurationCost() + detailDto.getUnitPrice()); - case 2 -> orderDto.setDispatchFeeOutOperateArea(orderDto.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice()); + case 2 -> orderDto.setDispatchFeeOutOperateArea(orderDto.getDispatchFeeBanArea() + detailDto.getUnitPrice()); case 3 -> orderDto.setParkingAreaOutDispatchFee(orderDto.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice()); case 6 -> orderDto.setStartupCost(orderDto.getStartupCost() + detailDto.getUnitPrice()); } @@ -735,7 +735,7 @@ public class WxPayServiceImpl implements WxPayService { //1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用 switch (detailDto.getItemType()) { case 1, 4, 5 -> detailInfo.setDurationCost(detailInfo.getDurationCost() + detailDto.getUnitPrice()); - case 2 -> detailInfo.setDispatchFeeOutOperateArea(detailInfo.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice()); + case 2 -> detailInfo.setDispatchFeeOutOperateArea(detailInfo.getDispatchFeeBanArea() + detailDto.getUnitPrice()); case 3 -> detailInfo.setParkingAreaOutDispatchFee(detailInfo.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice()); case 6 -> detailInfo.setStartupCost(detailInfo.getStartupCost() + detailDto.getUnitPrice()); } From 064f974397d96e4a8b3fa134c1483fe93cc6919f Mon Sep 17 00:00:00 2001 From: jkcdev Date: Fri, 23 May 2025 09:27:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AF=A6=E6=83=85=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/service/impl/WxPayServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java index 1a03477e..bfc911c1 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java @@ -741,6 +741,7 @@ public class WxPayServiceImpl implements WxPayService { } } } + detailInfo.setDispatchFee(detailInfo.getDispatchFee() + detailInfo.getParkingAreaOutDispatchFee() + detailInfo.getDispatchFeeOutOperateArea() + detailInfo.getDispatchFeeBanArea()); orderInfo.setOrderDetailInfo(detailInfo); // 支付信息 PayInfo payInfo = new PayInfo(); From 05d6e2849630cca9322f549388904548357fb33a Mon Sep 17 00:00:00 2001 From: jkcdev Date: Fri, 23 May 2025 09:29:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E8=AF=A6=E6=83=85=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cdzy/payment/service/impl/WxPayServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java index bfc911c1..d8cd31d3 100644 --- a/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java +++ b/ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java @@ -729,7 +729,7 @@ public class WxPayServiceImpl implements WxPayService { detailInfo.setDiscountAmount(detailInfo.getTotalAmount() - detailInfo.getActualAmount()); //查询订单, orderFeingClient.getOrderById(orderId) JsonResult result = ordersFeignClient.getPaymentDetails(Long.valueOf(orderId)); - if (result.getCode() != 200) { + if (result.getCode() == 200) { EbikePaymentDto paymentDto = JSON.parseObject(JSONObject.toJSONString(result.getData()), EbikePaymentDto.class); for (PayDetailDto detailDto : paymentDto.getDetail().getGoodsDetail()) { //1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用