修改客户信息

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

@@ -70,7 +70,7 @@
         AND sales_shipping_status = #{isDeliverGoods}
       </if>
       <if test="salesStatus !=null and salesStatus !=''">
-        AND sales_status = #{salesStatus}
+        AND sales_status = #{salesStatus}listOrderExcel
       </if>
       <if test="salesOrderStatus !=null and salesOrderStatus !=''">
         AND sales_order_status = #{salesOrderStatus}

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

@@ -395,10 +395,10 @@
     $('#order_excel').click(function (e) {
        var isHaveImport = $("#isHaveImport").val();
        var isDeliverGoods = $("#isDeliverGoods").val();
-       var storeName = $("#efastStoreName").val();
+       var salesStoreId = $("#salesStoreId").val();
        var startDate = $("#startDate").val();
        var endDate = $("#endDate").val();
-        window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&storeName="+storeName+"&startDate="+startDate+"&endDate="+endDate;
+        window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&salesStoreId="+salesStoreId+"&startDate="+startDate+"&endDate="+endDate;
     })
 
 </script>