From 570ae72b8ab5cf51b91fd6dc48411710dbf04125 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期六, 26 七月 2025 14:46:32 +0800 Subject: [PATCH] 未完成订单 --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 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 332558f..9ff2ccc 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 @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.aliyun.oss.ServiceException; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.core.util.ToolUtil; @@ -1159,6 +1160,14 @@ 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); @@ -2709,7 +2718,8 @@ //添加司机信息 DriverInfoWarpper driverInfoWarpper = new DriverInfoWarpper(); Driver driver = driverService.selectById(order.getDriverId()); - BeanUtils.copyProperties(driver, driverInfoWarpper); vo.setDriverInfoWarpper(driverInfoWarpper); + BeanUtils.copyProperties(driver, driverInfoWarpper); + vo.setDriverInfoWarpper(driverInfoWarpper); //其余信息 BeanUtils.copyProperties(order, vo); unPayOrderVOList.add(vo); @@ -2717,4 +2727,17 @@ return unPayOrderVOList; } + + @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(1); + this.baseMapper.updateById(orderPrivateCar); + + } } -- Gitblit v1.7.1