From 1c7d3b4538dcd2ae6c0ec1ffc4a548088bb7b00b Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期六, 26 七月 2025 09:09:01 +0800
Subject: [PATCH] 未支付订单查询接口
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java | 7 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/UnPayOrderVO.java | 41 ++++++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java | 6 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 26 +++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 27 ++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java | 6 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 26 +++++
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java | 6 +
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 68 ++++++++++++-
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 30 ++++++
10 files changed, 234 insertions(+), 9 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 1e9f0c5..824830c 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -15,6 +15,7 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.qianyuntong.model.QYTPaymentCallback;
@@ -1987,8 +1988,8 @@
e.printStackTrace();
}
}
-
-
+
+
/**
* 管理后台推单
*
@@ -2011,8 +2012,8 @@
return ResultUtil.runErr();
}
}
-
-
+
+
/**
* 黔云通支付回调通知
*
@@ -2028,5 +2029,62 @@
}
return "success";
}
-
+
+
+ @ResponseBody
+ @PostMapping("/api/get/unPayOrder")
+ @ApiOperation(value = "获取未支付订单", tags = {"用户端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=跨城，4=小件物流,null=全部）", name = "orderType", required = false, dataType = "int"),
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil getUnPayOrder( Integer orderType, HttpServletRequest request){
+ try {
+ // 从Redis中获取当前用户ID
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if (null == uid) {
+ return ResultUtil.tokenErr();
+ }
+
+ List<UnPayOrderVO> unpaidOrders = new ArrayList<>();
+
+ // 根据订单类型查询对应未支付订单
+ if (orderType == null || orderType == 1) {
+ // 查询未支付的专车订单
+ List<UnPayOrderVO> privateCarOrders = orderPrivateCarService.getUnpayPrivateOrders(uid);
+ unpaidOrders.addAll(privateCarOrders);
+ }
+
+ if (orderType == null || orderType == 2) {
+ // 查询未支付的出租车订单
+ List<UnPayOrderVO> taxiOrders = orderTaxiService.getUnpayTaxiOrders(uid);
+ unpaidOrders.addAll(taxiOrders);
+ }
+
+ if (orderType == null || orderType == 3) {
+ // 查询未支付的跨城订单
+ List<UnPayOrderVO> crossCityOrders = orderCrossCityService.getUnpayCrossCityOrders(uid);
+ unpaidOrders.addAll(crossCityOrders);
+ }
+
+ if (orderType == null || orderType == 4 || orderType == 5) {
+ // 查询未支付的物流订单（包含类型4和5）
+ List<UnPayOrderVO> logisticsOrders = orderLogisticsService.getUnpayLogisticsOrders(uid);
+ unpaidOrders.addAll(logisticsOrders);
+ }
+
+ // 按创建时间倒序排序（最新的订单在前）
+ unpaidOrders.sort(Comparator.comparing(UnPayOrderVO::getInsertTime).reversed());
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("total", unpaidOrders.size());
+ result.put("orders", unpaidOrders);
+
+ return ResultUtil.success(result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
index 0003e66..94ab799 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/IOrderCrossCityService.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.CouponsListVo;
@@ -315,4 +316,9 @@
* @throws Exception
*/
void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+
+ /**
+ * 获取未支付的跨城订单
+ */
+ List<UnPayOrderVO> getUnpayCrossCityOrders(Integer uid) throws Exception;
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 57cd0f5..4aca942 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -25,12 +25,10 @@
import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;
import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
-import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
-import com.stylefeng.guns.modular.system.warpper.CouponsListVo;
-import com.stylefeng.guns.modular.system.warpper.OrderServerWarpper;
-import com.stylefeng.guns.modular.system.warpper.PreferentialDataVo;
+import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
@@ -2635,4 +2633,25 @@
driverService.updateById(driver);
systemNoticeService.addSystemNotice(1, "您已使用" + (payType == 1 ? "微信" : (payType==2?"支付宝":"云闪付")) + "成功完成感谢费支付，谢谢使用！", userInfo.getId(), 1);
}
+
+ @Override
+ public List<UnPayOrderVO> getUnpayCrossCityOrders(Integer uid) throws Exception {
+ EntityWrapper<OrderCrossCity> query = new EntityWrapper<>();
+ query.eq("userId", uid).eq("state", 7);
+ // 查询未支付订单
+ List<OrderCrossCity> orderCrossCities = this.selectList(query);
+ List<UnPayOrderVO> unPayOrderVOList = new ArrayList<>();
+ for(OrderCrossCity orderCrossCity : orderCrossCities){
+
+ UnPayOrderVO unPayOrderVO = new UnPayOrderVO();
+ //添加司机信息
+ DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
+ Driver driver = driverService.selectById(orderCrossCity.getDriverId());
+ BeanUtils.copyProperties(driver, driverInfoWarpper); unPayOrderVO.setDriverInfoWarpper(driverInfoWarpper);
+ //其余信息
+ BeanUtils.copyProperties(orderCrossCity, unPayOrderVO);
+ unPayOrderVOList.add(unPayOrderVO);
+ }
+ return unPayOrderVOList;
+ }
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
index 83a21b8..e493d92 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/IOrderLogisticsService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.system.model.Region;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.CouponsListVo;
import com.stylefeng.guns.modular.system.warpper.PreferentialDataVo;
@@ -266,4 +267,9 @@
* @throws Exception
*/
void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+
+ /**
+ * 获取未支付订单
+ */
+ List<UnPayOrderVO> getUnpayLogisticsOrders(Integer uid);
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 41f1961..197f3fe 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -18,16 +18,19 @@
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.CouponsListVo;
+import com.stylefeng.guns.modular.system.warpper.DriverInfoWarpper;
import com.stylefeng.guns.modular.system.warpper.PreferentialDataVo;
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -1682,4 +1685,27 @@
driverService.updateById(driver);
systemNoticeService.addSystemNotice(1, "您已使用" + (payType == 1 ? "微信" : (payType==2?"支付宝":"云闪付")) + "成功完成感谢费支付，谢谢使用！", userInfo.getId(), 1);
}
+
+ @Override
+ public List<UnPayOrderVO> getUnpayLogisticsOrders(Integer uid) {
+ EntityWrapper<OrderLogistics> wrapper = new EntityWrapper<>();
+ wrapper.eq("userId", uid);
+ wrapper.eq("state", 7);
+ List<OrderLogistics> orderLogisticsList = this.selectList(wrapper);
+ List<UnPayOrderVO> unPayOrderVOList = new ArrayList<>();
+ for (OrderLogistics orderLogistics:orderLogisticsList) {
+
+ UnPayOrderVO unPayOrderVO = new UnPayOrderVO();
+ //添加司机信息
+ DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ BeanUtils.copyProperties(driver, driverInfoWarpper); unPayOrderVO.setDriverInfoWarpper(driverInfoWarpper);
+ //其余信息
+ BeanUtils.copyProperties(orderLogistics, unPayOrderVO);
+ unPayOrderVOList.add(unPayOrderVO);
+
+ }
+ return unPayOrderVOList;
+
+ }
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
index a94d6a9..498e811 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/IOrderPrivateCarService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -318,4 +319,9 @@
@Param("state") Integer state,
@Param("lon") String lon,
@Param("lat") String lat);
+
+ /**
+ * 获取专车未支付的订单
+ */
+ List<UnPayOrderVO> getUnpayPrivateOrders(Integer uid);
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 422f3e2..281eb40 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -17,6 +17,7 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -26,6 +27,7 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -2687,4 +2689,32 @@
public List<Map<String, Object>> queryOrderInfo2(Integer orderId, Integer state, String lon, String lat) {
return this.baseMapper.queryOrderInfo2(orderId,state,lon,lat);
}
+
+ /**
+ * 获取专车未支付订单
+ * @param uid
+ * @return
+ */
+ @Override
+ public List<UnPayOrderVO> getUnpayPrivateOrders(Integer uid) {
+ EntityWrapper<OrderPrivateCar> wrapper = new EntityWrapper<>();
+ wrapper.eq("userId", uid);
+ wrapper.eq("state", 7);
+ //查出未支付订单
+ List<OrderPrivateCar> orderPrivateCars = this.selectList(wrapper);
+ List<UnPayOrderVO> unPayOrderVOList = new ArrayList<>();
+ for (OrderPrivateCar order : orderPrivateCars) {
+ UnPayOrderVO vo = new UnPayOrderVO();
+ // 复制属性
+ //添加司机信息
+ DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
+ Driver driver = driverService.selectById(order.getDriverId());
+ BeanUtils.copyProperties(driver, driverInfoWarpper); vo.setDriverInfoWarpper(driverInfoWarpper);
+ //其余信息
+ BeanUtils.copyProperties(order, vo);
+ unPayOrderVOList.add(vo);
+ }
+
+ return unPayOrderVOList;
+ }
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/UnPayOrderVO.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/UnPayOrderVO.java
new file mode 100644
index 0000000..8bc8ca5
--- /dev/null
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/vo/UnPayOrderVO.java
@@ -0,0 +1,41 @@
+package com.stylefeng.guns.modular.system.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.stylefeng.guns.modular.system.warpper.DriverInfoWarpper;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * 未支付订单信息
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UnPayOrderVO {
+
+ @ApiModelProperty(value = "司机信息")
+ private DriverInfoWarpper driverInfoWarpper;
+
+ @JsonFormat(pattern = "yyyy年MM月dd HH:mm", timezone = "GMT+8")
+ @ApiModelProperty(value = "下单时间")
+ private Date insertTime;
+
+ @ApiModelProperty(value = "上车地点")
+ private String boardingAddress;
+
+ @ApiModelProperty(value = "下车地点")
+ private String getoffAddress;
+
+ @ApiModelProperty(value = "订单金额")
+ private Double payMoney;
+
+ @ApiModelProperty(value = "订单id")
+ private Integer orderId;
+
+
+}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
index 266fc0a..5950678 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/IOrderTaxiService.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.taxi.service;
import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -296,4 +297,10 @@
* @throws Exception
*/
void payThankYouFeeCallback(Integer orderId, String order_id, Integer payType) throws Exception;
+
+ /**
+ * 获取未支付的出租车订单
+ */
+ List<UnPayOrderVO> getUnpayTaxiOrders(Integer uid);
+
}
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 087157d..9090f85 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -20,6 +20,7 @@
import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;
import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -29,6 +30,7 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
@@ -2231,4 +2233,28 @@
driverService.updateById(driver);
systemNoticeService.addSystemNotice(1, "您已使用" + (payType == 1 ? "微信" : (payType==2?"支付宝":"云闪付")) + "成功完成感谢费支付，谢谢使用！", userInfo.getId(), 1);
}
+
+ @Override
+ public List<UnPayOrderVO> getUnpayTaxiOrders(Integer uid) {
+ EntityWrapper<OrderTaxi> wrapper = new EntityWrapper<>();
+ wrapper.eq("userId", uid);
+ wrapper.eq("state", 7);
+ //查出未支付订单
+ List<OrderTaxi> orderTaxiList = this.selectList(wrapper);
+ List<UnPayOrderVO> unPayOrderVOList = new ArrayList<>();
+ for (OrderTaxi orderTaxi:orderTaxiList) {
+ UnPayOrderVO unPayOrderVO = new UnPayOrderVO();
+ //添加司机信息
+ DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper();
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+ BeanUtils.copyProperties(driver, driverInfoWarpper);
+ unPayOrderVO.setDriverInfoWarpper(driverInfoWarpper);
+ //其余信息
+ BeanUtils.copyProperties(orderTaxi, unPayOrderVO);
+ unPayOrderVOList.add(unPayOrderVO);
+
+ }
+
+ return unPayOrderVOList;
+ }
}
--
Gitblit v1.7.1