no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/order/OrderDeliveryVO.java

@@ -92,5 +92,10 @@ public class OrderDeliveryVO    {
     @ApiModelProperty(value = "YES NO")
     private String type;
 
+    @ApiModelProperty(value = "配送完成图片")
+    private String finishImgUrl;
+
+    @ApiModelProperty(value = "配送完成备注")
+    private String finishRemark;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/OrderMapper.java

@@ -36,7 +36,7 @@ public interface OrderMapper {
                                            @Param("companyWechatIds") List<String> companyWechatIds,@Param("websitIds") List<String> websitIds);
 
 
-    IPage<OrderDeliveryVO> orderDelivery(Page page,  @Param("ex") ZfireParamBean zfireParam,@Param("companyWechatIds") List<String> companyWechatIds);
+    IPage<OrderDeliveryVO> orderDelivery(Page page, @Param("ex") ZfireParamBean zfireParam, @Param("companyWechatIds") List<String> companyWechatIds, @Param("storageIds") List<String> storageIds);
 
     /**
      * 统计工单状态数量

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderDeliveryLogic.java

@@ -97,9 +97,7 @@ public class OrderDeliveryLogic {
 
 
         IPage<OrderDeliveryVO> orderDeliveryVOIPage = orderMapper.orderDelivery(new Page(zfireParamBean.getPageNum(),
-                        zfireParamBean.getPageSize()),
-                zfireParam
-                , companyWechatIds);
+                        zfireParamBean.getPageSize()), zfireParam, companyWechatIds, adminUser.getStorageIds());
 
         return orderDeliveryVOIPage;
     }

mall-server-api/src/main/resources/mapper/OrderMapper.xml

@@ -201,6 +201,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="storageIds != null and storageIds.size > 0">
+            AND a.storage_stock_id IN
+            <foreach item="item" index="index" collection="storageIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="ex.orderBy == null or ex.orderBy ==''">
             ORDER BY a.create_time DESC
         </if>