puzhibing
2024-02-07 45d364822a232151cf977cde0f4cf7a2b332c45f
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java
@@ -101,16 +101,16 @@
            @ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<TravelRecordWarpper>> queryRedEnvelope(Integer pageNum, Integer size, HttpServletRequest request){
    public ResultUtil<List<TravelRecordWarpper>> queryRedEnvelope(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
        try {
            Integer uid = userInfoService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            pageNum = (pageNum - 1) * size;
            List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(uid);//专车
            List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(uid);//出租车
            List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(uid);//跨城
            List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(language, uid);//专车
            List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(language, uid);//出租车
            List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(language, uid);//跨城
            list.addAll(list1);
            list.addAll(list2);