岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luofl
2025-02-11 a74d740849c6b25b57e18c67ed14b0f5fea79a12 
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java


@@ -1,6 +1,7 @@


package com.ruoyi.account.controller;






import com.alibaba.fastjson2.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.metadata.IPage;


@@ -36,6 +37,7 @@


import com.ruoyi.system.api.feignClient.SysUserClient;


import com.ruoyi.system.api.model.LoginUser;


import io.swagger.annotations.*;


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.util.CollectionUtils;


import org.springframework.web.bind.annotation.*;


@@ -63,6 +65,7 @@


@Api(tags = {"登录注册-小程序"})


@RestController


@RequestMapping("/app-user")


@Slf4j


public class AppUserController extends BaseController {


    


    @Resource


@@ -230,7 +233,7 @@


        if(StringUtils.isEmpty(user.getQrCode())){


            //获取微信推广二维码


            String fileName = UUID.randomUUID() + ".jpg";


            String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/login/login", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);


            String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);


            user.setQrCode(getwxacodeunlimit);


            appUserService.updateById(user);


        }


@@ -398,6 +401,12 @@


    public R<AppUser> change(@ApiParam("换绑用户手机号") String phone) {


        Long userId1 = tokenService.getLoginUserApplet().getUserid();


        AppUser byId = appUserService.getById(userId1);


        List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()


                .eq(AppUser::getInviteUserId, userId1)


                .eq(AppUser::getPhone, phone));


        if (!CollectionUtils.isEmpty(appUserList)){


            return R.fail("绑定关系已存在！");


        }


        //获取绑定门店


        AppUser user = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();


        if (user == null) {


@@ -415,6 +424,14 @@


        Long userId = tokenService.getLoginUserApplet().getUserid();


        //当前用户信息


        AppUser user = appUserService.getById(userId);


        if(StringUtils.isEmpty(user.getQrCode())){


            //获取微信推广二维码


            String fileName = UUID.randomUUID() + ".jpg";


            String getwxacodeunlimit = weChatUtil.getwxacodeunlimit("pages/start/start", "id=" + user.getId(), EnvVersion.RELEASE, filePath + fileName);


            user.setQrCode(getwxacodeunlimit);


            appUserService.updateById(user);


        }


        


        //当前用户的推荐人信息


        if (user.getInviteUserId() != null) {


            AppUser inviteUser = appUserService.getById(user.getInviteUserId());


@@ -458,6 +475,8 @@


        }


        return R.ok(user);


    }


    


    


    public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {


        children = list.stream().filter(u -> userIds.contains(u.getInviteUserId()) || userIds.contains(u.getTopInviteId())).collect(Collectors.toList());


        if(!CollectionUtils.isEmpty(children)){


@@ -527,6 +546,16 @@


                .like(AppUser::getName, name));


        return R.ok(list);


    }


    /**


     * 根据用户名称模糊搜索用户列表,不过滤状态


     */


    @GetMapping("/getAppUserByNameNoFilter")


    public R<List<AppUser>> getAppUserByNameNoFilter(@RequestParam("name") String name) {


        List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>()


                .like(AppUser::getName, name));


        return R.ok(list);


    }






    /**


     * 根据用户电话模糊搜索用户列表


@@ -538,6 +567,15 @@


    public R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone) {


        List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1)


                .like(AppUser::getPhone, phone));


        return R.ok(list);


    }




    /**


     * 更具用户电话模糊查询用户列表，不过滤状态


     */


    @GetMapping("/getAppUserByPhoneNoFilter")


    public R<List<AppUser>> getAppUserByPhoneNoFilter(@RequestParam("phone") String phone) {


        List<AppUser> list = appUserService.getAppUserByPhoneNoFilter(phone);


        return R.ok(list);


    }




@@ -674,7 +712,9 @@


        AppUser byId = appUserService.getById(id);


        byId.setStatus(status);


        appUserService.updateById(byId);


        loginout(id);


        if (status == 2){


            loginout(id);


        }


        return R.ok();


    }




