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

Merge branch 'dev' into test

This commit is contained in:
GYJ 2025-02-25 13:56:13 +08:00
parent 8166b61565 0bb12a2df4
commit 9b14002c71
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/app/controller/app/AdController.java
View File

@ -28,7 +28,7 @@ public class AdController extends AbstractController {
@GetMapping("/state") @GetMapping("/state")
public Result getAdState(@RequestParam String extraKey, @RequestAttribute Long userId) { public Result getAdState(@RequestParam String extraKey, @RequestAttribute Long userId) {
HashMap<String, Integer> info = callbackRecordService.getStateByExtraKey(userId, extraKey); HashMap<String, Integer> info = callbackRecordService.getStateByExtraKey(userId, extraKey);
if (info.get("isEnded") == 0 && !redisService.isCanCash(userId)) { if (info.get("isEnded") == 0 && !redisService.isCanCash(userId) && extraKey.contains("cash")) {
redisService.setCanCashFlag(userId, -1L); redisService.setCanCashFlag(userId, -1L);
info.put("isEnded", 1); info.put("isEnded", 1);
} }

1
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
View File

@ -915,6 +915,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
} }
userInfo.setUpdateTime(DateUtil.date().toString()); userInfo.setUpdateTime(DateUtil.date().toString());
baseMapper.updateById(userInfo); baseMapper.updateById(userInfo);
userInfo.setQdCode(userInfo.getQdCode() == null ? "" : userInfo.getQdCode());
return getResult(userInfo); return getResult(userInfo);
} }

6
src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningServiceImpl.java
View File

@ -167,10 +167,6 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
} }
} }
if (result.getName().contains("手机")) {
throw new RuntimeException("抽奖数据异常，请稍后再试");
}
DiscSpinningRecord record = new DiscSpinningRecord(result.getName(), sourceId, userId, result.getUrl(), result.getType(), DiscSpinningRecord record = new DiscSpinningRecord(result.getName(), sourceId, userId, result.getUrl(), result.getType(),
result.getNumber(), DateUtils.formatYMD(new Date()), DateUtils.format(new Date()), source); result.getNumber(), DateUtils.formatYMD(new Date()), DateUtils.format(new Date()), source);
recordService.save(record); recordService.save(record);
@ -181,7 +177,7 @@ public class DiscSpinningServiceImpl extends ServiceImpl<DiscSpinningDao, DiscSp
@Override @Override
public void receive1(DiscSpinningRecord receive) { public void receive1(DiscSpinningRecord receive) {
if (recordService.countDraw(receive.getUserId()) > 10) { if (recordService.countDraw(receive.getUserId()) > Integer.parseInt(commonRepository.findOne(901).getValue())) {
return; return;
} }
DiscSpinningRecord record = recordService.getById(receive.getId()); DiscSpinningRecord record = recordService.getById(receive.getId());