bug修改

mitao

2025-04-11 0ccd94c863ac71b46bff3cc15feabec53650738f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java

@@ -13,6 +13,8 @@
import com.dsh.course.feignClient.activity.model.BodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointment;
import com.dsh.course.feignClient.activity.model.QueryBodySideAppointmentVO;
import com.dsh.course.feignClient.communityWorldCup.Model.StoreIds;
import com.dsh.course.feignClient.communityWorldCup.WorldCupClient;
import com.dsh.course.feignClient.competition.CompetitionClient;
import com.dsh.course.feignClient.competition.model.Competition;
import com.dsh.course.feignClient.competition.model.ListQuery;
@@ -25,6 +27,7 @@
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -157,7 +160,7 @@

        }
        if (data.getViplevelId()!=null){
            // todo 创建会员等级表

            model.addAttribute("level","黄金");
        }
        model.addAttribute("level","黄金");
@@ -166,6 +169,8 @@
        return PREFIX + "TAppUser_edit.html";
    }

    @Autowired
    private WorldCupClient worldCupClient;
    /**
     * 获取所有用户信息
     * @return
@@ -194,9 +199,6 @@
        }
        queryAppUser.setInsertType(objectType);
        queryAppUser.setTypeId(UserExt.getUser().getObjectId());
        List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
        // 根据赛事支付记录

        if (objectType == 2){
            // 获取运营商下的所有门店id集合
            List<Integer> storeIds = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
@@ -214,23 +216,83 @@
            List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
            // 获取游戏记录 拿到用户ids
            List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
            // 查询世界杯记录 获取用户ids
            StoreIds storeIds1 = new StoreIds();
            storeIds1.setStoreIds(storeIds);
            List<Integer> userIds = worldCupClient.getUserIds(storeIds1);
            // 用户ids
            List<Integer> users = new ArrayList<>();
            users.addAll(list);
            users.addAll(siteUsers);
            users.addAll(cpUsers);
            users.addAll(gameUsers);
            users.addAll(userIds);
            // 去重后的用户id
            List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
            List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
            for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
                if (collect.contains(queryAppUserVO.getId())){
                    queryAppUserVOS1.add(queryAppUserVO);
                }
            if (collect.isEmpty()){
                collect.add(-1);
            }
            queryAppUserVOS = queryAppUserVOS1;
            queryAppUser.setUserIds(collect);
//            List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
//            // 根据用户消费记录 去查询用户ids
//            for (Integer integer : collect) {
//                if (!collect1.contains(integer)){
//                    TAppUser tAppUser = appUserClient.queryAppUser1(integer);
//                    QueryAppUserVO queryAppUserVO = new QueryAppUserVO();
//                    BeanUtils.copyProperties(tAppUser,queryAppUserVO);
//                    queryAppUserVOS.add(queryAppUserVO);
//                }
//            }
        }

        if (objectType == 3){
            // 获取运营商下的所有门店id集合
            List<Integer> storeIds = new ArrayList<>();
            storeIds.add(objectId);
            // 根据门店id集合查询 属于该运营商下的门店举办的赛事
            ListQuery listQuery = new ListQuery();
            listQuery.setIds(storeIds);
            // 通过门店ids 获取赛事的支付记录 获取到用户的ids
            List<Integer> list = competitionClient.getUserIds(listQuery);
            // 获取场地预约记录 拿到用户ids
            List<Integer> siteUsers = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", storeIds)
                            .ne("status",0)
                            .ne("status",5)
                    )
                    .stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
            // 获取课程购买记录 拿到用户ids
            List<Integer> cpUsers = coursePackageClient.getCoursePackageByStoreIds(storeIds);
            // 获取游戏记录 拿到用户ids
            List<Integer> gameUsers = ballClient.getGameByStoreIds(storeIds);
            StoreIds storeIds1 = new StoreIds();
            storeIds1.setStoreIds(storeIds);
            // 查询世界杯记录 获取用户ids
            List<Integer> userIds = worldCupClient.getUserIds(storeIds1);
            // 用户ids
            List<Integer> users = new ArrayList<>();
            users.addAll(list);
            users.addAll(siteUsers);
            users.addAll(cpUsers);
            users.addAll(gameUsers);
            users.addAll(userIds);
            // 去重后的用户id
            List<Integer> collect = users.stream().distinct().collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add(-1);
            }
            queryAppUser.setUserIds(collect);
//            List<QueryAppUserVO> queryAppUserVOS1 = new ArrayList<>();
//            // 根据用户消费记录 去查询用户ids
//            for (Integer integer : collect) {
//                if (!collect1.contains(integer)){
//                    TAppUser tAppUser = appUserClient.queryAppUser1(integer);
//                    QueryAppUserVO queryAppUserVO = new QueryAppUserVO();
//                    BeanUtils.copyProperties(tAppUser,queryAppUserVO);
//                    queryAppUserVOS.add(queryAppUserVO);
//                }
//            }
        }
        List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
        List<Integer> collect1 = queryAppUserVOS.stream().map(QueryAppUserVO::getId).collect(Collectors.toList());
        for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
            if (queryAppUserVO.getSalesmanUserId()!=null){
                User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
@@ -264,6 +326,10 @@
    public Object addAppUser(@RequestBody TAppUser appUser){
        Integer objectType = UserExt.getUser().getObjectType();
        appUser.setPassword(MD5.md5("111111"));
        appUser.setProvince("");
        appUser.setProvinceCode("");
        appUser.setCity("");
        appUser.setCityCode("");
        appUser.setInsertType(objectType);
        appUser.setAddUserId(UserExt.getUser().getObjectId());
        Object o = appUserClient.addAppUser1(appUser);
@@ -277,6 +343,10 @@
    @RequestMapping("/addAppUserStudent")
    @ResponseBody
    public Object addAppUser(@RequestBody TStudent student){
        Double height = student.getHeight();
        Double weight = student.getWeight();
        double v = weight / (height * height);
        student.setBmi(v);
        return studentClient.addStudent(student);
    }
    /**