Browse Source

fix: 终止积分包校验

lixuesong 1 year ago
parent
commit
c8d94f41ca

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

@@ -48,6 +48,7 @@ import com.qunzhixinxi.hnqz.admin.recharge.enums.RechargeRecordType;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptRechargeMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptRechargeMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptRechargeRecordMapper;
 import com.qunzhixinxi.hnqz.admin.recharge.mapper.SysDeptRechargeRecordMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
@@ -3046,6 +3047,13 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			}
 			}
 		}
 		}
 
 
+		int packageStatusCount = wmScorePackageStatusService.count(Wrappers.<WmScorePackageStatus>lambdaQuery()
+				.eq(WmScorePackageStatus::getPackageId, packageId)
+				.notIn(WmScorePackageStatus::getStatus, PackageStatusEnum.APPROVED, PackageStatusEnum.FAIL_APPROVED));
+		if (packageStatusCount > 0) {
+			throw new BizException("接单审批有待审任务,不允许终止");
+		}
+
 		// 更新积分包状态
 		// 更新积分包状态
 		WmScorePackage updateScorePackage = new WmScorePackage();
 		WmScorePackage updateScorePackage = new WmScorePackage();
 		updateScorePackage.setId(packageId);
 		updateScorePackage.setId(packageId);