Skip to content

S
safe-campus-bbs
Commit 3c1b3b18 authored by yuwenwen's avatar yuwenwen
Browse files
Options

Merge branch 'master' of http://gitlab.tangguo.ren/2300064869/safe-campus-bbs

parents 036cecd4 2dc614da
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 131 deletions
safe-campus-bbs-ui/src/views/pointsManage/index.vue
View file @ 3c1b3b18
......@@ -93,7 +93,7 @@ export default {
},
// 增加积分
handleAddPoints(row) {
this.$prompt('增加积分', '提示', {
this.$prompt('增加积分，当前用户可用积分：' + row.currentPoints, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[1-9]\d*$/,
......@@ -117,7 +117,7 @@ export default {
},
// 扣减积分
handleDecreasePoints(row) {
this.$prompt('扣减积分', '提示', {
this.$prompt('扣减积分，当前用户可用积分：' + row.currentPoints, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^[1-9]\d*$/,
......
safe-campus-points/src/main/java/com/tangguo/controller/BbsUserPointsController.java
View file @ 3c1b3b18
......@@ -9,6 +9,7 @@ import com.tangguo.common.enums.BusinessType;
import com.tangguo.common.utils.poi.ExcelUtil;
import com.tangguo.domain.BbsUserPoints;
import com.tangguo.domain.BbsUserPointsDetail;
import com.tangguo.domain.bo.BatchUserPointsBO;
import com.tangguo.service.IBbsUserPointsDetailService;
import com.tangguo.service.IBbsUserPointsService;
import io.swagger.annotations.Api;
......@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 用户积分Controller
......@@ -115,4 +117,32 @@ public class BbsUserPointsController extends BaseController {
return AjaxResult.success();
}
/**
* 增加用户积分
*/
@RepeatSubmit(interval = 1000)
@ApiOperation("新增用户积分")
@PreAuthorize("@ss.hasPermi('points:points:incr')")
@Log(title = "用户积分", businessType = BusinessType.UPDATE)
@PutMapping("/batch/incr")
public AjaxResult batchIncrUserPoints(@RequestBody BatchUserPointsBO bo) {
List<Map<String, String>> results = this.bbsUserPointsService.batchAddUserPoints(bo);
return AjaxResult.success(results);
}
/**
* 扣减用户积分
*/
@RepeatSubmit(interval = 1000)
@ApiOperation("扣减用户积分")
@PreAuthorize("@ss.hasPermi('points:points:decr')")
@Log(title = "用户积分", businessType = BusinessType.UPDATE)
@PutMapping("/batch/decr")
public AjaxResult batchDecrUserPoints(@RequestBody BatchUserPointsBO bo) {
List<Map<String, String>> results = this.bbsUserPointsService.batchDeleteUserPoints(bo);
return AjaxResult.success(results);
}
}
safe-campus-points/src/main/java/com/tangguo/controller/BbsUserPointsExchangeController.java
View file @ 3c1b3b18
......@@ -8,6 +8,7 @@ import com.tangguo.common.core.page.TableDataInfo;
import com.tangguo.common.enums.BusinessType;
import com.tangguo.common.utils.poi.ExcelUtil;
import com.tangguo.domain.BbsUserPointsExchange;
import com.tangguo.domain.bo.UserPointsExchangeBO;
import com.tangguo.service.IBbsUserPointsExchangeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 用户积分兑换Controller
......@@ -69,10 +71,22 @@ public class BbsUserPointsExchangeController extends BaseController {
@Log(title = "用户积分兑换", businessType = BusinessType.INSERT)
@PostMapping("/exchange")
public AjaxResult exchange(@RequestBody BbsUserPointsExchange exchange) {
synchronized (exchange.getUserName().intern()) {
this.bbsUserPointsExchangeService.addUserPointsExchange(exchange);
}
this.bbsUserPointsExchangeService.addUserPointsExchange(exchange);
return AjaxResult.success();
}
/**
* 用户积分兑换
*/
@RepeatSubmit(interval = 1000)
@ApiOperation("用户积分兑换")
@PreAuthorize("@ss.hasPermi('points:exchange:exchange')")
@Log(title = "用户积分兑换", businessType = BusinessType.INSERT)
@PostMapping("/batch/exchange")
public AjaxResult batchExchange(@RequestBody UserPointsExchangeBO bo) {
List<Map<String, String>> results = this.bbsUserPointsExchangeService.batchAddUserPointsExchange(bo);
return AjaxResult.success(results);
}
}
safe-campus-points/src/main/java/com/tangguo/domain/bo/BatchUserPointsBO.java 0 → 100644
View file @ 3c1b3b18
package com.tangguo.domain.bo;
import lombok.Data;
import java.util.List;
import java.util.Set;
/**
*
*
* @author 谈笑
* @createTime 2025-11-06 10:21:06 星期四
*/
@Data
public class BatchUserPointsBO {
/**
* 用户
*/
private List<User> users;
/**
* 积分
*/
private Integer points;
/**
* 备注
*/
private String remarks;
@Data
public static class User {
/**
* 用户姓名
*/
private String nickName;
/**
* 用户名
*/
private String userName;
}
}
safe-campus-points/src/main/java/com/tangguo/domain/bo/UserPointsExchangeBO.java 0 → 100644
View file @ 3c1b3b18
package com.tangguo.domain.bo;
import lombok.Data;
import java.util.List;
/**
*
*
* @author 谈笑
* @createTime 2025-11-06 14:29:35 星期四
*/
@Data
public class UserPointsExchangeBO {
/**
* 用户名
*/
private List<User> users;
/**
* 商品编码
*/
private String goodsCode;
@Data
public static class User {
/**
* 用户姓名
*/
private String nickName;
/**
* 用户名
*/
private String userName;
}
}
safe-campus-points/src/main/java/com/tangguo/mapper/BbsGradeMapper.java
View file @ 3c1b3b18
......@@ -2,6 +2,7 @@ package com.tangguo.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tangguo.domain.BbsGrade;
import org.apache.ibatis.annotations.Param;
/**
* 用户等级Mapper接口
......@@ -10,4 +11,7 @@ import com.tangguo.domain.BbsGrade;
* @date 2025-08-28
*/
public interface BbsGradeMapper extends BaseMapper<BbsGrade> {
BbsGrade selectGradeByPoints(@Param("points") int points);
}
safe-campus-points/src/main/java/com/tangguo/service/IBbsUserPointsExchangeService.java
View file @ 3c1b3b18
......@@ -2,8 +2,10 @@ package com.tangguo.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.tangguo.domain.BbsUserPointsExchange;
import com.tangguo.domain.bo.UserPointsExchangeBO;
import java.util.List;
import java.util.Map;
/**
* 用户积分兑换Service接口
......@@ -23,10 +25,18 @@ public interface IBbsUserPointsExchangeService extends IService<BbsUserPointsExc
/**
* 添加用户积分兑换记录
* 用户积分兑换
*
* @param exchange 兑换
*/
void addUserPointsExchange(BbsUserPointsExchange exchange);
/**
* 批量用户积分兑换
*
* @param bo 兑换
*/
List<Map<String, String>> batchAddUserPointsExchange(UserPointsExchangeBO bo);
}
safe-campus-points/src/main/java/com/tangguo/service/IBbsUserPointsService.java
View file @ 3c1b3b18
......@@ -3,8 +3,10 @@ package com.tangguo.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.tangguo.common.domain.PointsDetail;
import com.tangguo.domain.BbsUserPoints;
import com.tangguo.domain.bo.BatchUserPointsBO;
import java.util.List;
import java.util.Map;
/**
* 用户积分Service接口
......@@ -66,6 +68,22 @@ public interface IBbsUserPointsService extends IService<BbsUserPoints> {
void deleteUserPoints(BbsUserPoints points);
/**
* 增加用户积分
*
* @param bo 积分
*/
List<Map<String, String>> batchAddUserPoints(BatchUserPointsBO bo);
/**
* 扣减用户积分
*
* @param bo 积分
*/
List<Map<String, String>> batchDeleteUserPoints(BatchUserPointsBO bo);
/**
* 增加用户积分
*
......
safe-campus-points/src/main/java/com/tangguo/service/impl/BbsGradeServiceImpl.java
View file @ 3c1b3b18
......@@ -192,11 +192,7 @@ public class BbsGradeServiceImpl extends ServiceImpl<BbsGradeMapper, BbsGrade> i
*/
@Override
public BbsGrade getGradeByPoints(int points) {
return this.getOne(
Wrappers.lambdaQuery(BbsGrade.class)
.le(BbsGrade::getMinPoints, points)
.ge(BbsGrade::getMaxPoints, points)
);
return this.baseMapper.selectGradeByPoints(points);
}
}
safe-campus-points/src/main/java/com/tangguo/service/impl/BbsPointsSettingServiceImpl.java
View file @ 3c1b3b18
......@@ -254,7 +254,7 @@ public class BbsPointsSettingServiceImpl extends ServiceImpl<BbsPointsSettingMap
pointsDetail.setDetailPoints(points);
pointsDetail.setDetailName(operateName);
pointsDetail.setDetailCode(operateCode);
pointsDetail.setDescription(String.format("用户【%s】操作【%s】积分【%s】", userName, operateName, points));
pointsDetail.setDescription(String.format("用户【%s】操作【%s】%s【%s】", userName, operateName, settingType.getDesc(), points));
// 发送积分消息
this.jmsTemplate.convertAndSend(pointsQueue, pointsDetail);
......
safe-campus-points/src/main/java/com/tangguo/service/impl/BbsUserPointsExchangeServiceImpl.java
View file @ 3c1b3b18
......@@ -6,16 +6,18 @@ import com.tangguo.common.exception.ServiceException;
import com.tangguo.domain.BbsPointsGoods;
import com.tangguo.domain.BbsUserPoints;
import com.tangguo.domain.BbsUserPointsExchange;
import com.tangguo.domain.bo.UserPointsExchangeBO;
import com.tangguo.mapper.BbsUserPointsExchangeMapper;
import com.tangguo.service.IBbsPointsGoodsService;
import com.tangguo.service.IBbsUserPointsExchangeService;
import com.tangguo.service.IBbsUserPointsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.*;
/**
* 用户积分兑换Service业务层处理
......@@ -23,18 +25,19 @@ import java.util.Objects;
* @author ruoyi
* @date 2025-08-29
*/
@Slf4j
@Service
public class BbsUserPointsExchangeServiceImpl extends ServiceImpl<BbsUserPointsExchangeMapper, BbsUserPointsExchange> implements IBbsUserPointsExchangeService {
@Resource
private BbsUserPointsExchangeMapper bbsUserPointsExchangeMapper;
@Resource
private IBbsUserPointsService userPointsService;
@Resource
private IBbsPointsGoodsService pointsGoodsService;
@Resource
private TransactionTemplate transactionTemplate;
/**
* 查询用户积分兑换列表
......@@ -49,60 +52,105 @@ public class BbsUserPointsExchangeServiceImpl extends ServiceImpl<BbsUserPointsE
/**
* 添加用户积分兑换记录
* 用户积分兑换
*
* @param exchange 兑换
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void addUserPointsExchange(BbsUserPointsExchange exchange) {
// 积分商品校验
BbsPointsGoods dbGoods = this.pointsGoodsService.getByGoodsCode(exchange.getGoodsCode());
if (Objects.isNull(dbGoods)) {
throw new ServiceException("兑换失败，未查询到当前兑换的商品数据。");
}
if (dbGoods.getStockNum() < 1) {
throw new ServiceException("兑换失败，当前兑换的商品库存数量不足。");
}
// 用户积分校验
String userName = exchange.getUserName();
Integer exchangePoints = dbGoods.getExchangePoints();
BbsUserPoints dbUserPoints = this.userPointsService.getAndInitUserPoints(userName);
int currentPoints = dbUserPoints.getCurrentPoints() - dbGoods.getExchangePoints();
if (currentPoints < 0) {
throw new ServiceException("兑换失败，当前用户可用积分不足。");
}
// 扣减商品库存
Long goodsId = dbGoods.getId();
boolean decrResult = this.pointsGoodsService.decrGoodsStock(goodsId, 1);
if (!decrResult) {
throw new ServiceException("兑换失败，当前兑换的商品库存数量不足。");
}
// 增加商品销量
this.pointsGoodsService.incrGoodsSales(goodsId, 1);
// 扣减用户积分
PointsDetail detail = new PointsDetail();
detail.setUserName(userName);
detail.setDetailPoints(exchangePoints);
detail.setDetailName(dbGoods.getName());
detail.setDetailCode(dbGoods.getCode());
detail.setDescription(String.format("用户【%s】兑换积分商品【%s-%s】", userName, dbGoods.getName(), dbGoods.getCode()));
this.userPointsService.decrUserPoints(detail);
// 添加兑换记录
BbsUserPointsExchange addExchange = new BbsUserPointsExchange();
addExchange.setNickName(exchange.getNickName());
addExchange.setUserName(dbUserPoints.getUserName());
addExchange.setUserGradeName(dbUserPoints.getGradeName());
addExchange.setGoodsName(dbGoods.getName());
addExchange.setGoodsCode(dbGoods.getCode());
addExchange.setGoodsExchangePoints(dbGoods.getExchangePoints());
addExchange.setUserRemainingPoints(currentPoints);
this.save(addExchange);
this.pointsExchange(exchange.getUserName(), exchange.getNickName(), exchange.getGoodsCode());
}
/**
* 批量用户积分兑换
*
* @param bo 兑换
*/
@Override
public List<Map<String, String>> batchAddUserPointsExchange(UserPointsExchangeBO bo) {
List<Map<String, String>> results = new ArrayList<>(10);
for (UserPointsExchangeBO.User user : bo.getUsers()) {
String userName = user.getUserName();
String nickName = user.getNickName();
try {
this.pointsExchange(userName, nickName, bo.getGoodsCode());
} catch (Exception e) {
log.error("=> 批量用户积分兑换失败，用户：{} 商品：{} 失败原因：", userName, bo.getGoodsCode(), e);
Map<String, String> resultItem = new HashMap<>(2);
resultItem.put("nickName", nickName);
resultItem.put("userName", userName);
resultItem.put("errorMessage", e.getMessage());
results.add(resultItem);
}
}
return results;
}
/**
* 积分兑换
*
* @param userName 用户名
* @param goodsCode 商品编码
*/
public void pointsExchange(String userName, String nickName, String goodsCode) {
synchronized (userName.intern()) {
BbsPointsGoods dbGoods = this.pointsGoodsService.getByGoodsCode(goodsCode);
if (Objects.isNull(dbGoods)) {
throw new ServiceException("兑换失败，未查询到当前兑换的商品数据。");
}
if (dbGoods.getStockNum() < 1) {
throw new ServiceException("兑换失败，当前兑换的商品库存数量不足。");
}
this.transactionTemplate.executeWithoutResult(status -> {
try {
// 用户积分校验
Integer exchangePoints = dbGoods.getExchangePoints();
BbsUserPoints dbUserPoints = this.userPointsService.getAndInitUserPoints(userName);
int currentPoints = dbUserPoints.getCurrentPoints() - dbGoods.getExchangePoints();
if (currentPoints < 0) {
throw new ServiceException("兑换失败，当前用户可用积分不足。");
}
// 扣减商品库存
Long goodsId = dbGoods.getId();
boolean decrResult = this.pointsGoodsService.decrGoodsStock(goodsId, 1);
if (!decrResult) {
throw new ServiceException("兑换失败，当前兑换的商品库存数量不足。");
}
// 增加商品销量
this.pointsGoodsService.incrGoodsSales(goodsId, 1);
// 扣减用户积分
PointsDetail detail = new PointsDetail();
detail.setUserName(userName);
detail.setDetailPoints(exchangePoints);
detail.setDetailName(dbGoods.getName());
detail.setDetailCode(dbGoods.getCode());
detail.setDescription(String.format("用户【%s】兑换积分商品【%s-%s】", userName, dbGoods.getName(), dbGoods.getCode()));
this.userPointsService.decrUserPoints(detail);
// 添加兑换记录
BbsUserPointsExchange addExchange = new BbsUserPointsExchange();
addExchange.setNickName(nickName);
addExchange.setUserName(userName);
addExchange.setUserGradeName(dbUserPoints.getGradeName());
addExchange.setGoodsName(dbGoods.getName());
addExchange.setGoodsCode(dbGoods.getCode());
addExchange.setGoodsExchangePoints(dbGoods.getExchangePoints());
addExchange.setUserRemainingPoints(currentPoints);
this.save(addExchange);
} catch (Exception e) {
log.error("=> 用户积分兑换失败：", e);
status.setRollbackOnly();
throw new ServiceException(e.getMessage());
}
});
}
}
}
safe-campus-points/src/main/resources/mapper/BbsGradeMapper.xml
View file @ 3c1b3b18
......@@ -3,5 +3,18 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tangguo.mapper.BbsGradeMapper">
<select id="selectGradeByPoints" resultType="com.tangguo.domain.BbsGrade">
SELECT
*
FROM
bbs_grade g
WHERE
(g.min_points &lt;= #{points} AND g.max_points >= #{points}) OR (#{points} > g.max_points)
ORDER BY
g.max_points DESC
LIMIT
1
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment