Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev

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 "修改成功";