Explorar o código

fix of 下单制2.0 on 2021.1.22

jiequan.bi %!s(int64=4) %!d(string=hai) anos
pai
achega
1344285d43

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

@@ -54,7 +54,7 @@ public class PlatformFileCtrl {
         if (file.isEmpty() || !((file.getOriginalFilename().endsWith(".zip") || file.getOriginalFilename().endsWith(".rar") || file.getOriginalFilename().endsWith(".7z")))) {
             result.error500("请上传正确的压缩文件");
         } else {
-            String fileName = projectId + "_" + System.currentTimeMillis()+"_"+file.getOriginalFilename();
+            String fileName = projectId + "_" + System.currentTimeMillis() + "_" + file.getOriginalFilename();
             InputStream inputStream = null;
             try {
                 inputStream = file.getInputStream();
@@ -88,7 +88,7 @@ public class PlatformFileCtrl {
             }
             //物料状态->脚本已上传,待审核
             PlatformMaterial platformMaterial = platformMaterialService.getById(materialId);
-            if(platformMaterial.getScriptStatus()!=0||platformMaterial.getScriptStatus()!=2){
+            if (platformMaterial.getScriptStatus() ==3) {
                 result.error500("数据已更新,请刷新页面");
                 return result;
             }
@@ -102,7 +102,7 @@ public class PlatformFileCtrl {
                 script.setProjectId(projectId);
                 platformScriptService.updateById(script);
                 operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "SCRIPT");
-                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT",platformMaterial.getMaterialCode());
+                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("SCRIPT", platformMaterial.getMaterialCode());
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -111,31 +111,32 @@ public class PlatformFileCtrl {
     }
 
     @PostMapping("/uploadVideo")
-    public Result<Object> uploadVideo(@RequestBody JSONObject requestBody){
+    public Result<Object> uploadVideo(@RequestBody JSONObject requestBody) {
         Result<Object> result = new Result<>();
         //同一个视频不能出现在不同的物料下
-        int repeat=platformMaterialService.queryCountByMaterialAndVideo(requestBody.getString("materialCode"),requestBody.getString("md5"));
-        if(repeat>0){
+        int repeat = platformMaterialService.queryCountByMaterialAndVideo(requestBody.getString("materialCode"), requestBody.getString("md5"));
+        if (repeat > 0) {
             result.error500("视频已被其他物料上传,请重新选择视频");
             return result;
         }
         String videoMd5 = platformVideoService.uploadVideo(requestBody);
-        if(videoMd5.isEmpty()){
+        if (videoMd5.isEmpty()) {
             result.error500("素材视频上传失败,参数为空");
-        }else {
+        } else {
             //物料状态->视频已上传,待审核
             PlatformMaterial platformMaterial = platformMaterialService.getById(requestBody.getString("materialId"));
-            if(platformMaterial.getVideoStatus()!=0||platformMaterial.getVideoStatus()!=2){
+            if (platformMaterial.getVideoStatus() ==3) {
                 result.error500("数据已更新,请刷新页面");
                 return result;
-            }            platformMaterial.setId(requestBody.getLong("materialId"));
+            }
+            platformMaterial.setId(requestBody.getLong("materialId"));
             platformMaterial.setMaterialStatus(5);
             platformMaterial.setVideoStatus(1);
             platformMaterial.setVideoId(videoMd5);
             boolean save = platformMaterialService.updateById(platformMaterial);
             if (save) {
                 operateRecordHandler.Submit(platformMaterial.getMaterialCode(), "VIDEO");
-                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO",platformMaterial.getMaterialCode());
+                approvalNodeNoticeHandler.NOTICE_WE_CHAT_MATERIAL("VIDEO", platformMaterial.getMaterialCode());
                 result.success("素材视频上传成功");
             }
         }