浏览代码

fix of 下单制2.0 on 2021.1.22

jiequan.bi 4 年之前
父节点
当前提交
98e10f10a2

+ 14 - 9
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformFileCtrl.java

@@ -87,7 +87,11 @@ public class PlatformFileCtrl {
                 return result;
             }
             //物料状态->脚本已上传,待审核
-            PlatformMaterial platformMaterial = new PlatformMaterial();
+            PlatformMaterial platformMaterial = platformMaterialService.getById(materialId);
+            if(platformMaterial.getScriptStatus()!=0||platformMaterial.getScriptStatus()!=2){
+                result.error500("数据已更新,请刷新页面");
+                return result;
+            }
             platformMaterial.setId(materialId);
             platformMaterial.setMaterialStatus(2);
             platformMaterial.setScriptStatus(1);
@@ -97,9 +101,8 @@ public class PlatformFileCtrl {
                 // 更新脚本库的绑定项目
                 script.setProjectId(projectId);
                 platformScriptService.updateById(script);
-                String materialCode= platformMaterialService.getById(materialId).getMaterialCode();
-                operateRecordHandler.Submit(materialCode, "SCRIPT");
-                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT",materialCode);
+                operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "SCRIPT");
+                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT",platformMaterial.getMaterialCode());
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -121,16 +124,18 @@ public class PlatformFileCtrl {
             result.error500("素材视频上传失败,参数为空");
         }else {
             //物料状态->视频已上传,待审核
-            PlatformMaterial platformMaterial = new PlatformMaterial();
-            platformMaterial.setId(requestBody.getLong("materialId"));
+            PlatformMaterial platformMaterial = platformMaterialService.getById(requestBody.getString("materialId"));
+            if(platformMaterial.getVideoStatus()!=0||platformMaterial.getVideoStatus()!=2){
+                result.error500("数据已更新,请刷新页面");
+                return result;
+            }            platformMaterial.setId(requestBody.getLong("materialId"));
             platformMaterial.setMaterialStatus(5);
             platformMaterial.setVideoStatus(1);
             platformMaterial.setVideoId(videoMd5);
             boolean save = platformMaterialService.updateById(platformMaterial);
             if (save) {
-                String materialCode= platformMaterialService.getById(requestBody.getString("materialId")).getMaterialCode();
-                operateRecordHandler.Submit(materialCode, "VIDEO");
-                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO",materialCode);
+                operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "VIDEO");
+                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO",platformMaterial.getMaterialCode());
                 result.success("素材视频上传成功");
             }
         }