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 | 320 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 216 insertions(+), 104 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 b704f9f..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
@@ -158,6 +158,9 @@
private Lock lock = new ReentrantLock();
@Autowired
private AppOrderController appOrderController;
+
+ @Autowired
+ private TDriverPromotionActivityService driverPromotionActivityService;
/**
* 专车下单操作
@@ -594,6 +597,18 @@
orderPrivateCar.setTotalPeopleNum(peopleNum);
orderPrivateCar.setIsReassign(1);
orderPrivateCar.setIsDelete(1);
+
+ // 是否推广订单
+ Integer promotion = isPromotion(uid);
+ 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);
//判断独享，一口价，拼车
@@ -729,7 +744,22 @@
}
return ResultUtil.success(baseWarpper);
}
-
+
+
+ private Integer isPromotion(Integer userId){
+ 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).eq("state",1).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
+ if(tDriverPromotionActivity!=null){
+ return userInfo.getBindDriverId();
+ }
+ }
+ return null;
+
+ }
+
+
/**
* 下单后继续等待
*
@@ -1106,6 +1136,119 @@
}
return resultUtil;
}
+
+
+ @Override
+ public Map<String, Object> queryOrderInfo(Integer uid, Integer orderId) throws Exception {
+ Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
+ if(null == map){
+ OrderTaxi orderTaxi = orderTaxiService.selectOne(new EntityWrapper<OrderTaxi>()
+ .eq("userId", uid)
+ .eq("isDelete", 1)
+ .in("state", Arrays.asList(2, 3, 4, 5, 6, 7))
+ );
+ return orderTaxiService.queryOrderInfo(orderTaxi.getId());
+ }
+ if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ orderPrivateCar.setReassignNotice(0);
+ this.updateById(orderPrivateCar);
+ }
+ if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
+ map.put("state", map.get("oldState"));
+ }
+ if(Integer.valueOf(String.valueOf(map.get("state"))) ==7 && (map.get("responsibilityType")==null || Integer.valueOf(String.valueOf(map.get("responsibilityType")))<4)){
+ map.put("appealButton", 1);
+ }
+ if(map.get("abnormalIntro")!=null){
+ map.put("appealStatus", 1);
+ }
+
+
+ if(Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9){
+ map.put("redPacketMoney", null);
+ map.put("couponMoney", null);
+ }
+
+ String driverId = (String) redisTemplate.opsForValue().get("DEVICE_" + map.get("driverId"));
+ map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
+ map.put("orderType", 1);
+ return map;
+ }
+
+ /**
+ * 获取服务中的订单数据
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(null == orderPrivateCar){
+ return orderTaxiService.queryOrderServer(orderId, uid);
+ }
+ //计算预计距离和剩余时间
+ String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
+ if(null == value || "".equals(value)){
+ System.err.println("司机没有上传位置信息");
+
+ //调用获取轨迹中的数据
+ List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
+ if(list.size() > 0){
+ Map<String, Object> map = list.get(list.size() - 1);
+ value = map.get("lon") + "," + map.get("lat");
+ }
+
+ }
+
+ OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
+ orderServerWarpper.setOrderId(orderPrivateCar.getId());
+ orderServerWarpper.setOrderType(1);
+ orderServerWarpper.setState(orderPrivateCar.getState());
+ orderServerWarpper.setLon(null != value ? value.split(",")[0] : "0.0");
+ orderServerWarpper.setLat(null != value ? value.split(",")[1] : "0.0");
+ orderServerWarpper.setReassignNotice(orderPrivateCar.getReassignNotice());
+ if(orderPrivateCar.getState() == 2 || orderPrivateCar.getState() == 3){//前往预约地
+ // TODO: 2023/11/4 无法修改
+ Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), 1);
+ String d = "0";
+ String t = "0";
+ if(null == distance){
+ System.err.println("查询距离出错了");
+ }else{
+ d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+ }
+ orderServerWarpper.setReservationMileage(d);
+ orderServerWarpper.setReservationTime(t);
+ orderServerWarpper.setServedMileage("0");
+ orderServerWarpper.setServedTime("0");
+ orderServerWarpper.setLaveMileage("0");
+ orderServerWarpper.setLaveTime("0");
+ }
+ if(orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6){//服务中
+ // TODO: 2023/11/4 无法修改
+ Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), 1);
+ String d = "0";
+ String t = "0";
+ if(null == distance){
+ System.err.println("查询距离出错了");
+ }else{
+ d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
+ }
+ orderServerWarpper.setReservationMileage("0");
+ orderServerWarpper.setReservationTime("0");
+ orderServerWarpper.setServedMileage(String.valueOf((null == orderPrivateCar.getMileage() ? 0 : orderPrivateCar.getMileage()) / 1000));
+ orderServerWarpper.setServedTime(Long.valueOf((new Date().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000).intValue() + "");
+ orderServerWarpper.setLaveMileage(d);
+ orderServerWarpper.setLaveTime(t);
+ }
+
+ return orderServerWarpper;
+ }
+
@Override
public synchronized String getOrderNum() throws Exception {
@@ -2263,114 +2406,13 @@
return orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid);
}
- @Override
- public Map<String, Object> queryOrderInfo(Integer uid, Integer orderId) throws Exception {
- Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
- if (null == map) {
- OrderTaxi orderTaxi = orderTaxiService.selectOne(new EntityWrapper<OrderTaxi>()
- .eq("userId", uid)
- .eq("isDelete", 1)
- .in("state", Arrays.asList(2, 3, 4, 5, 6, 7))
- );
- return orderTaxiService.queryOrderInfo(orderTaxi.getId());
- }
- if (null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2) {//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
- OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- orderPrivateCar.setReassignNotice(0);
- this.updateById(orderPrivateCar);
- }
- if (Integer.valueOf(String.valueOf(map.get("state"))) == 11) {
- map.put("state", map.get("oldState"));
- }
- if (Integer.valueOf(String.valueOf(map.get("state"))) != 8 && Integer.valueOf(String.valueOf(map.get("state"))) != 9) {
- map.put("redPacketMoney", null);
- map.put("couponMoney", null);
- }
-
- String driverId = (String) redisTemplate.opsForValue().get("DEVICE_" + map.get("driverId"));
- map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
- map.put("orderType", 1);
- return map;
- }
@Override
public List<Map<String, Object>> queryMyTravelRecord(Integer uid) throws Exception {
return orderPrivateCarMapper.queryMyTravelRecord(uid);
}
- /**
- * 获取服务中的订单数据
- *
- * @param uid
- * @return
- * @throws Exception
- */
- @Override
- public OrderServerWarpper queryOrderServer(Integer orderId, Integer uid) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- if (null == orderPrivateCar) {
- return orderTaxiService.queryOrderServer(orderId, uid);
- }
- //计算预计距离和剩余时间
- String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
- if (null == value || "".equals(value)) {
- System.err.println("司机没有上传位置信息");
-
- //调用获取轨迹中的数据
- List<Map<String, Object>> list = orderPositionService.queryTrack(orderId, 2);
- if (list.size() > 0) {
- Map<String, Object> map = list.get(list.size() - 1);
- value = map.get("lon") + "," + map.get("lat");
- }
-
- }
-
- OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
- orderServerWarpper.setOrderId(orderPrivateCar.getId());
- orderServerWarpper.setOrderType(1);
- orderServerWarpper.setState(orderPrivateCar.getState());
- orderServerWarpper.setLon(null != value ? value.split(",")[0] : "0.0");
- orderServerWarpper.setLat(null != value ? value.split(",")[1] : "0.0");
- orderServerWarpper.setReassignNotice(orderPrivateCar.getReassignNotice());
- if (orderPrivateCar.getState() == 2 || orderPrivateCar.getState() == 3) {//前往预约地
- // TODO: 2023/11/4 无法修改
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), 1);
- String d = "0";
- String t = "0";
- if (null == distance) {
- System.err.println("查询距离出错了");
- } else {
- d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
- t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
- }
- orderServerWarpper.setReservationMileage(d);
- orderServerWarpper.setReservationTime(t);
- orderServerWarpper.setServedMileage("0");
- orderServerWarpper.setServedTime("0");
- orderServerWarpper.setLaveMileage("0");
- orderServerWarpper.setLaveTime("0");
- }
- if (orderPrivateCar.getState() == 5 || orderPrivateCar.getState() == 6) {//服务中
- // TODO: 2023/11/4 无法修改
- Map<String, String> distance = gdMapElectricFenceUtil.getDistance(value, orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), 1);
- String d = "0";
- String t = "0";
- if (null == distance) {
- System.err.println("查询距离出错了");
- } else {
- d = new BigDecimal(distance.get("distance")).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
- t = new BigDecimal(distance.get("duration")).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
- }
- orderServerWarpper.setReservationMileage("0");
- orderServerWarpper.setReservationTime("0");
- orderServerWarpper.setServedMileage(String.valueOf((null == orderPrivateCar.getMileage() ? 0 : orderPrivateCar.getMileage()) / 1000));
- orderServerWarpper.setServedTime(Long.valueOf((new Date().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000).intValue() + "");
- orderServerWarpper.setLaveMileage(d);
- orderServerWarpper.setLaveTime(t);
- }
-
- return orderServerWarpper;
- }
+
/**
* 获取下单推送完后没有司机接单的提醒
@@ -2687,4 +2729,74 @@
}
}).start();
}
+
+
+
+
+ @Override
+ public void addAppeal(Integer uid, Integer orderId,String abnormalIntro, String abnormalImg) {
+ OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+ if(orderPrivateCar.getState()!=7 || orderPrivateCar.getAbnormalIntro()!=null){
+ throw new RuntimeException("此订单无法申诉");
+ }
+ orderPrivateCar.setAbnormalIntro(abnormalIntro);
+ orderPrivateCar.setAbnormalImg(abnormalImg);
+ orderPrivateCar.setAbnormal(2);
+ this.baseMapper.updateById(orderPrivateCar);
+
+ }
+
+ @Override
+ 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(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){
+ Double payMoney = orderPrivateCar.getPayMoney();
+ 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