更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

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

@@ -25,6 +25,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 +158,7 @@

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

            model.addAttribute("level","黄金");
        }
        model.addAttribute("level","黄金");
@@ -194,9 +195,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))
@@ -222,15 +220,20 @@
            users.addAll(gameUsers);
            // 去重后的用户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);
                }
            }
            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);
//                }
//            }
        }

        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 +267,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 +284,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);
    }
    /**