attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
attiya 2025-05-23 11:10:14 +08:00
commit c84e58d589
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ebike-payment/src/main/java/com/cdzy/payment/service/impl/WxPayServiceImpl.java
View File

@ -617,7 +617,7 @@ public class WxPayServiceImpl implements WxPayService {
//1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用 //1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用
switch (detailDto.getItemType()) { switch (detailDto.getItemType()) {
case 1, 4, 5 -> orderDto.setDurationCost(orderDto.getDurationCost() + detailDto.getUnitPrice()); 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 3 -> orderDto.setParkingAreaOutDispatchFee(orderDto.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice());
case 6 -> orderDto.setStartupCost(orderDto.getStartupCost() + detailDto.getUnitPrice()); case 6 -> orderDto.setStartupCost(orderDto.getStartupCost() + detailDto.getUnitPrice());
} }
@ -729,18 +729,19 @@ public class WxPayServiceImpl implements WxPayService {
detailInfo.setDiscountAmount(detailInfo.getTotalAmount() - detailInfo.getActualAmount()); detailInfo.setDiscountAmount(detailInfo.getTotalAmount() - detailInfo.getActualAmount());
//查询订单, orderFeingClient.getOrderById(orderId) //查询订单, orderFeingClient.getOrderById(orderId)
JsonResult<?> result = ordersFeignClient.getPaymentDetails(Long.valueOf(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); EbikePaymentDto paymentDto = JSON.parseObject(JSONObject.toJSONString(result.getData()), EbikePaymentDto.class);
for (PayDetailDto detailDto : paymentDto.getDetail().getGoodsDetail()) { for (PayDetailDto detailDto : paymentDto.getDetail().getGoodsDetail()) {
//1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用 //1-骑行时长费 2-运营区调度费用 3-停车区调度费用 4-高峰时段出行费用 5-高峰日出行费用 6-起步费用
switch (detailDto.getItemType()) { switch (detailDto.getItemType()) {
case 1, 4, 5 -> detailInfo.setDurationCost(detailInfo.getDurationCost() + detailDto.getUnitPrice()); 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 3 -> detailInfo.setParkingAreaOutDispatchFee(detailInfo.getParkingAreaOutDispatchFee() + detailDto.getUnitPrice());
case 6 -> detailInfo.setStartupCost(detailInfo.getStartupCost() + detailDto.getUnitPrice()); case 6 -> detailInfo.setStartupCost(detailInfo.getStartupCost() + detailDto.getUnitPrice());
} }
} }
} }
detailInfo.setDispatchFee(detailInfo.getDispatchFee() + detailInfo.getParkingAreaOutDispatchFee() + detailInfo.getDispatchFeeOutOperateArea() + detailInfo.getDispatchFeeBanArea());
orderInfo.setOrderDetailInfo(detailInfo); orderInfo.setOrderDetailInfo(detailInfo);
// 支付信息 // 支付信息
PayInfo payInfo = new PayInfo(); PayInfo payInfo = new PayInfo();