订单图片

src/main/java/com/izouma/awesomeadmin/dao/ImageUploadLogMapper.xml

@@ -514,6 +514,8 @@
             order_image
             WHERE
             del_flag = 'N'
+            AND original_image IS NOT NULL
+            AND original_image != ''
             and order_id =  #{orderId}
             UNION
             SELECT
@@ -522,6 +524,8 @@
             order_image
             WHERE
             del_flag = 'N'
+            AND finished_image IS NOT NULL
+            AND finished_image != ''
             and order_id =  #{orderId}
             )
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             </where>

src/main/java/com/izouma/awesomeadmin/model/OrderImage.java

@@ -1,11 +1,11 @@
 package com.izouma.awesomeadmin.model;
 
-import java.math.BigDecimal;
-import java.util.*;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -28,9 +28,6 @@ public class OrderImage {
 
     private String imageName;
 
-    private ImageUploadLog originalImageInfo;
-
-    private ImageUploadLog finishedImageInfo;
 
     /**
      * 图片备注
@@ -261,20 +258,5 @@ public class OrderImage {
         this.imageName = imageName;
     }
 
-    public ImageUploadLog getOriginalImageInfo() {
-        return originalImageInfo;
-    }
-
-    public void setOriginalImageInfo(ImageUploadLog originalImageInfo) {
-        this.originalImageInfo = originalImageInfo;
-    }
-
-    public ImageUploadLog getFinishedImageInfo() {
-        return finishedImageInfo;
-    }
-
-    public void setFinishedImageInfo(ImageUploadLog finishedImageInfo) {
-        this.finishedImageInfo = finishedImageInfo;
-    }
 }