订单照片数量

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

@@ -1245,6 +1245,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="selectFlag != null and !&quot;&quot;.equals(selectFlag)">
+                and select_flag = #{selectFlag}
+            </if>
             <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
@@ -1270,6 +1273,9 @@
             <if test="statusFlag != null and !&quot;&quot;.equals(statusFlag)">
                 and status_flag = #{statusFlag}
             </if>
+            <if test="selectFlag != null and !&quot;&quot;.equals(selectFlag)">
+                and select_flag = #{selectFlag}
+            </if>
             <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>

src/main/java/com/izouma/awesomeadmin/web/OrderImageController.java

@@ -295,6 +295,12 @@ public class OrderImageController {
                                 return new Result(false, originalFilename + "不在原图中");
                             }
                         } else {
+
+                            if ("finished".equals(typeFlag) && !"Y".equals(orderImage.getSelectFlag())) {
+                                return new Result(false, originalFilename + "不在选择精选原图中");
+                            }
+
+
                             if ("finished".equals(typeFlag) && orderImage.getStatusFlag() == 1) {
                                 return new Result(false, originalFilename + "已经审核通过");
                             }