Merge remote-tracking branch 'liujiankang/master'

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

watero-rst-interface/src/main/java/com/iamberry/rst/faces/customer/CustomerBasicService.java

@@ -1,6 +1,8 @@
 package com.iamberry.rst.faces.customer;
 
 import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.Country;
+import com.iamberry.rst.core.address.District;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.customer.*;
 import com.iamberry.rst.core.order.Product;
@@ -120,6 +122,12 @@ public interface CustomerBasicService {
     public List<City> queryCityList(String provinceId);
 
     /**
+     * 根据城市代号查询所有区/县
+     * @param cityId
+     * @return
+     */
+    public List<District> queryDistrictList(String cityId);
+    /**
      * 查询所有渠道类别
      * @param channelCategoryId
      * @return
@@ -223,4 +231,6 @@ public interface CustomerBasicService {
      * @return
      */
     LowestPriceInfo getLowestPrice(LowestPriceInfo lowestPriceInfo);
+
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/CustomerBasicServiceImpl.java

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.customer;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.address.City;
+
+import com.iamberry.rst.core.address.District;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.customer.*;
 import com.iamberry.rst.core.order.Product;
@@ -236,7 +238,9 @@ public class CustomerBasicServiceImpl implements CustomerBasicService{
     public List<City> queryCityList(String provinceId){
         return (List<City>)customerBasicMapper.queryCityList(provinceId);
     }
-
+    public List<District> queryDistrictList(String cityId){
+        return (List<District>)customerBasicMapper.queryDistrictList(cityId);
+    }
     public List<ChannelDivisionInfo> queryChannelCategoryList(String channelCategoryId){
         return (List<ChannelDivisionInfo>)customerBasicMapper.queryChannelCategoryList(channelCategoryId);
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.customer.mapper;
 
 import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.customer.*;
 import com.iamberry.rst.core.order.Product;
@@ -126,7 +127,12 @@ public interface CustomerBasicMapper {
      * @return
      */
     public List<City> queryCityList(String provinceId);
-
+    /**
+     * 根据城市代号查询所有区/县
+     * @param cityId
+     * @return
+     */
+    public List<District> queryDistrictList(String cityId);
     /**
      * 查询所有渠道类别
      * @param channelCategoryId
@@ -206,4 +212,6 @@ public interface CustomerBasicMapper {
      * @return
      */
     LowestPriceInfo getLowestPrice(LowestPriceInfo lowestPriceInfo);
+
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -291,6 +291,13 @@
         <result property="city" column="city" />
         <!--<result property="provinceNum" column="provinceid" />-->
     </resultMap>
+    <!--根据城市代号查询所有区/县映射-->
+    <resultMap type="com.iamberry.rst.core.address.District" id="queryDistrictResult">
+        <id property="districtId" column="district_id"/>
+        <!--<result property="cityNum" column="city_number" />-->
+        <result property="district" column="district" />
+        <!--<result property="provinceNum" column="provinceid" />-->
+    </resultMap>
     <!--查询所有渠道类别-->
     <resultMap type="com.iamberry.rst.core.customer.ChannelDivisionInfo" id="queryChannelCategoryResult">
         <result property="channelCategory" column="channel_category" />
@@ -505,6 +512,19 @@
         ORDER BY
         t.city_id ASC
     </select>
+    <!--根据省份代号查询所有区/县-->
+    <select id="queryDistrictList" parameterType="java.lang.String" resultMap="queryDistrictResult">
+        SELECT
+        t.district_id,
+        t.district,
+        t.division_code
+        FROM
+        tb_rst_address_district t
+        WHERE
+        t.city_id = #{id}
+        ORDER BY
+        t.district_id ASC
+    </select>
     <!--查询所有渠道类别-->
     <select id="queryChannelCategoryList" parameterType="java.lang.String" resultMap="queryChannelCategoryResult">
         SELECT

watero-rst-web/src/main/java/com/iamberry/rst/controllers/customer/CustomerBasicController.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.controllers.customer;
 
 import com.iamberry.rst.core.address.City;
+import com.iamberry.rst.core.address.District;
 import com.iamberry.rst.core.address.Province;
 import com.iamberry.rst.core.customer.*;
 import com.iamberry.rst.core.order.Product;
@@ -440,6 +441,27 @@ public class CustomerBasicController {
     }
 
     /**
+     * 根据省份代号查询所有区/县
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/query_districtList")
+    public ResponseJson queryDistrictList(HttpServletRequest request) {
+        //Province province = new Province();
+        String cityId =  request.getParameter("cityId");
+        List<District> districtList = null;
+        districtList = customerBasicService.queryDistrictList(cityId);
+        if (districtList != null || districtList.size() > 0) {
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("districtList", districtList);
+            return rj;
+        } else {
+            return new ResponseJson(500, "查询失败", 500);
+        }
+    }
+
+    /**
      * 查询所有渠道类别
      *
      * @return

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -462,16 +462,21 @@
             <div class="row cl" id="TDScollect" style="display: none;">
                 <label class="form-label col-1 col-sm-1">TDS收集：</label>
                 <div class="formControls col-2 col-sm-2" style="position: relative;">
-                    <input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
+                    <#--<input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
                     <input style="width: 190px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" />
-                    <div id="suggest" class="ac_results"></div>
+                    <div id="suggest" class="ac_results"></div>-->
+                    <span class="select-box">
+                        <select name="initProvinceCode" class="select" id="initProvince">
+                            <option value="">请选择省份</option>
+                        </select>
+				    </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
-				<span class="select-box">
-                    <select name="" class="select" id="TDSArea" name="TDSArea">
-                        <option value="">请搜索城市</option>
-                    </select>
-				</span>
+                    <span class="select-box">
+                        <select name="initCityCode" class="select" id="initCity<#--TDSArea-->" <#--name="TDSArea"-->>
+                            <option value="">请选择城市<#--请搜索城市--></option>
+                        </select>
+                    </span>
                 </div>
                 <input type="hidden" name="customerArea" id="customerArea">
                 <div class="formControls col-2 col-sm-2">
@@ -687,6 +692,112 @@
 
 <script>
 
+    $(function(){
+        /*初始化省份*/
+        initProvince();
+        /*监听省份*/
+        $("[name='initProvinceCode']").change(function (){
+            initCity($(this).val());
+        })
+        /*监听城市*/
+        $("[name='initCityCode']").change(function (){
+            initDistrict($(this).val());
+        })
+    })
+    /*初始化省份*/
+    function initProvince() {
+        //默认查询参数为空
+        var provinceListInfo = null;
+        $.ajax({
+            type: "POST",
+            data: {
+                provinceId : provinceListInfo
+            },
+            url: "${path}/admin/customerBasic/query_provinceList",
+            async: true,
+            success: function(data){
+                var html = '<option value="">请选择省份</option>';
+                var id;
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.provinceList.length;i++){
+                        provinceListInfo = data.returnMsg.provinceList[i];
+                        if(i == 0 ){
+                            id = provinceListInfo.provinceId;
+                        }
+                        html += '<option value="'+ provinceListInfo.provinceId +'">'+ provinceListInfo.province +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("[name='initProvinceCode']").html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+    /*根据省份代号初始化城市*/
+    function initCity(customerProvinceId){
+        var cityListInfo = null;
+        if(customerProvinceId == null || customerProvinceId == ""){
+            var html = '<option value="">请选择城市</option>';
+            $("[name='initCityCode']").html(html);
+        }else{
+            $.ajax({
+                type: "POST",
+                data: {
+                    provinceId : customerProvinceId
+                },
+                url: "${path}/admin/customerBasic/query_cityList",
+                async: true,
+                success: function(data){
+                    var html = '<option value="">请选择城市</option>';
+                    if (data.returnCode == 200) {
+                        for(var i=0;i<data.returnMsg.cityList.length;i++){
+                            cityListInfo = data.returnMsg.cityList[i];
+                            html += '<option value="'+ cityListInfo.cityId +'">'+ cityListInfo.city +'</option>';
+                        }
+                    }else{
+                        html = '';
+                    }
+                    $("[name='initCityCode']").html(html);
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                }
+            });
+        }
+    }
+    /*根据省份代号初始化区/县*/
+    function initDistrict(customerCityId){
+        var districtListInfo = null;
+        if(customerCityId == null || customerCityId == ""){
+            var html = '<option value="">请选择区/县</option>';
+            $("[name='initDistrictCode']").html(html);
+        }else{
+            $.ajax({
+                type: "POST",
+                data: {
+                    cityId : customerCityId
+                },
+                url: "${path}/admin/customerBasic/query_districtList",
+                async: true,
+                success: function(data){
+                    var html = '<option value="">请选择区/县</option>';
+                    if (data.returnCode == 200) {
+                        for(var i=0;i<data.returnMsg.districtList.length;i++){
+                            districtListInfo = data.returnMsg.districtList[i];
+                            html += '<option value="'+ districtListInfo.districtId +'">'+ districtListInfo.district +'</option>';
+                        }
+                    }else{
+                        html = '';
+                    }
+                    $("[name='initDistrictCode']").html(html);
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                }
+            });
+        }
+    }
+
     /*是否是修改页面*/
     var isUpdate = false;
     /*是否需要回访  只有修改页面才会使用*/

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl

@@ -136,6 +136,23 @@
                     </#list>
                 </div>
             </div>
+            <div class="row cl" id="salesChannelsSelect" style="">
+                <input type="hidden" id="companyId" name="companyId" value="<#if customerInfo??>${customerInfo.companyId!''}</#if>">
+                <input type="hidden" id="storeId" name="storeId" value="<#if customerInfo??>${customerInfo.storeId!''}</#if>">
+                <label class="form-label col-1 col-sm-1">销售渠道：</label>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectCompany" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectStore" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+            </div>
 
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">客户信息：</label>
@@ -370,23 +387,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="salesChannelsSelect" style="">
-                <input type="hidden" id="companyId" name="companyId" value="<#if customerInfo??>${customerInfo.companyId!''}</#if>">
-                <input type="hidden" id="storeId" name="storeId" value="<#if customerInfo??>${customerInfo.storeId!''}</#if>">
-                <label class="form-label col-1 col-sm-1">销售渠道：</label>
-                <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                         <select id="selectCompany" class="select" name="">
-                         </select>
-                     </span>
-                </div>
-                <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                         <select id="selectStore" class="select" name="">
-                         </select>
-                     </span>
-                </div>
-            </div>
+            <#--销售渠道-->
 
             <#assign ids = ""/>
             <#if salesOrderList??>
@@ -586,17 +587,36 @@
             <div class="row cl" id="TDScollect" style="display: none;">
                 <label class="form-label col-1 col-sm-1">TDS收集：</label>
                 <div class="formControls col-2 col-sm-2" style="position: relative;">
-                    <input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
+                    <#--<input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
                     <input style="width: 190px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" value="" />
-                    <div id="suggest" class="ac_results"></div>
+                    <div id="suggest" class="ac_results"></div>-->
+                    <span class="select-box">
+                        <select name="initProvinceCode" class="select" id="initProvince">
+                            <option value="">请选择省份</option>
+                        </select>
+				    </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                        <select name="initCityCode" class="select" id="initCity<#--TDSArea-->" <#--name="TDSArea"-->>
+                            <option value="">请选择城市<#--请搜索城市--></option>
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                    <span class="select-box">
+                        <select name="initDistrictCode" class="select" id="initCountry">
+                            <option value="">请选择区/县</option>
+                        </select>
+				    </span>
+                </div>
+                <#--<div class="formControls col-2 col-sm-2">
 				<span class="select-box">
                     <select name="" class="select" id="TDSArea" name="TDSArea">
                         <option value="">请搜索城市</option>
                     </select>
 				</span>
-                </div>
+                </div>-->
                 <input type="hidden" name="customerArea" id="customerArea" value="${customerInfo.customerArea!''}">
                 <div class="formControls col-2 col-sm-2">
                     <input type="text" class="input-text" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
@@ -844,6 +864,112 @@
     /*1：需要有订单    2：不需要有订单*/
     var isNeedSelectOrder = ${customerInfo.isNeedSelectOrder};
 
+    $(function(){
+        /*初始化省份*/
+        initProvince();
+        /*监听省份*/
+        $("[name='initProvinceCode']").change(function (){
+            initCity($(this).val());
+        })
+        /*监听城市*/
+        $("[name='initCityCode']").change(function (){
+            initDistrict($(this).val());
+        })
+    })
+    /*初始化省份*/
+    function initProvince() {
+        //默认查询参数为空
+        var provinceListInfo = null;
+        $.ajax({
+            type: "POST",
+            data: {
+                provinceId : provinceListInfo
+            },
+            url: "${path}/admin/customerBasic/query_provinceList",
+            async: true,
+            success: function(data){
+                var html = '<option value="">请选择省份</option>';
+                var id;
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.provinceList.length;i++){
+                        provinceListInfo = data.returnMsg.provinceList[i];
+                        if(i == 0 ){
+                            id = provinceListInfo.provinceId;
+                        }
+                        html += '<option value="'+ provinceListInfo.provinceId +'">'+ provinceListInfo.province +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("[name='initProvinceCode']").html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+    /*根据省份代号初始化城市*/
+    function initCity(customerProvinceId){
+        var cityListInfo = null;
+        if(customerProvinceId == null || customerProvinceId == ""){
+            var html = '<option value="">请选择城市</option>';
+            $("[name='initCityCode']").html(html);
+        }else{
+            $.ajax({
+                type: "POST",
+                data: {
+                    provinceId : customerProvinceId
+                },
+                url: "${path}/admin/customerBasic/query_cityList",
+                async: true,
+                success: function(data){
+                    var html = '<option value="">请选择城市</option>';
+                    if (data.returnCode == 200) {
+                        for(var i=0;i<data.returnMsg.cityList.length;i++){
+                            cityListInfo = data.returnMsg.cityList[i];
+                            html += '<option value="'+ cityListInfo.cityId +'">'+ cityListInfo.city +'</option>';
+                        }
+                    }else{
+                        html = '';
+                    }
+                    $("[name='initCityCode']").html(html);
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                }
+            });
+        }
+    }
+    /*根据省份代号初始化区/县*/
+    function initDistrict(customerCityId){
+        var districtListInfo = null;
+        if(customerCityId == null || customerCityId == ""){
+            var html = '<option value="">请选择区/县</option>';
+            $("[name='initDistrictCode']").html(html);
+        }else{
+            $.ajax({
+                type: "POST",
+                data: {
+                    cityId : customerCityId
+                },
+                url: "${path}/admin/customerBasic/query_districtList",
+                async: true,
+                success: function(data){
+                    var html = '<option value="">请选择区/县</option>';
+                    if (data.returnCode == 200) {
+                        for(var i=0;i<data.returnMsg.districtList.length;i++){
+                            districtListInfo = data.returnMsg.districtList[i];
+                            html += '<option value="'+ districtListInfo.districtId +'">'+ districtListInfo.district +'</option>';
+                        }
+                    }else{
+                        html = '';
+                    }
+                    $("[name='initDistrictCode']").html(html);
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                }
+            });
+        }
+    }
+
     /*初始化页面参数*/
     $(function () {
         /* 初始化单选框样式 */

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

@@ -180,17 +180,24 @@
         </table>
     </div>
 </div>
-<tfoot>
+<#--<tfoot>-->
 <#include "/base/page_util.ftl">
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
 <script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
-<script type="text/plain" id="upload_ue"></script>
-</tfoot>
+<#--<script type="text/plain" id="upload_ue"></script>-->
+<#--</tfoot>-->
 <script type="text/javascript">
     /*判断上传类型 1：上传excel推送订单   2:下载订单 */
     var editorType;
     var _editor;
+    /**
+     *跳转到详情页面
+     * @param employee
+     */
+    function sales_order_detail(orderSaleId) {
+        window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
+    }
     $(function() {
         //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
         _editor = UE.getEditor('upload_ue',{