Ver código fonte

批量上传图片

suochencheng 7 anos atrás
pai
commit
ef333e1f99

+ 2 - 2
src/main/java/com/izouma/awesomeadmin/service/impl/OrderImageServiceImpl.java

@@ -179,8 +179,8 @@ public class OrderImageServiceImpl implements OrderImageService {
             if (orderRepairList.size() > 0) {
                 OrderRepair lastRepair = orderRepairList.get(orderRepairList.size() - 1);
 
-                //如果状态为已完成
-                if (lastRepair.getStatusFlag() >= 1 && lastRepair.getTypeFlag() < 2) {
+                //如果状态为已结束
+                if (lastRepair.getStatusFlag() == 3 && lastRepair.getTypeFlag() < 2) {
                     nowOrderRepair.setOrderId(record.getOrderId());
                     nowOrderRepair.setUserId(record.getUserId());
                     nowOrderRepair.setStoreId(record.getStoreId());

+ 4 - 0
src/main/java/com/izouma/awesomeadmin/web/OrderImageController.java

@@ -242,6 +242,10 @@ public class OrderImageController {
                             if ("finished".equals(typeFlag)) {
                                 return new Result(false, originalFilename + "不在原图中");
                             }
+                        } else {
+                            if ("finished".equals(typeFlag) && orderImage.getStatusFlag() == 1) {
+                                return new Result(false, originalFilename + "已经审核通过");
+                            }
                         }
 
                         String fileType = originalFilename.split("[.]")[originalFilename.split("[.]").length - 1];