Merge branch 'hotfix-20231011-stoppackagebug'

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

@@ -3037,17 +3037,33 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 						.eq(WmTask::getScorePackageId, packageId)
 						.set(WmTask::getEnableFlag, EnableEnum.DISABLE.val()));
 			}
+
+			// 全部终止,将所有的领包记录，改成审核不通过
+			log.info("更新领包记录参数:条件packageId={}; 设置参数enableType={},taskAddFlag={}", packageId, "1", "0");
+			wmScorePackageStatusService.update(Wrappers.<WmScorePackageStatus>lambdaUpdate()
+					.eq(WmScorePackageStatus::getPackageId, packageId)
+					.set(WmScorePackageStatus::getEnableType, "1")
+					.set(WmScorePackageStatus::getTaskAddFlag, "0"));
+		} else {
+			// 剩余回收,更新领包记录状态
+			// 将所有未接单审核的，改成审核不通过
+			log.info("更新领包记录参数:条件packageId={},status={}; 设置参数status={},taskAddFlag={}", packageId, "1", "3", "0");
+			wmScorePackageStatusService.update(Wrappers.<WmScorePackageStatus>lambdaUpdate()
+					.eq(WmScorePackageStatus::getPackageId, packageId)
+					.eq(WmScorePackageStatus::getStatus, "1")
+					.set(WmScorePackageStatus::getStatus, "3")
+					.set(WmScorePackageStatus::getEnableType, "2")
+					.set(WmScorePackageStatus::getTaskAddFlag, "0"));
+			// 将所有已接单审核的，改成不可接单状态
+			log.info("更新领包记录参数2:条件packageId={},status={}; 设置参数status={},enableType={},taskAddFlag={}", packageId, "1", "2", "2", "0");
+			wmScorePackageStatusService.update(Wrappers.<WmScorePackageStatus>lambdaUpdate()
+					.eq(WmScorePackageStatus::getPackageId, packageId)
+					.eq(WmScorePackageStatus::getStatus, "2")
+					.set(WmScorePackageStatus::getEnableType, "2")
+					.set(WmScorePackageStatus::getTaskAddFlag, "0"));
 		}
 
 
-		// 更新领包记录状态
-		//将所有未接单审核的，改成审核不通过
-		log.info("更新领包记录参数:条件packageId={},status={}; 设置参数status={},taskAddFlag={}", packageId, "1", "3", "0");
-		wmScorePackageStatusService.update(Wrappers.<WmScorePackageStatus>lambdaUpdate()
-				.eq(WmScorePackageStatus::getPackageId, packageId)
-				.eq(WmScorePackageStatus::getStatus, "1")
-				.set(WmScorePackageStatus::getStatus, "3")
-				.set(WmScorePackageStatus::getTaskAddFlag, "0"));
 
 		// 回收积分
 		int recoveryScore = 0;