liujie
2025-08-08 d2de40b544b5b069cd525143ff5a9e0d922b2c66
我的订单顺风车
5个文件已修改
43 ■■■■■ 已修改文件
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -9,6 +9,8 @@
import com.stylefeng.guns.modular.call.server.IOrderCallService;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
@@ -163,7 +165,9 @@
    @Autowired
    private IServerCarModelService serverCarModelService;
    
    @Autowired
    private IOrderRideService orderRideService;
    
    
    
@@ -244,7 +248,7 @@
    @PostMapping("/api/order/queryMyOrderList")
    @ApiOperation(value = "获取个人中心订单列表", tags = {"用户端-个人中心"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城出行,4=同城小件物流, 5=跨城小件物流,6=包车,7=助老模式)", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型(1=专车,2=出租车,3=跨城出行,4=同城小件物流, 5=跨城小件物流,6=包车,7=助老模式,8顺风车)", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "页码(首页1)", name = "pageNum", required = true, dataType = "int"),
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -278,6 +282,9 @@
                case 7:
//                    list = orderCallService.queryMyOrderList(uid, pageNum, size);
                    break;
                case 8:
                    list = orderRideService.queryMyOrderList(uid, pageNum, size);
                    break;
            }
            return ResultUtil.success(OrderWarpper.getOrderWarpper(list));
        } catch (Exception e) {
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/OrderRideMapper.java
@@ -4,8 +4,10 @@
import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideInfoVo;
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
 * <p>
@@ -36,4 +38,7 @@
     * @return
     */
    OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo);
    List<Map<String, Object>> queryMyOrderList(@Param("uid") Integer uid, @Param("pageNum") Integer pageNum, @Param("size") Integer size);
}
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml
@@ -86,4 +86,17 @@
        left join app_driver_ride d on d.id=r.driverId
        left join app_user_info u on r.userId=u.id
    </select>
    <select id="queryMyOrderList" resultType="java.util.Map">
        select
            id as orderId,
            DATE_FORMAT(addTime, '%Y-%m-%d %H:%i') as orderTime,
            DATE_FORMAT(startTime, '%m月%d日 %H:%i') as time,
        startName as startAddress,
        endName as endAddress,
        driverId as driverId,
        (8) as orderType,
        state as state
        from app_order_ride where userId = #{uid} order by addTime desc limit #{pageNum}, #{size}
    </select>
</mapper>
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/IOrderRideService.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.modular.shunfeng.model.vo.OrderRideVo;
import java.util.List;
import java.util.Map;
/**
 * <p>
@@ -34,4 +35,8 @@
     * @return
     */
    OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo);
    List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size);
}
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/service/impl/OrderRideServiceImpl.java
@@ -8,7 +8,9 @@
import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
 * <p>
@@ -34,4 +36,11 @@
    public OrderRideInfoVo getOrderInfo(OrderRideInfoVo orderRideInfoVo) {
        return this.baseMapper.getOrderInfo(orderRideInfoVo);
    }
    @Override
    public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) {
        pageNum = (pageNum - 1) * size;
        List<Map<String, Object>> maps = this.baseMapper.queryMyOrderList(uid, pageNum, size);
        return maps;
    }
}