feat: 拆包需求完善2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -2572,6 +2572,15 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		LocalDateTime now = LocalDateTime.now();
 		Integer operatorId = SecurityUtils.getUser().getId();
 		// 创建新包
+		String newScorePackageName = null;
+		// 校验积分包名称是否存在
+		for (int i = 0; i < 9999; i++) {
+			int newScorePackageCount = this.count(Wrappers.<WmScorePackage>lambdaQuery().eq(WmScorePackage::getScorePackageName, newScorePackageName));
+			if (newScorePackageCount <= 0) {
+				newScorePackageName = String.format("%s-%s", scorePackage.getScorePackageName(), i + 1);
+				break;
+			}
+		}
 		WmScorePackage newScorePackage = BeanUtil.copyProperties(scorePackage, WmScorePackage.class);
 		newScorePackage.setId(null);
 		newScorePackage.setUpdateTime(null);
@@ -2580,7 +2589,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		newScorePackage.setCreateUser(operatorId);
 		newScorePackage.setReceiveDate(now);
 		newScorePackage.setScore(unpackDTO.getNewPackageScore());
-		newScorePackage.setScorePackageName(String.format("%s-1", scorePackage.getScorePackageName(), "1"));
+		newScorePackage.setScorePackageName(newScorePackageName);
 		newScorePackage.setRemark(String.format("拆包自原积分包id=%s", unpackDTO.getScorePackageId()));
 		log.info("创建新积分包参数：{}", newScorePackage);
 		this.save(newScorePackage);
@@ -2596,11 +2605,11 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		log.info("更新原积分包参数：{}", updateOldPackage);
 		this.updateById(updateOldPackage);
 
-		// 原领包记录
+		// 原积分包的领包记录
 		WmScorePackageStatus oldScorePackageStatus = wmScorePackageStatusService.getOne(Wrappers.<WmScorePackageStatus>lambdaQuery()
 				.eq(WmScorePackageStatus::getPackageId, unpackDTO.getScorePackageId())
 				.eq(WmScorePackageStatus::getStatus, PackageStatusEnum.APPROVED.val()));
-		// 创建新领包记录
+		// 创建新积分包的领包记录
 		WmScorePackageStatus newScorePackageStatus = BeanUtil.copyProperties(oldScorePackageStatus, WmScorePackageStatus.class);
 		newScorePackageStatus.setPackageId(newScorePackage.getId());
 		newScorePackageStatus.setUserScore(String.valueOf(newScorePackage.getScore()));
@@ -2609,7 +2618,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		newScorePackageStatus.setCreateUser(operatorId);
 		newScorePackageStatus.setUpdateUser(null);
 		newScorePackageStatus.setUpdateTime(null);
-		log.info("创建新领包记录参数：{}", newScorePackage);
+		log.info("创建新积分包的领包记录：{}", newScorePackageStatus);
 		wmScorePackageStatusService.save(newScorePackageStatus);
 
 		// 任务关联到新积分包