修改bug

Pu Zhibing

2025-01-20 05a6a23dbbd47031a41830e168c8318567ee0b5f

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -684,10 +684,13 @@
        List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
        byId.setBottomUsers(list);
        //消费总金额
        if(null == shopId){
        if(null == shopId || 1 == sysUser.getRoleType()){
            shopId = -1;
        }
        R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id, shopId);
        if(null == shopId && 2 == sysUser.getRoleType()){
            shopId = sysUser.getObjectId();
        }
        R<List<Order>> orderR = remoteOrderGoodsClient.byUserId(id, shopId);
        List<Order> orderList = orderR.getData();
        if (!CollectionUtils.isEmpty(orderList)){
            BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -737,7 +740,10 @@
    public R<List<Order>> orders(Long id) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        Integer shopId = sysUser.getObjectId();
        Integer shopId = -1;
        if(sysUser.getRoleType() == 2){
            shopId = sysUser.getObjectId();
        }
        R<List<Order>> listR = remoteOrderGoodsClient.byUserId(id,shopId);
        return R.ok(listR.getData());