Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-03-01 bad018eeb9865c0f2a353f8a224d253fc635549e

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderEvaluateServiceImpl.java

@@ -129,9 +129,9 @@

    @Override
    public PageInfo<OrderEvaluateManagementPageListVO> managementPageList(OrderEvaluateManagementPageListQuery query) {
        PageInfo<OrderEvaluateManagementPageListVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
        List<OrderEvaluateManagementPageListVO> list = this.baseMapper.managementPageList(pageInfo,query);
        if (list.isEmpty()){
        PageInfo<OrderEvaluateManagementPageListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<OrderEvaluateManagementPageListVO> list = this.baseMapper.managementPageList(pageInfo, query);
        if (list.isEmpty()) {
            return new PageInfo<>();
        }
        List<Long> userIds = list.stream().map(OrderEvaluateManagementPageListVO::getUserId).collect(Collectors.toList());
@@ -140,21 +140,25 @@
        getUserListByUidsVo.setGetPreCarOwner(false);
        UserResourcesDto userListByUids = userResourcesClient.getUserListByUids(getUserListByUidsVo);
        for (OrderEvaluateManagementPageListVO orderEvaluateManagementPageListVO : list) {
            Object data = userListByUids.getData();
            // 转化为jsonArray
            JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(data));
            for (Object o : jsonArray) {
                // 转化为JsonObject
                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
                String mobile = jsonObject.getString("mobile");
                String nickName = jsonObject.getString("nickName");
                String headImage = jsonObject.getString("headImage");
                orderEvaluateManagementPageListVO.setPhoneNumber(mobile);
                orderEvaluateManagementPageListVO.setNickName(nickName);
                orderEvaluateManagementPageListVO.setHeadImage(headImage);
            }
//            Object data = userListByUids.getData();
//            // 转化为jsonArray
//            JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(data));
//            for (Object o : jsonArray) {
//                // 转化为JsonObject
//                JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
//                String mobile = jsonObject.getString("mobile");
//                String nickName = jsonObject.getString("nickName");
//                String headImage = jsonObject.getString("headImage");
//                orderEvaluateManagementPageListVO.setPhoneNumber(mobile);
//                orderEvaluateManagementPageListVO.setNickName(nickName);
//                orderEvaluateManagementPageListVO.setHeadImage(headImage);
//            }
            orderEvaluateManagementPageListVO.setPhoneNumber("19983174515");
            orderEvaluateManagementPageListVO.setNickName("默认用户");
            orderEvaluateManagementPageListVO.setHeadImage("[]");
            systemSettingClient.getFeedbackTypeById(orderEvaluateManagementPageListVO.getFeedbackTypeId());
        }

        pageInfo.setRecords(list);
        return pageInfo;
    }
@@ -255,7 +259,7 @@
        // 手机号过滤
        if (StringUtils.isNotBlank(query.getPhoneNumber())) {
            if (StringUtils.isBlank(vo.getPhoneNumber()) ||
                !vo.getPhoneNumber().contains(query.getPhoneNumber())) {
                    !vo.getPhoneNumber().contains(query.getPhoneNumber())) {
                return false;
            }
        }
@@ -263,7 +267,7 @@
        // 车牌号过滤
        if (StringUtils.isNotBlank(query.getPlateNumber())) {
            if (StringUtils.isBlank(vo.getPlateNumber()) ||
                !vo.getPlateNumber().contains(query.getPlateNumber())) {
                    !vo.getPlateNumber().contains(query.getPlateNumber())) {
                return false;
            }
        }