合并代码

puzhibing

2024-01-03 48323fce3b4b8013755421aa1d1feb9a73cddde9

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java

@@ -166,6 +166,7 @@
        saveParticipant.setWeight(student.getWeight());
        saveParticipant.setPhone(student.getPhone());
        saveParticipant.setIdcard(student.getIdCard());

        participantClient.saveParticipant(saveParticipant);
        return ResultUtil.success();
    }
@@ -713,18 +714,16 @@
        citycodeResp.setLatitude(longitude);
        List<StoreDetailList> queryStoreList = storeClient.getQueryStoreList(citycodeResp);
        if (queryStoreList.size() > 0) {
            if (ToolUtil.isEmpty(space) || space == 2) {
            if (ToolUtil.isEmpty(space) || space ==1) {
                queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
            } else {
                queryStoreList = queryStoreList.stream()
                        .sorted(Comparator.comparing(StoreDetailList::getStoreDistance).reversed())
                        .collect(Collectors.toList());

            } else {
                queryStoreList = queryStoreList.stream().sorted(Comparator.comparing(o -> o.getStoreDistance())).collect(Collectors.toList());
            }
            if (ToolUtil.isNotEmpty(search)) {
                queryStoreList = queryStoreList.stream().filter(o -> o.getStoreName().contains(search)).collect(Collectors.toList());
            }

        }
        return queryStoreList;
    }