Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-13 3eac3116ce54c2593f09a74feed370cf0800028e

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

@@ -104,6 +104,8 @@
    private OrderClient orderClient;
    @Resource
    private ShopBalanceStatementClient shopBalanceStatementClient;
    @Resource
    private UserCancellationLogService userCancellationLogService;


    @ResponseBody
@@ -213,8 +215,7 @@
        return R.ok(user);
    }

    @Resource
    private UserCancellationLogService userCancellationLogService;


    @ResponseBody
    @GetMapping("/unregis")
@@ -310,7 +311,8 @@
        if (user.getShopId() != null) {
            R<Shop> storeById = shopClient.getShopById(user.getShopId());
            if (storeById.getData() != null) {
                user.setShopName(storeById.getData().getName());
                Shop shop = storeById.getData();
                user.setShopName(shop.getName());
            }
        }
        Long count1 = appUserService.lambdaQuery().eq(AppUser::getVipId, 1).eq(AppUser::getInviteUserId, userId).or().eq(AppUser::getTopInviteId,userId).count();
@@ -766,8 +768,6 @@
                        .merge(vipId, distributionAmount, BigDecimal::add);
            }
        }

        // 门店分佣计算
        List<Shop> data = shopClient.getAllShop().getData();
        if(sysUser.getRoleType() == 2){
            data = Arrays.asList(shopClient.getShopById(sysUser.getObjectId()).getData());
@@ -832,13 +832,10 @@
                })
                .collect(Collectors.toList());




        commissionDetail.setCommissionDateList(commissionDateList);
        return R.ok(commissionDetail);
    }

    
    
    /**
     * 上传图片