@@ -683,6 +723,9 @@


        if (!CollectionUtils.isEmpty(keys)) {


            for (String key : keys) {


                LoginUser user = redisService.getCacheObject(key);


                if (user == null || user.getUserid() == null) {


                    continue;


                }


                if (user.getUserid().equals(userId)) {


                    redisService.deleteObject(key);


                    break;


@@ -713,6 +756,14 @@


        if (userId.equals(inviteId)) {


            return R.fail("不能选择自己为绑定人。");


        }




        List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()


                .eq(AppUser::getInviteUserId, id)


                .eq(AppUser::getId, inviteId));


        if (!CollectionUtils.isEmpty(appUserList)){


            return R.fail("绑定关系已存在！");


        }




        byId.setInviteUserId(inviteId);


        byId.setTopInviteId(getTop(inviteId));


        appUserService.updateById(byId);


@@ -744,7 +795,7 @@




    @GetMapping("/detail")


    @ApiOperation(value = "用户列表-详情", tags = {"管理后台"})


    public R<AppUser> detail(Long id, Integer shopId, Integer pageNum, Integer pageSize) {


    public R<AppUser> detail(Long id, Integer shopId) {


        Long userid = tokenService.getLoginUser().getUserid();


        SysUser sysUser = sysUserClient.getSysUser(userid).getData();


        AppUser byId = appUserService.getById(id);


@@ -774,8 +825,8 @@


        if (lastOrder.getData() != null) {


            byId.setLastOrderTime(lastOrder.getData().getCreateTime());


        }


        Page<AppUser> page = appUserService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<AppUser>().eq(AppUser::getInviteUserId, id));


        byId.setBottomUsersPage(page);


        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();


        byId.setBottomUsers(list);


        //消费总金额


        if(null == shopId || 1 == sysUser.getRoleType()){


            shopId = -1;


@@ -793,6 +844,20 @@


        }


        return R.ok(byId);


    }




    /**


     * 获取指定用户的下级用户


     */


    @GetMapping("/bottom/list")


    @ApiOperation(value = "用户列表-下级用户", tags = {"管理后台"})


    public R<Page<AppUser>> bottom(Integer pageNum, Integer pageSize, Long userId){


        Page<AppUser> page = appUserService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<AppUser>()


                .eq(AppUser::getInviteUserId, userId));


        return R.ok(page);


    }










    




@@ -815,21 +880,24 @@


        byId.setVipId(vipId);


        appUserService.updateById(byId);


        return R.ok();




    }




    @GetMapping("/bottom")


    @ApiOperation(value = "用户列表-绑定下级列表", tags = {"管理后台"})


    public R<Page<AppUser>> bottom(Long id, Integer pageNum, Integer pageSize) {


        //绑定下级


        Page<AppUser> page = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).page(Page.of(pageNum, pageSize));


        Page<AppUser> page = appUserService.lambdaQuery()


                .eq(AppUser::getInviteUserId, id)


                .eq(AppUser::getDelFlag, 0)


                .eq(AppUser::getStatus, 1)


                .page(Page.of(pageNum, pageSize));


        return R.ok(page);




    }




    @GetMapping("/orders")


    @ApiOperation(value = "用户列表-订单列表", tags = {"管理后台"})


    public R<List<Order>> orders(Long id) {


    public R<JSONObject> orders(Long id,Integer pageNum, Integer pageSize) {


        Long userid = tokenService.getLoginUser().getUserid();


        SysUser sysUser = sysUserClient.getSysUser(userid).getData();


        Integer shopId = -1;


@@ -837,8 +905,27 @@


            shopId = sysUser.getObjectId();


        }


        R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);


        return R.ok(listR.getData());




        List<Order> data = listR.getData();


        Integer total = data.size();


        // 手动分页


        if (data != null && data.size() > 0) {


            if (pageNum == null || pageNum == 0) {


                pageNum = 1;


            }


            if (pageSize == null || pageSize == 0) {


                pageSize = 10;


            }


            data = data.stream()


                    .skip((pageNum - 1) * pageSize)


                    .limit(pageSize)


                    .collect(Collectors.toList());


        }


        JSONObject jsonObject = new JSONObject();


        jsonObject.put("records", data);


        jsonObject.put("total", total);


        jsonObject.put("size", pageSize);


        jsonObject.put("current", pageNum);


        return R.ok(jsonObject);


    }






