feat: 多人积分包-小程序接口调整

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1857,7 +1857,8 @@ public class ApiController {
 						continue;
 					}
 
-					if ("1".equals(item.getPackageType1())) {
+					if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), item.getPackageType1())
+							|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), item.getPackageType1())) {
 						Integer finishScore = 0;
 						Integer waitApprovalScore = 0;
 						for (WmTask task : wmTaskList) {
@@ -3637,7 +3638,8 @@ public class ApiController {
 					}
 				}
 
-				if ("1".equals(tWmScorePackage.getPackageType1())) {
+				if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), tWmScorePackage.getPackageType1())
+						|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), tWmScorePackage.getPackageType1())) {
 
 					String limitValue = "30000";
 					// 查询当前企业配置的积分限制
@@ -3900,8 +3902,9 @@ public class ApiController {
 								// 查询出 审核通过和审核中的任务
 								.ne(WmTask::getTaskStatus, "4")
 								.eq(WmTask::getRealFlag, "0"));
-						// 判断定量还是定额 1- 定额   2-定量
-						if ("1".equals(wmScorePackage1.getPackageType1())) {
+						// 判断定量还是定额 1- 定额   2-定量 6-定额+定量
+						if (StrUtil.equals(PackageTypeEnum.TYPE1_SCOTE_PACKAGE.val(), wmScorePackage1.getPackageType1())
+								|| StrUtil.equals(PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val(), wmScorePackage1.getPackageType1())) {
 
 							int totalCount = 0;
 							for (WmTask wmtask : wmTaskList) {