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-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -83,6 +83,26 @@ public class SalesOrder implements Serializable {
     private String[] salesIds;        //传入mybatis的订单编号
     private String ids;        //前台传过来的订单编号
 
+    //Efast升级新增字段 2018-6-6
+    private String isHaveImport;//是否已导出过
+    private String isDeliverGoods;//是否已发货
+
+    public String getIsHaveImport() {
+        return isHaveImport;
+    }
+
+    public void setIsHaveImport(String isHaveImport) {
+        this.isHaveImport = isHaveImport;
+    }
+
+    public String getIsDeliverGoods() {
+        return isDeliverGoods;
+    }
+
+    public void setIsDeliverGoods(String isDeliverGoods) {
+        this.isDeliverGoods = isDeliverGoods;
+    }
+
     public String getItemProductName() {
         return itemProductName;
     }

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

@@ -57,9 +57,41 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/salesOrder/list_order_page" method="post">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
+            <#--Efast add begin-->
+                <#--<select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                    <option value ="">是否需要回访</option>
+                    <option value="">是否回访</option>
+                    <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
+                    <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
+                </select>-->
+                <select class="my-select" name="isHaveImport" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                    <option value ="">是否已导出过</option>
+                    <#--<option value ="1">是</option>
+                    <option value ="2">否</option>-->
+                    <option value ="1" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "1" >selected="selected"</#if></#if>>是</option>
+                    <option value ="2" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "2" >selected="selected"</#if></#if>>否</option>
+                </select>
+                <select class="my-select" name="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                    <option value ="">是否已发货</option>
+                    <#--<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>
+                </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>
+                <div class="formControls col-4 col-sm-4"style="padding: 0 0;width: 383px;">
+                <span class="select-box">
+                        <select name="cooperativeState" class="select">
+                            <option value="1">是</option>
+                            <option value="2">否</option>
+                        </select>
+                </span>
+                </div>-->
+            <#--Efast add end-->
+            <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">
+            <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
+            <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressTel!}" placeholder="收货人电话" name="salesAddressTel" id="salesAddressTel">
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>-
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>