@@ -930,13 +1017,29 @@


        if (cd.getStartTime().isAfter(cd.getEndTime())) {


            return R.fail("开始时间不能大于结束时间");


        }


        Long userid = tokenService.getLoginUser().getUserid();


        SysUser sysUser = sysUserClient.getSysUser(userid).getData();


        Map<String, Map<Integer, BigDecimal>> dailyVipCommissions = new TreeMap<>();


        getDatesBetween(cd.getStartTime(), cd.getEndTime()).forEach(date -> {


            for (int i = 1; i < 8; i++){


                List<BalanceChangeRecord> list = balanceChangeRecordService.list(new LambdaQueryWrapper<BalanceChangeRecord>()


                LambdaQueryWrapper<BalanceChangeRecord> queryWrapper = new LambdaQueryWrapper<BalanceChangeRecord>()


                        .between(BalanceChangeRecord::getCreateTime, date, date.plusDays(1))


                        .eq(BalanceChangeRecord::getChangeType,4)


                        .eq(BalanceChangeRecord::getVipId, i));


                        .eq(BalanceChangeRecord::getChangeType, 4)


                        .eq(BalanceChangeRecord::getVipId, i);


                if(sysUser.getRoleType() == 2){


                    Integer objectId = sysUser.getObjectId();


                    List<AppUser> list = appUserService.list(new LambdaQueryWrapper<AppUser>().eq(AppUser::getShopId, objectId).eq(AppUser::getDelFlag, 0).eq(AppUser::getStatus, 1));


                    List<Long> appUserIds = list.stream().map(AppUser::getId).collect(Collectors.toList());


                    Set<Long> data = orderClient.getAppUserByShoppingShop(objectId).getData();


                    if(null != data){


                        appUserIds.addAll(data);


                    }


                    if(appUserIds.size() == 0){


                        appUserIds.add(-1L);


                    }


                    queryWrapper.in(BalanceChangeRecord::getAppUserId, appUserIds);


                }


                List<BalanceChangeRecord> list = balanceChangeRecordService.list(queryWrapper);


                BigDecimal reduce = list.stream().map(BalanceChangeRecord::getChangeAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


                String dateKey = date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


                dailyVipCommissions.computeIfAbsent(dateKey, k -> new HashMap<>())


@@ -944,7 +1047,11 @@


            }




            for (int i = 1; i < 4; i++){


                R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, date);


                Integer objectId = 0;


                if(sysUser.getRoleType() == 2){


                    objectId = sysUser.getObjectId();


                }


                R<List<ShopBalanceStatement>> r = shopBalanceStatementClient.getShopBalanceStatementList2(i, objectId, date);


                if (!CollectionUtils.isEmpty(r.getData())){


                    List<ShopBalanceStatement> list = r.getData();


                    BigDecimal reduce = list.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


@@ -962,9 +1069,12 @@


                }


            }


        });


        Integer objectId = 0;


        if(sysUser.getRoleType() == 2){


            objectId = sysUser.getObjectId();


        }






        R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics();


        R<Map<String, BigDecimal>> shopStatistics = shopClient.getShopStatistics(objectId);


        Map<String, BigDecimal> data = shopStatistics.getData();


        BigDecimal totalServiceFee = BigDecimal.ZERO;


        BigDecimal totalUserCommission = BigDecimal.ZERO;


@@ -1016,7 +1126,6 @@


            totalPartnerCommission = totalPartnerCommission.add(dailyCommissions.getOrDefault(7, BigDecimal.ZERO));




            // 用户分销总金额




            BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())


                    .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());


            commissionDate.setTotalCommission(add);