From b4835ff468ab4a51aa05c4fdc290a667f8802b71 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 17 九月 2025 15:28:39 +0800
Subject: [PATCH] 修改扫码下单
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 725c6e7..de3a3a5 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -35,6 +35,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -341,7 +342,25 @@
// 查询预估价格
ResultUtil<List<ServerCarModelWarpper>> listResultUtil = serverCarModelService.queryServerCarModel(startLon + "," + startLat, endLon + "," + endLat, 1);
List<ServerCarModelWarpper> data = listResultUtil.getData();
- data = data.stream().filter(e -> serverCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList());
+ System.out.println("预估价格++++++++++："+data);
+ System.out.println("服务车型id++++++++++："+serverCarModelId);
+ if(Objects.isNull(serverCarModelId)){
+ // 查询司机
+ Driver driver2 = driverService.selectById(driverId);
+ //获取经营业务
+ CarService query = new CarService();
+ query.setCarId(driver2.getCarId());
+ CarService service = carServiceMapper.selectOne(query);
+ System.out.println("服务车型========："+service);
+ if(Objects.nonNull(service)){
+ serverCarModelId = service.getServerCarModelId();
+ System.out.println("服务车型id++++++++++："+serverCarModelId);
+ }
+ }
+ Integer finalServerCarModelId = serverCarModelId;
+ System.out.println("服务车型id++++++++++："+finalServerCarModelId);
+ data = data.stream().filter(e -> finalServerCarModelId.equals(e.getId())).sorted(Comparator.comparing(ServerCarModelWarpper::getAmount)).collect(Collectors.toList());
+ System.out.println("匹配出来的车型++++++++++："+finalServerCarModelId);
if(Objects.nonNull(openCity) && !CollectionUtils.isEmpty(data) && BigDecimal.valueOf(data.get(0).getAmount()).compareTo(openCity.getOrderMagnitude()) > 0){
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
@@ -363,7 +382,9 @@
return ResultUtil.success(baseWarpper);
}else {
if(orderSource == 2){
- orderPrivateCar.setEstimatedPrice(data.get(0).getAmount());
+ if(!CollectionUtils.isEmpty(data)){
+ orderPrivateCar.setEstimatedPrice(data.get(0).getAmount());
+ }
}else {
orderPrivateCar.setEstimatedPrice(data.get(carIndex).getAmount());
}
@@ -1924,13 +1945,15 @@
transactionDetailsService.saveData(orderPrivateCar.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 1, query.getOrderId());
// orderPrivateCar.setState(8);
orderPrivateCar.setPayType(type);
- orderPrivateCar.setTransactionId(order_id);
+ if(!StringUtils.hasLength(orderPrivateCar.getTransactionId())){
+ orderPrivateCar.setTransactionId(order_id);
+ }
this.updateById(orderPrivateCar);
- UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
- SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
- userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
- userInfoService.updateById(userInfo);
+// UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
+// SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
+// userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
+// userInfoService.updateById(userInfo);
//处理优惠券和红包
if(null != orderPrivateCar.getCouponId()){
--
Gitblit v1.7.1