BUGFIX: 批量生成积分扣除有误
This commit is contained in:
@@ -2345,9 +2345,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
Boolean b = pythonService.poseTransformationBatch(poseTransformBatchDTO.getProductImage(), poseTransformBatchDTO.getPoseId(), taskId);
|
Boolean b = pythonService.poseTransformationBatch(poseTransformBatchDTO.getProductImage(), poseTransformBatchDTO.getPoseId(), taskId);
|
||||||
if (b){
|
if (b){
|
||||||
// 6、添加预扣除积分到redis
|
// 6、添加预扣除积分到redis
|
||||||
creditsService.addRecordToCreditsDeduction(accountId, uuid, creditsEventsEnum, cloudTaskDTO.getNums());
|
creditsService.addRecordToCreditsDeduction(accountId, taskBatchId, creditsEventsEnum, cloudTaskDTO.getNums());
|
||||||
// 6.1 添加积分扣除记录到db
|
// 6.1 添加积分扣除记录到db
|
||||||
creditsService.preInsert(accountId, creditsEventsEnum.getName(), uuid, Boolean.TRUE, null, cloudTaskDTO.getNums());
|
creditsService.preInsert(accountId, creditsEventsEnum.getName(), taskBatchId, Boolean.TRUE, null, cloudTaskDTO.getNums());
|
||||||
}else {
|
}else {
|
||||||
throw new BusinessException("pose transformation error", ResultEnum.ERROR.getCode());
|
throw new BusinessException("pose transformation error", ResultEnum.ERROR.getCode());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1571,8 +1571,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
|
|||||||
// 3、执行积分扣除
|
// 3、执行积分扣除
|
||||||
String accountId = taskId.substring(taskId.lastIndexOf("-") + 1);
|
String accountId = taskId.substring(taskId.lastIndexOf("-") + 1);
|
||||||
String uuid = taskId.substring(0, taskId.lastIndexOf("-"));
|
String uuid = taskId.substring(0, taskId.lastIndexOf("-"));
|
||||||
Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), uuid);
|
Boolean flag = creditsService.taskCreditsDeduction(Long.parseLong(accountId), taskIdBatch);
|
||||||
if (flag) creditsService.updateChangedCredits(accountId, uuid);
|
if (flag) creditsService.updateChangedCredits(accountId, taskIdBatch);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2792,13 +2792,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
GenerateResultVO generateResultVO = new GenerateResultVO(taskId, toProductImageResult.getId(), url, status, null);
|
GenerateResultVO generateResultVO = new GenerateResultVO(taskId, toProductImageResult.getId(), url, status, null);
|
||||||
redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
|
redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
|
||||||
|
|
||||||
Long accountId = Long.parseLong(taskId.substring(taskId.lastIndexOf("-") + 1));
|
/*Long accountId = Long.parseLong(taskId.substring(taskId.lastIndexOf("-") + 1));
|
||||||
if (!status.equals("Invalid")) {
|
if (!status.equals("Invalid")) {
|
||||||
// 4、扣除积分
|
// 4、扣除积分
|
||||||
Boolean b = creditsService.taskCreditsDeduction(accountId, taskId);
|
Boolean b = creditsService.taskCreditsDeduction(accountId, taskId);
|
||||||
// 3、记录积分变更
|
// 3、记录积分变更
|
||||||
if (b) creditsService.updateChangedCredits(String.valueOf(accountId), taskId);
|
if (b) creditsService.updateChangedCredits(String.valueOf(accountId), taskId);
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2841,13 +2841,13 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
GenerateResultVO generateResultVO = new GenerateResultVO(taskId, toProductImageResult.getId(), url, status, null);
|
GenerateResultVO generateResultVO = new GenerateResultVO(taskId, toProductImageResult.getId(), url, status, null);
|
||||||
redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
|
redisUtil.addToString(key, new Gson().toJson(generateResultVO), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
|
||||||
|
|
||||||
Long accountId = Long.parseLong(taskId.substring(taskId.lastIndexOf("-") + 1));
|
/*Long accountId = Long.parseLong(taskId.substring(taskId.lastIndexOf("-") + 1));
|
||||||
if (!status.equals("Invalid")) {
|
if (!status.equals("Invalid")) {
|
||||||
// 4、扣除积分
|
// 4、扣除积分
|
||||||
Boolean b = creditsService.taskCreditsDeduction(accountId, taskId);
|
Boolean b = creditsService.taskCreditsDeduction(accountId, taskId);
|
||||||
// 3、记录积分变更
|
// 3、记录积分变更
|
||||||
if (b) creditsService.updateChangedCredits(String.valueOf(accountId), taskId);
|
if (b) creditsService.updateChangedCredits(String.valueOf(accountId), taskId);
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2922,5 +2922,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
|
|||||||
cloudTask.setStatus(1);
|
cloudTask.setStatus(1);
|
||||||
cloudTask.setCompletedNum(cloudTask.getNums());
|
cloudTask.setCompletedNum(cloudTask.getNums());
|
||||||
cloudTaskMapper.updateById(cloudTask);
|
cloudTaskMapper.updateById(cloudTask);
|
||||||
|
|
||||||
|
// 扣除积分
|
||||||
|
Boolean b = creditsService.taskCreditsDeduction(cloudTask.getAccountId(), cloudTask.getTaskId());
|
||||||
|
// 记录积分变更
|
||||||
|
if (b) creditsService.updateChangedCredits(String.valueOf(cloudTask.getAccountId()), cloudTask.getTaskId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user