czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev 

# Conflicts:
#	src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
This commit is contained in:
wangw 2024-12-07 15:48:26 +08:00
parent 2c8cc45ce0 ed2774907e
commit 53f6a8c24e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
View File

@ -161,7 +161,7 @@ public class DiscSpinningController {
public Result draw(@ApiIgnore @RequestAttribute("userId") Long userId, @Nullable @ApiIgnore @RequestBody Map maps) {
double amount = 0;
Long orderId = null;
if (maps != null && !maps.containsKey("source") && !"task".equals(maps.get("source"))) {
if (maps == null || !maps.containsKey("source") || !"task".equals(maps.get("source"))) {
//任务抽奖
int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue());
Integer i = recordService.countDraw(userId);