zw/pkAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zw:8b8bfc4b6f8ed170596d28702ba54181ef2bff1b
Branches Tags
zw:main
..
compare: zw:79d541e4df846923d7f809ddab424ece13915dba
Branches Tags
zw:main

2 Commits
8b8bfc4b6f ... 79d541e4df

Author SHA1 Message Date
ziin
79d541e4df feat(pk): 支持平局双方加分逻辑 
- PkResultPointsDTO 新增 draw 字段标识平局
- 服务层识别平局后读取配置 PK平局增加积分 并给双方加相同积分
- 新增 grantDrawPoints 方法处理平局场景
- 补充单元测试验证平局加分及失败场景
 2026-03-27 09:40:58 +08:00
ziin
3fdd75a5df 按照PK记录为PK双方添加积分 2026-03-26 16:36:36 +08:00
10 changed files with 248 additions and 15 deletions
Expand all files Collapse all files

BIN
.idea/.cache/.Apifox_Helper/.toolWindow.db generated
View File

Binary file not shown.

5
.idea/ApifoxUploaderProjectSetting.xml generated
View File

File diff suppressed because one or more lines are too long

6
src/main/java/vvpkassistant/config/FunctionConfigHolder.java
View File

@@ -1,5 +1,6 @@
package vvpkassistant.config;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import vvpkassistant.FunctionConfig.mapper.FunctionConfigMapper;
@@ -11,9 +12,10 @@ import java.util.concurrent.CopyOnWriteArrayList;
@Component
@RequiredArgsConstructor
@Slf4j
public class FunctionConfigHolder {
// 线程安全的全局配置容器
public static final List<FunctionConfigModel> CONFIGS = new CopyOnWriteArrayList<>();
public static List<FunctionConfigModel> CONFIGS = new CopyOnWriteArrayList<>();
@Autowired
private FunctionConfigMapper configMapper;
@@ -26,7 +28,7 @@ public class FunctionConfigHolder {
List<FunctionConfigModel> dbConfigs = configMapper.selectList(null);
CONFIGS.clear();
CONFIGS.addAll(dbConfigs);
System.out.println("已加载 "+CONFIGS.size()+" 条功能配置");
log.info("已加载 {} 条功能配置", CONFIGS.size());
}
/**

3
src/main/java/vvpkassistant/config/SaTokenConfigure.java
View File

@@ -62,7 +62,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
"/systemMessage/list",
"/pk/pkListForPython",
"/pk/insertPkDetail",
"/pk/updatePkRecordInfo"
"/pk/updatePkRecordInfo",
"/pk/grantPkResultPoints"
};
}

19
src/main/java/vvpkassistant/controller/PkController.java
View File

@@ -1,11 +1,9 @@
package vvpkassistant.controller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import vvpkassistant.CoinRecords.CoinRecordsDao;
import vvpkassistant.Data.ResponseData;
import vvpkassistant.Data.ResponseInfo;
import vvpkassistant.Tools.VVTools;
import vvpkassistant.User.mapper.UserDao;
import vvpkassistant.pk.mapper.PkInfoDao;
import vvpkassistant.pk.mapper.PkRecordDao;
import vvpkassistant.pk.mapper.PkRecordDetailDao;
@@ -15,10 +13,12 @@ import vvpkassistant.pk.model.DTO.PkInfoDetailDTO;
import vvpkassistant.pk.model.DTO.PkListRequestDTO;
import vvpkassistant.pk.model.DTO.PkListUninvitedDTO;
import vvpkassistant.pk.model.DTO.PkQueryMyCanUseDTO;
import vvpkassistant.pk.model.DTO.PkResultPointsDTO;
import vvpkassistant.pk.model.PkInfoModel;
import vvpkassistant.pk.model.PkRecord;
import vvpkassistant.pk.model.PkRecordDetail;
import vvpkassistant.pk.service.PKService;
import vvpkassistant.pk.service.PkResultPointService;
import javax.annotation.Resource;
import java.util.List;
@@ -32,6 +32,9 @@ public class PkController {
@Resource
private PKService pkService;
@Resource
private PkResultPointService pkResultPointService;
@Autowired
private PkInfoDao pkDao;
@@ -41,12 +44,6 @@ public class PkController {
@Autowired
private PkRecordDetailDao detailDao;
@Autowired
private UserDao userDao;
@Autowired
private CoinRecordsDao coinRecordsDao;
// 创建pk数据
@PostMapping("addPkData")
public ResponseData<PkInfoModel> addPkData(@RequestBody PkInfoModel pkModel) {
@@ -155,6 +152,12 @@ public class PkController {
return i == 1 ? ResponseData.success("") : ResponseData.error(ResponseInfo.ERROR.getCode(),null);
}
// 根据PK结果为用户增加积分
@PostMapping("grantPkResultPoints")
public ResponseData<Object> grantPkResultPoints(@RequestBody PkResultPointsDTO request) {
return ResponseData.success(pkResultPointService.grantPkResultPoints(request));
}
// 插入pk明细表数据
@PostMapping("insertPkDetail")
public ResponseData<Object> insert(@RequestBody PkRecordDetail detail) {

10
src/main/java/vvpkassistant/pk/model/DTO/PkResultPointsDTO.java Normal file
View File

@@ -0,0 +1,10 @@
package vvpkassistant.pk.model.DTO;
import lombok.Data;
@Data
public class PkResultPointsDTO {
private Integer winnerUserId;
private Integer loserUserId;
private Boolean draw;
}

3
src/main/java/vvpkassistant/pk/service/PKServiceImpl.java
View File

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import vvpkassistant.CoinRecords.CoinRecords;
import vvpkassistant.CoinRecords.CoinRecordsDao;
import vvpkassistant.Data.ResponseData;
import vvpkassistant.Data.ResponseInfo;
import vvpkassistant.Tools.VVTools;
import vvpkassistant.User.mapper.UserDao;
import vvpkassistant.User.model.UserModel;
@@ -242,4 +240,5 @@ public class PKServiceImpl extends ServiceImpl<PkInfoDao, PkInfoModel> implement
return pkInfoModel;
}
}
}

7
src/main/java/vvpkassistant/pk/service/PkResultPointService.java Normal file
View File

@@ -0,0 +1,7 @@
package vvpkassistant.pk.service;
import vvpkassistant.pk.model.DTO.PkResultPointsDTO;
public interface PkResultPointService {
String grantPkResultPoints(PkResultPointsDTO request);
}

100
src/main/java/vvpkassistant/pk/service/PkResultPointServiceImpl.java Normal file
View File

@@ -0,0 +1,100 @@
package vvpkassistant.pk.service;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vvpkassistant.CoinRecords.CoinRecords;
import vvpkassistant.CoinRecords.CoinRecordsDao;
import vvpkassistant.Tools.EpochSecondProvider;
import vvpkassistant.User.mapper.UserDao;
import vvpkassistant.common.ErrorCode;
import vvpkassistant.config.FunctionConfigProvider;
import vvpkassistant.exception.BusinessException;
import vvpkassistant.pk.model.DTO.PkResultPointsDTO;
@Service
public class PkResultPointServiceImpl implements PkResultPointService {
private static final String PK_WIN_COIN_CONFIG_NAME = "PK胜利增加积分";
private static final String PK_LOSE_COIN_CONFIG_NAME = "PK失败增加积分";
private static final String PK_DRAW_COIN_CONFIG_NAME = "PK平局增加积分";
private static final int COIN_RECORD_ADD = 1;
private final UserDao userDao;
private final CoinRecordsDao coinRecordsDao;
private final FunctionConfigProvider functionConfigProvider;
private final EpochSecondProvider epochSecondProvider;
public PkResultPointServiceImpl(
UserDao userDao,
CoinRecordsDao coinRecordsDao,
FunctionConfigProvider functionConfigProvider,
EpochSecondProvider epochSecondProvider
) {
this.userDao = userDao;
this.coinRecordsDao = coinRecordsDao;
this.functionConfigProvider = functionConfigProvider;
this.epochSecondProvider = epochSecondProvider;
}
@Override
@Transactional(rollbackFor = Exception.class)
public String grantPkResultPoints(PkResultPointsDTO request) {
validateRequest(request);
int now = (int) epochSecondProvider.nowEpochSecond();
if (isDraw(request)) {
return grantDrawPoints(request, now);
}
int winPoints = parsePositivePoints(PK_WIN_COIN_CONFIG_NAME);
int losePoints = parsePositivePoints(PK_LOSE_COIN_CONFIG_NAME);
grantPoints(request.getWinnerUserId(), winPoints, PK_WIN_COIN_CONFIG_NAME, now);
grantPoints(request.getLoserUserId(), losePoints, PK_LOSE_COIN_CONFIG_NAME, now);
return String.format("操作成功，胜利方增加%d积分，失败方增加%d积分", winPoints, losePoints);
}
private String grantDrawPoints(PkResultPointsDTO request, int now) {
int drawPoints = parsePositivePoints(PK_DRAW_COIN_CONFIG_NAME);
grantPoints(request.getWinnerUserId(), drawPoints, PK_DRAW_COIN_CONFIG_NAME, now);
grantPoints(request.getLoserUserId(), drawPoints, PK_DRAW_COIN_CONFIG_NAME, now);
return String.format("操作成功，平局双方各增加%d积分", drawPoints);
}
private static void validateRequest(PkResultPointsDTO request) {
if (request == null || request.getWinnerUserId() == null || request.getLoserUserId() == null) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "参数不能为空");
}
if (request.getWinnerUserId().equals(request.getLoserUserId())) {
throw new BusinessException(ErrorCode.PARAMS_ERROR, "胜利者和失败者不能是同一用户");
}
}
private static boolean isDraw(PkResultPointsDTO request) {
return Boolean.TRUE.equals(request.getDraw());
}
private int parsePositivePoints(String configName) {
String value = functionConfigProvider.getValue(configName);
if (value == null) {
throw new BusinessException(ErrorCode.SYSTEM_ERROR, "未配置" + configName);
}
try {
int points = Integer.parseInt(value);
if (points < 0) {
throw new BusinessException(ErrorCode.SYSTEM_ERROR, configName + "配置错误");
}
return points;
} catch (NumberFormatException e) {
throw new BusinessException(ErrorCode.SYSTEM_ERROR, configName + "配置错误");
}
}
private void grantPoints(int userId, int points, String configName, int now) {
if (userDao.increasePoints(userId, points) != 1) {
throw new BusinessException(ErrorCode.SYSTEM_ERROR, "用户不存在");
}
CoinRecords coinRecords = new CoinRecords(configName, userId, points, now, COIN_RECORD_ADD);
if (coinRecordsDao.insert(coinRecords) != 1) {
throw new BusinessException(ErrorCode.SYSTEM_ERROR, "积分记录写入失败");
}
}
}

110
src/test/java/vvpkassistant/pk/service/PkResultPointServiceImplTests.java Normal file
View File

@@ -0,0 +1,110 @@
package vvpkassistant.pk.service;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import vvpkassistant.CoinRecords.CoinRecords;
import vvpkassistant.CoinRecords.CoinRecordsDao;
import vvpkassistant.Tools.EpochSecondProvider;
import vvpkassistant.User.mapper.UserDao;
import vvpkassistant.common.ErrorCode;
import vvpkassistant.config.FunctionConfigProvider;
import vvpkassistant.exception.BusinessException;
import vvpkassistant.pk.model.DTO.PkResultPointsDTO;
import static org.mockito.Mockito.*;
class PkResultPointServiceImplTests {
@Test
void shouldGrantWinAndLosePointsTogether() {
UserDao userDao = mock(UserDao.class);
CoinRecordsDao coinRecordsDao = mock(CoinRecordsDao.class);
FunctionConfigProvider functionConfigProvider = mock(FunctionConfigProvider.class);
EpochSecondProvider epochSecondProvider = () -> 1_234L;
when(functionConfigProvider.getValue("PK胜利增加积分")).thenReturn("8");
when(functionConfigProvider.getValue("PK失败增加积分")).thenReturn("3");
when(userDao.increasePoints(1001, 8)).thenReturn(1);
when(userDao.increasePoints(1002, 3)).thenReturn(1);
when(coinRecordsDao.insert(any())).thenReturn(1);
PkResultPointServiceImpl service = new PkResultPointServiceImpl(
userDao, coinRecordsDao, functionConfigProvider, epochSecondProvider
);
PkResultPointsDTO request = new PkResultPointsDTO();
request.setWinnerUserId(1001);
request.setLoserUserId(1002);
String result = service.grantPkResultPoints(request);
Assertions.assertEquals("操作成功，胜利方增加8积分，失败方增加3积分", result);
ArgumentCaptor<CoinRecords> captor = ArgumentCaptor.forClass(CoinRecords.class);
verify(coinRecordsDao, times(2)).insert(captor.capture());
Assertions.assertEquals("PK胜利增加积分", captor.getAllValues().get(0).getInfo());
Assertions.assertEquals(Integer.valueOf(1001), captor.getAllValues().get(0).getUserId());
Assertions.assertEquals(Integer.valueOf(8), captor.getAllValues().get(0).getNumber());
Assertions.assertEquals("PK失败增加积分", captor.getAllValues().get(1).getInfo());
Assertions.assertEquals(Integer.valueOf(1002), captor.getAllValues().get(1).getUserId());
Assertions.assertEquals(Integer.valueOf(3), captor.getAllValues().get(1).getNumber());
Assertions.assertEquals(Integer.valueOf(1234), captor.getAllValues().get(0).getTime());
Assertions.assertEquals(Integer.valueOf(1234), captor.getAllValues().get(1).getTime());
}
@Test
void shouldGrantDrawPointsToBothUsers() {
UserDao userDao = mock(UserDao.class);
CoinRecordsDao coinRecordsDao = mock(CoinRecordsDao.class);
FunctionConfigProvider functionConfigProvider = mock(FunctionConfigProvider.class);
EpochSecondProvider epochSecondProvider = () -> 1_234L;
when(functionConfigProvider.getValue("PK平局增加积分")).thenReturn("5");
when(userDao.increasePoints(1001, 5)).thenReturn(1);
when(userDao.increasePoints(1002, 5)).thenReturn(1);
when(coinRecordsDao.insert(any())).thenReturn(1);
PkResultPointServiceImpl service = new PkResultPointServiceImpl(
userDao, coinRecordsDao, functionConfigProvider, epochSecondProvider
);
PkResultPointsDTO request = new PkResultPointsDTO();
request.setWinnerUserId(1001);
request.setLoserUserId(1002);
request.setDraw(true);
String result = service.grantPkResultPoints(request);
Assertions.assertEquals("操作成功，平局双方各增加5积分", result);
ArgumentCaptor<CoinRecords> captor = ArgumentCaptor.forClass(CoinRecords.class);
verify(coinRecordsDao, times(2)).insert(captor.capture());
Assertions.assertEquals("PK平局增加积分", captor.getAllValues().get(0).getInfo());
Assertions.assertEquals(Integer.valueOf(1001), captor.getAllValues().get(0).getUserId());
Assertions.assertEquals(Integer.valueOf(5), captor.getAllValues().get(0).getNumber());
Assertions.assertEquals("PK平局增加积分", captor.getAllValues().get(1).getInfo());
Assertions.assertEquals(Integer.valueOf(1002), captor.getAllValues().get(1).getUserId());
Assertions.assertEquals(Integer.valueOf(5), captor.getAllValues().get(1).getNumber());
Assertions.assertEquals(Integer.valueOf(1234), captor.getAllValues().get(0).getTime());
Assertions.assertEquals(Integer.valueOf(1234), captor.getAllValues().get(1).getTime());
}
@Test
void shouldFailWhenWinnerAndLoserAreSameUser() {
UserDao userDao = mock(UserDao.class);
CoinRecordsDao coinRecordsDao = mock(CoinRecordsDao.class);
FunctionConfigProvider functionConfigProvider = mock(FunctionConfigProvider.class);
EpochSecondProvider epochSecondProvider = () -> 1_234L;
PkResultPointServiceImpl service = new PkResultPointServiceImpl(
userDao, coinRecordsDao, functionConfigProvider, epochSecondProvider
);
PkResultPointsDTO request = new PkResultPointsDTO();
request.setWinnerUserId(1001);
request.setLoserUserId(1001);
BusinessException ex = Assertions.assertThrows(BusinessException.class,
() -> service.grantPkResultPoints(request));
Assertions.assertEquals(ErrorCode.PARAMS_ERROR.getCode(), ex.getCode());
verifyNoInteractions(functionConfigProvider, coinRecordsDao);
verify(userDao, never()).increasePoints(anyInt(), anyInt());
}
}