商家端

huliguo

2025-04-11 f103ac7bc4f2fbb20a0f2dd3ed97b0ac7fc5f46d

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java

@@ -50,18 +50,14 @@
    @Override
    public UserPointVO getUserPoint(Long userId) {
        AppUser appUser = appUserService.getById(userId);
        int totalPoint = 0;
        int sharePoint = 0;
        int shopAchievementPoint = 0;
        int shopSharePoint = 0;
        UserPointVO userPointVO = new UserPointVO();
        userPointVO.setTotalPoint(appUser.getTotalPoint() + totalPoint);
        userPointVO.setTotalPoint(appUser.getUserTotalPoint() );
        userPointVO.setConsumePoint(appUser.getAvailablePoint());
        userPointVO.setShopPoint(appUser.getShopPoint());
        userPointVO.setSharePoint(appUser.getSharePoint() + sharePoint);
        userPointVO.setPullNewPoint(appUser.getTotalInvitePoint());
        userPointVO.setShopAchievementPoint(appUser.getShopAchievementPoint() + shopAchievementPoint);
        userPointVO.setShopSharePoint(appUser.getShopSharePoint() + shopSharePoint);
        userPointVO.setRechargePoint(appUser.getRechargePoint());
        userPointVO.setCancelPoint(appUser.getCancelPoint());
        userPointVO.setExpendPoint(appUser.getExchangePoint());
        userPointVO.setTransferableInPoint(appUser.getTransferableInPoint());
        userPointVO.setTransferableOutPoint(appUser.getTransferableOutPoint());
        return userPointVO;
    }

@@ -74,12 +70,16 @@
        for (UserPointDetailVO userPointDetailVO : userPointDetail) {
            Integer type1 = userPointDetailVO.getType();
            if (type1 != null && type1.equals(12)){
                AppUser appUser = appUserService.getById(userPointDetailVO.getReceiveUserId());
                //他人赠送
                AppUser appUser = appUserService.getById(userPointDetailVO.getObjectId());
                userPointDetailVO.setName(appUser.getName());
                userPointDetailVO.setTransferUserId(appUser.getId());
            }
            if (type1 != null && type1.equals(13)){
                AppUser appUser = appUserService.getById(userPointDetailVO.getTransferUserId());
                //赠予他人
                AppUser appUser = appUserService.getById(userPointDetailVO.getObjectId());
                userPointDetailVO.setName(appUser.getName());
                userPointDetailVO.setReceiveUserId(appUser.getId());
            }
            Integer historicalPoint = userPointDetailVO.getHistoricalPoint();
            Integer balance = userPointDetailVO.getBalance();
@@ -107,10 +107,8 @@
        if (appUser == null) {
            return R.fail("用户未找到");
        }
        // 可转赠积分总数
        Integer transferablePoint = appUser.getTransferablePoint();
        if (point > transferablePoint) {
            return R.fail("可转赠积分不足");
        if (appUser.getAvailablePoint() < point) {
            return R.fail("用户可用积分不足");
        }

        AppUser appUserForPhoe = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
@@ -124,38 +122,44 @@
        if(appUserForPhoe.getId().equals(userid)){
            return R.fail("不能转增给自己");
        }
        Integer lavePoint1 = appUserForPhoe.getLavePoint();
        appUserForPhoe.setLavePoint(appUserForPhoe.getLavePoint() + point);
        appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);
        appUserForPhoe.setTransferablePoint(transferablePoint + point);
        appUserForPhoe.setAvailablePoint(appUserForPhoe.getAvailablePoint() + point);
        appUserForPhoe.setTotalAvailablePoint(appUserForPhoe.getTotalAvailablePoint() + point);

        Integer historicalPoint = appUserForPhoe.getAvailablePoint();//历史积分
        Integer balance = historicalPoint +point;//变动后积分

        appUserForPhoe.setAvailablePoint(balance);//可用积分增加
        appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);//总积分增加
        appUserForPhoe.setTransferableInPoint(appUserForPhoe.getTransferableInPoint() + point);//转入积分增加

        appUserService.updateById(appUserForPhoe);
        //构建积分流水记录
        if(point > 0){
            //转入用户
            UserPoint userPoint = new UserPoint();
            userPoint.setType(12);
            userPoint.setHistoricalPoint(lavePoint1);
            userPoint.setHistoricalPoint(historicalPoint);
            userPoint.setVariablePoint(point);
            userPoint.setBalance(appUserForPhoe.getLavePoint());
            userPoint.setBalance(balance);
            userPoint.setCreateTime(LocalDateTime.now());
            userPoint.setAppUserId(appUserForPhoe.getId());
            userPoint.setObjectId(userid);
            userPointService.save(userPoint);
        }

        Integer lavePoint = appUser.getLavePoint();
        appUser.setLavePoint(appUser.getLavePoint() - point);
        appUser.setTransferablePoint(appUser.getTransferablePoint() - point);
        appUser.setAvailablePoint(appUser.getAvailablePoint() - point);
        Integer historicalPoint2 = appUser.getAvailablePoint();//历史积分
        Integer balance2 = historicalPoint2 - point;//变动后积分

        appUser.setAvailablePoint(balance2);//可用积分减少
        appUser.setTotalPoint(appUser.getTotalPoint() + point);//总积分增加
        appUser.setTransferableOutPoint(appUser.getTransferableOutPoint() + point);//转出积分增加

        appUserService.updateById(appUser);
        //构建积分流水记录
        if(point > 0){
            UserPoint userPoint = new UserPoint();
            userPoint.setType(13);
            userPoint.setHistoricalPoint(lavePoint);
            userPoint.setHistoricalPoint(historicalPoint2);
            userPoint.setVariablePoint(point);
            userPoint.setBalance(appUser.getLavePoint());
            userPoint.setBalance(balance2);
            userPoint.setCreateTime(LocalDateTime.now());
            userPoint.setAppUserId(appUser.getId());
            userPoint.setObjectId(appUserForPhoe.getId());