From 81f6d10bb745825437e0145c6d27bc3468ee281c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 31 七月 2025 17:59:56 +0800
Subject: [PATCH] 修改后台需要功能
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
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 5a22d0d..e65ee14 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
@@ -130,7 +130,7 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
@Autowired
- private IOrderLogisticsService orderLogisticsService;
+ private TAbnormalPayOrderMapper abnormalPayOrderMapper;
@Autowired
private ITaxiCardPaymentService taxiCardPaymentService;
@Autowired
@@ -600,7 +600,13 @@
// 是否推广订单
Integer promotion = isPromotion(uid);
- orderPrivateCar.setPromotion(promotion);
+ if(promotion!=null){
+ orderPrivateCar.setPromotion(2);
+ Driver driver = driverService.selectById(promotion);
+ orderPrivateCar.setPromotionUser(driver.getName());
+ orderPrivateCar.setPromotionPhone(driver.getPhone());
+ orderPrivateCar.setPromotionDriverId(promotion);
+ }
this.insert(orderPrivateCar);
@@ -744,9 +750,9 @@
UserInfo userInfo = userInfoService.selectById(userId);
if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
String registAreaCode = userInfo.getRegistAreaCode();
- TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
+ TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).eq("state",1).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
if(tDriverPromotionActivity!=null){
- return 2;
+ return userInfo.getBindDriverId();
}
}
return null;
@@ -2735,7 +2741,7 @@
}
orderPrivateCar.setAbnormalIntro(abnormalIntro);
orderPrivateCar.setAbnormalImg(abnormalImg);
- orderPrivateCar.setAbnormal(1);
+ orderPrivateCar.setAbnormal(2);
this.baseMapper.updateById(orderPrivateCar);
}
@@ -2744,7 +2750,9 @@
public void promotion(Integer orderId) {
OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
- if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
+// if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
+ // 开始绑定的 后面到期也结算
+ if(orderPrivateCar.getPromotionDriverId()!=null ){
String registAreaCode = userInfo.getRegistAreaCode();
TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", registAreaCode).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
if(tDriverPromotionActivity!=null){
@@ -2752,8 +2760,43 @@
BigDecimal bigDecimal = tDriverPromotionActivity.getCommissionRatio().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_UP);
orderPrivateCar.setPromotionDriverId(userInfo.getBindDriverId());
orderPrivateCar.setPromotionMoney(bigDecimal);
+ orderPrivateCar.setPromotionActivityId(tDriverPromotionActivity.getId());
this.baseMapper.updateById(orderPrivateCar);
}
}
+
+ // 是否异常订单
+ if (orderPrivateCar.getResponsibilityType() !=null && orderPrivateCar.getResponsibilityType() >2) {
+ TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", orderPrivateCar.getOrderNum())).stream().findFirst().orElse(null);
+ if (tAbnormalPayOrder != null) {
+ tAbnormalPayOrder.setPayStatus(2);
+ tAbnormalPayOrder.setPayTime(new Date());
+ abnormalPayOrderMapper.updateById(tAbnormalPayOrder);
+ }
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> queryMyTripList(Integer uid, Integer pageNum, Integer size) throws Exception {
+ pageNum = (pageNum - 1) * size;
+ List<Map<String, Object>> maps = orderPrivateCarMapper.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 = orderPrivateCarMapper.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