|
@@ -2547,8 +2547,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
throw new RuntimeException("原积分包剩余积分包值不正确");
|
|
|
}
|
|
|
|
|
|
- LocalDateTime now = LocalDateTime.now();
|
|
|
- Integer operatorId = SecurityUtils.getUser().getId();
|
|
|
+// LocalDateTime now = LocalDateTime.now();
|
|
|
+// Integer operatorId = SecurityUtils.getUser().getId();
|
|
|
// 创建新包
|
|
|
String newScorePackageName = null;
|
|
|
// 校验积分包名称是否存在
|
|
@@ -2561,11 +2561,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
}
|
|
|
WmScorePackage newScorePackage = BeanUtil.copyProperties(scorePackage, WmScorePackage.class);
|
|
|
newScorePackage.setId(null);
|
|
|
- newScorePackage.setUpdateTime(null);
|
|
|
- newScorePackage.setUpdateUser(null);
|
|
|
- newScorePackage.setCreateTime(now);
|
|
|
- newScorePackage.setCreateUser(operatorId);
|
|
|
- newScorePackage.setReceiveDate(now);
|
|
|
+// newScorePackage.setUpdateTime(null);
|
|
|
+// newScorePackage.setUpdateUser(null);
|
|
|
+// newScorePackage.setCreateTime(now);
|
|
|
+// newScorePackage.setCreateUser(operatorId);
|
|
|
+// newScorePackage.setReceiveDate(now);
|
|
|
newScorePackage.setScore(unpackDTO.getSelectTaskScore());
|
|
|
newScorePackage.setScorePackageName(newScorePackageName);
|
|
|
newScorePackage.setRemark(String.format("拆包自原积分包id=%s", unpackDTO.getScorePackageId()));
|
|
@@ -2576,8 +2576,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
WmScorePackage updateOldPackage = new WmScorePackage();
|
|
|
updateOldPackage.setId(unpackDTO.getScorePackageId());
|
|
|
updateOldPackage.setScore(oldScorePackageScore);
|
|
|
- updateOldPackage.setUpdateTime(now);
|
|
|
- updateOldPackage.setUpdateUser(operatorId);
|
|
|
+// updateOldPackage.setUpdateTime(now);
|
|
|
+// updateOldPackage.setUpdateUser(operatorId);
|
|
|
updateOldPackage.setRemark(String.format("%s; 原积分包值%s更新为%s",
|
|
|
StrUtil.emptyIfNull(updateOldPackage.getRemark()), scorePackage.getScore(), oldScorePackageScore));
|
|
|
log.info("更新原积分包参数:{}", updateOldPackage);
|
|
@@ -2592,10 +2592,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
newScorePackageStatus.setPackageId(newScorePackage.getId());
|
|
|
newScorePackageStatus.setUserScore(String.valueOf(newScorePackage.getScore()));
|
|
|
newScorePackageStatus.setTaskNum(newScorePackage.getTaskNum());
|
|
|
- newScorePackageStatus.setCreateTime(now);
|
|
|
- newScorePackageStatus.setCreateUser(operatorId);
|
|
|
- newScorePackageStatus.setUpdateUser(null);
|
|
|
- newScorePackageStatus.setUpdateTime(null);
|
|
|
+// newScorePackageStatus.setCreateTime(now);
|
|
|
+// newScorePackageStatus.setCreateUser(operatorId);
|
|
|
+// newScorePackageStatus.setUpdateUser(null);
|
|
|
+// newScorePackageStatus.setUpdateTime(null);
|
|
|
log.info("创建新积分包的领包记录:{}", newScorePackageStatus);
|
|
|
wmScorePackageStatusService.save(newScorePackageStatus);
|
|
|
|
|
@@ -2604,8 +2604,8 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
WmTask updateTask = new WmTask();
|
|
|
updateTask.setId(wmTask.getId());
|
|
|
updateTask.setScorePackageId(newScorePackage.getId());
|
|
|
- updateTask.setUpdateUser(String.valueOf(operatorId));
|
|
|
- updateTask.setUpdateTime(now);
|
|
|
+// updateTask.setUpdateUser(String.valueOf(operatorId));
|
|
|
+// updateTask.setUpdateTime(now);
|
|
|
updateTask.setExtIds(Collections.singletonList(String.format("拆包任务,原积分包id=%s", unpackDTO.getScorePackageId())));
|
|
|
log.info("更新任务参数:{}", updateTask);
|
|
|
wmTaskMapper.updateById(updateTask);
|