From ddf70bde6196d51ee2e4b263624abf392c0bdfc7 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 28 七月 2025 09:47:24 +0800 Subject: [PATCH] 用户端修改回调处理异常订单 --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 2 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 85a8d0c..a0ea831 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,12 @@ orderPrivateCar.setTotalPeopleNum(peopleNum); orderPrivateCar.setIsReassign(1); orderPrivateCar.setIsDelete(1); + + // 是否推广订单 + Integer promotion = isPromotion(uid); + orderPrivateCar.setPromotion(promotion); + + this.insert(orderPrivateCar); //判断独享,一口价,拼车 @@ -729,7 +738,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).ge("startTime", new Date()).lt("endTime", new Date()).last("AND FIND_IN_SET(" + 1 + ", bizType) limit 1")); + if(tDriverPromotionActivity!=null){ + return 2; + } + } + return null; + + } + + /** * 下单后继续等待 * @@ -2715,4 +2739,31 @@ 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()){ + 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); + 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); + } + } + } } -- Gitblit v1.7.1