From 4d4eb6e9addc4ce148e05f470beb016e507975ba Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 27 四月 2026 17:21:06 +0800
Subject: [PATCH] 小程序二维码 支持改价 自主行程查询
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index b5d6136..ae2da6c 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1286,6 +1286,9 @@
if (warpper.getOtherFee() != null && warpper.getOtherFee().compareTo(BigDecimal.ZERO) < 0) {
return ResultUtil.error("其他费用不能为负数");
}
+ if (warpper.getChangePrice() != null && warpper.getChangePrice().compareTo(BigDecimal.ZERO) < 0) {
+ return ResultUtil.error("改价费用不能为负数");
+ }
// 2. 校验班次信息
LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(warpper.getLineShiftDriverId());
@@ -1447,7 +1450,12 @@
orderCrossCity.setEndAddress(endAddress);
orderCrossCity.setMileage(0D);
- orderCrossCity.setOrderMoney(totalMoney);
+ if (warpper.getChangePrice() != null) {
+ orderCrossCity.setOrderMoney(warpper.getChangePrice().doubleValue());
+ orderCrossCity.setHasChangePrice(1);
+ } else {
+ orderCrossCity.setOrderMoney(totalMoney);
+ }
orderCrossCity.setCompanyId(driver.getCompanyId());
orderCrossCity.setPeopleNumber(warpper.getPeopleNumber());
orderCrossCity.setSeatNumber(seatNumber);
@@ -1558,17 +1566,18 @@
return ResultUtil.error("订单不在待支付，无法完成订单");
}
if (type == 1) {
- UserInfo userInfo = userInfoMapper.selectById(order.getUserId());
- if (userInfo == null) {
- return ResultUtil.error("乘客不存在");
+// UserInfo userInfo = userInfoMapper.selectById(order.getUserId());
+ Driver driver = driverService.selectById(driverId);
+ if (driver == null) {
+ return ResultUtil.error("司机不存在");
}
- if (ToolUtil.isEmpty(userInfo.getAppletsOpenId())) {
- return ResultUtil.errorOpenId("乘客未绑定微信小程序openid，无法发起微信支付");
+ if (ToolUtil.isEmpty(driver.getAppletsOpenId())) {
+ return ResultUtil.errorOpenId("司机未绑定微信小程序openid，无法发起微信支付");
}
String outTradeNo = buildCbyzxOnBehalfOutTradeNo(crossCityOrderId);
JSONObject response = cbyzxOrderPayHelper.createOrder(
order.getUserId(),
- userInfo.getAppletsOpenId(),
+ driver.getAppletsOpenId(),
outTradeNo,
order.getOrderMoney()
);
@@ -1585,6 +1594,10 @@
//添加交易明细
transactionDetailsService.saveData(driverId, "跨城出行订单", order.getOrderMoney(), 2, 1, 2, 3, order.getId());
return ResultUtil.success();
+ } else if (type == 2) {
+ String path = "pages/index/index";
+ String unlimitQrcode = weChatUtil.getUnlimitQrcode(path, "default");
+ return ResultUtil.success(unlimitQrcode);
}
return ResultUtil.error("支付失败");
}
--
Gitblit v1.7.1