From 16ee4f20dc68b9e6a19490c935aa17bb325f8f0d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 01 八月 2025 09:03:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
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 b12309d..839b316 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
@@ -2318,6 +2318,7 @@
BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
orderTaxi.setPromotionDriverId(userInfo.getBindDriverId());
orderTaxi.setPromotionMoney(bigDecimal);
+ orderTaxi.setPromotionActivityId(tDriverPromotionActivity.getId());
this.baseMapper.updateById(orderTaxi);
}
}
@@ -2331,4 +2332,29 @@
}
}
}
+
+ @Override
+ public List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception {
+ pageNum = (pageNum - 1) * size;
+ List<Map<String, Object>> maps = orderTaxiMapper.queryMyTripList(uid, pageNum, size);
+ for (Map<String, Object> map : maps) {
+ if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
+ map.put("state", map.get("oldState"));
+ }
+ }
+ return maps;
+ }
+
+ @Override
+ public List<Map<String, Object>> queryMyTripListAll(Integer uid) throws Exception {
+
+ List<Map<String, Object>> maps = orderTaxiMapper.queryMyTripListAll(uid);
+ for (Map<String, Object> map : maps) {
+ if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
+ map.put("state", map.get("oldState"));
+ }
+ }
+ return maps;
+ }
+
}
--
Gitblit v1.7.1