Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -63,6 +63,15 @@
     LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
     <where>
+      <if test="isHaveImport !=null and isHaveImport !=''">
+        AND sales_is_download = #{isHaveImport}
+      </if>
+      <if test="isDeliverGoods !=null and isDeliverGoods !=''">
+        AND sales_shipping_status = #{isDeliverGoods}
+      </if>
+      <if test="storeName !=null and storeName !=''">
+        AND sales_store_id = #{storeName}
+      </if>
       <if test="salesStatus !=null and salesStatus !=''">
         AND sales_status = #{salesStatus}
       </if>
@@ -145,6 +154,15 @@
       LEFT JOIN tb_rst_store_info trsi ON o.sales_store_id = trsi.store_id
       LEFT JOIN tb_rst_sales_order_item i ON o.sales_id = i.item_order_id
       <where>
+        <if test="isHaveImport !=null and isHaveImport !=''">
+          AND sales_is_download = #{isHaveImport}
+        </if>
+        <if test="isDeliverGoods !=null and isDeliverGoods !=''">
+          AND sales_shipping_status = #{isDeliverGoods}
+        </if>
+        <if test="storeName !=null and storeName !=''">
+          AND sales_store_id = #{storeName}
+        </if>
         <if test="salesId !=null">
           o.sales_id like CONCAT('%',#{salesId},'%')
         </if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -76,7 +76,7 @@
                     <#--<option value ="1">是</option>
                     <option value ="2">否</option>-->
                     <option value ="1" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "1" >selected="selected"</#if></#if>>是</option>
-                    <option value ="2" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "2" >selected="selected"</#if></#if>>否</option>
+                    <option value ="0" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "2" >selected="selected"</#if></#if>>否</option>
                 </select>
                 <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.storeName!}" placeholder="店铺" name="storeName" id="storeName">
                <#-- <label class="form-label col-3 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>是否已发货：</label>