From 9e093ebaef861d0dee9d98abcf54599289722cd8 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 24 Mar 2025 17:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8A=9F=E8=83=BD=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/impl/ServiceServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java
index cfcc0fc4..e8b25a2c 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java
@@ -238,6 +238,8 @@ public class ServiceServiceImpl implements ServiceService {
         if (StringUtils.isNotEmpty(req)) {
             Map<String, Object> reqMap = JacksonUtil.parseJSONStr2Map(req);
 //            if ((Integer) reqMap.get("code") == 200) {
+            // 结束扣积分
+            resourceOccupyService.endDeduce(Constant.TaskType_Service, null, id, null, null);
             return serviceDao.updateServiceVersion(serviceVersion) > 0 ? "删除成功" : "删除失败";
 //            }
         }
@@ -317,10 +319,11 @@ public class ServiceServiceImpl implements ServiceService {
             String req = HttpUtils.sendPost(argoUrl + modelService + "/update", JSON.toJSONString(paramMap));
             if (StringUtils.isNotEmpty(req)) {
                 com.ruoyi.platform.domain.Service service = serviceDao.getServiceById(serviceVersion.getServiceId());
+                ServiceVersion serviceVersionById = serviceDao.getServiceVersionById(serviceVersion.getId());
                 // 记录开始扣积分
                 if (reRun) {
                     resourceOccupyService.startDeduce(serviceVersion.getComputingResourceId(), serviceVersion.getReplicas(), Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), null, service.getServiceName(), null, null);
-                } else {
+                } else if (Constant.Running.equals(serviceVersionById.getRunState())) {
                     resourceOccupyService.update(Constant.TaskType_Service, serviceVersion.getServiceId(), serviceVersion.getId(), serviceVersion.getComputingResourceId(), serviceVersion.getReplicas());
                 }
                 return "修改成功";