From f103ac7bc4f2fbb20a0f2dd3ed97b0ac7fc5f46d Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 11 四月 2025 17:40:24 +0800 Subject: [PATCH] 商家端 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java index 2142a97..13e1f37 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserPointServiceImpl.java @@ -70,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(); @@ -123,7 +127,7 @@ Integer balance = historicalPoint +point;//变动后积分 appUserForPhoe.setAvailablePoint(balance);//可用积分增加 - appUserForPhoe.setTotalPoint(appUserForPhoe.getUserTotalPoint() + point);//总积分增加 + appUserForPhoe.setTotalPoint(appUserForPhoe.getTotalPoint() + point);//总积分增加 appUserForPhoe.setTransferableInPoint(appUserForPhoe.getTransferableInPoint() + point);//转入积分增加 appUserService.updateById(appUserForPhoe); @@ -141,11 +145,12 @@ userPointService.save(userPoint); } - Integer historicalPoint2 = appUserForPhoe.getAvailablePoint();//历史积分 - Integer balance2 = historicalPoint - point;//变动后积分 + Integer historicalPoint2 = appUser.getAvailablePoint();//历史积分 + Integer balance2 = historicalPoint2 - point;//变动后积分 - appUser.setAvailablePoint(balance);//可用积分减少 - appUser.setTransferableOutPoint(appUserForPhoe.getTransferableOutPoint() + point);//转出积分增加 + appUser.setAvailablePoint(balance2);//可用积分减少 + appUser.setTotalPoint(appUser.getTotalPoint() + point);//总积分增加 + appUser.setTransferableOutPoint(appUser.getTransferableOutPoint() + point);//转出积分增加 appUserService.updateById(appUser); //构建积分流水记录 -- Gitblit v1.7.1