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

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}
@@ -485,6 +485,9 @@
       <if test="salesPostFirm != null" >
         sales_post_firm = #{salesPostFirm,jdbcType=VARCHAR},
       </if>
+      <if test="salesShippingStatus != null" >
+        sales_shipping_status = #{salesShippingStatus}
+      </if>
     </set>
     where sales_deal_code = #{salesDealCode}
   </update>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/MallOrderController.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.controllers.order;
 
 import com.alibaba.fastjson.JSON;
+import com.iamberry.rst.controllers.sys.SysController;
 import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
@@ -14,6 +15,8 @@ import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.OrderNoUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +33,7 @@ import java.util.*;
 @Controller
 @RequestMapping("/mallorder")
 public class MallOrderController {
+    private static Logger logger = LoggerFactory.getLogger(SysController.class);
     @Autowired
     private SalesOrderService salesOrderService;
     @Autowired
@@ -41,6 +45,7 @@ public class MallOrderController {
     @ResponseBody
     public JSONObject addOrder(HttpServletRequest request){
         String info =  request.getParameter("info");
+        logger.info("接受到商城推送订单="+info);
         Map<String,Object> map = new HashMap<String,Object>();
         Map requstMap = (Map) JSON.parse(info);
         if(requstMap == null || requstMap.size() == 0){

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>