客诉修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -220,6 +220,11 @@ public class CustomerServiceImpl implements CustomerService {
         //当前处理信息
         CmRelation cr =  customerInfo.getCmRelation();
 
+        if(customerInfo == null || customerInfo.getCustomerId()==null || customerInfo.getCmRelation()==null
+                || cr == null || cr.getRelationId() == null ){
+            throw new RuntimeException("修改客诉失败-未获取到客诉ID与处理方式ID");
+        }
+
         //删除旧的售后数据
         customerService.deleteCustomerAfterSales(customerInfo,cr);
 

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

@@ -437,24 +437,57 @@
                 </div>
             </div>
 
-            <div class="row cl recipientAddress" id="" style="display: none">
+            <#--<div class="row cl recipientAddress relation_address" id="" style="display: none">
                 <input type="hidden" id="addressInfo">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
                          <select id="province" class="select" name="provinceNumber">
+                             <option value="">请选择省份</option>
                          </select>
                      </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
                         <select id="city" class="select" name="cityNumber">
+                             <option value="">请选择城市</option>
                         </select>
                     </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
                         <select id="district" class="select" name="areaNumber">
+                            <option value="">请选择区</option>
+                        </select>
+                    </span>
+                </div>
+                <input type="hidden" name="relationSendMergeAddress" id="relationSendMergeAddress">
+            </div>-->
+
+            <div class="row cl recipientAddress relation_address" style="display: none;" code="returnCode" msg="resultMsg" data="returnMsg">
+                <input type="hidden" id="addressInfo">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                    <span class="select-box">
+                        <select name="provinceNumber" class="select" id="province"
+                                ulcValName="province" ulcValId="provinceId"  ulcURL="/address/list_province" ulcMsg="" ulcList="provinceList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择省份">
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                        <select name="cityNumber" class="select" id="city"
+                                ulcValName="city" ulcValId="cityId"  ulcURL="/address/list_city?provinceId=" ulcMsg="" ulcList="cityList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择市">
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                    <span class="select-box">
+                        <select name="areaNumber" class="select" id="district"
+                                ulcValName="district" ulcValId="districtId"  ulcURL="/address/list_district?cityId=" ulcMsg="" ulcList="districtList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择区/县">
                         </select>
                     </span>
                 </div>
@@ -715,9 +748,9 @@
 
 <script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>-->
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 
@@ -734,6 +767,8 @@
     /*加载TDS地址信息*/
     var addressUlc = init_address($(".init_address"));
 
+    var ulcRelationAddress = init_address($(".relation_address"));
+
     /*是否是修改页面*/
     var isUpdate = false;
 

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

@@ -74,6 +74,7 @@
         <form action="${path}/admin/customer/update_customer" method="post" class="form form-horizontal" id="form-customer-add"  onkeydown="if(event.keyCode==13)return false;">
 
             <input type="hidden" id="customerId" name="customerId" value="${customerInfo.customerId!''}">
+            <input type="hidden" id="relationId" name="relationId" value="${cmRelation.relationId!''}">
             <input type="hidden"  name="customerIsVisit"  value="1" >
 
             <input type="hidden" id="isNeedSelectOrder" name="isNeedSelectOrder" value="${customerInfo.isNeedSelectOrder}">
@@ -448,32 +449,67 @@
                     <input type="text" class="input-text" value="${cmRelation.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
                 </div>
             </div>
-            <div class="row cl recipientAddress" id="" style="display: none;">
+
+            <#--<div class="row cl recipientAddress relation_address" id="TDScollect" style="display: none;" code="returnCode" msg="resultMsg" data="returnMsg">-->
+                <#--<input type="hidden" id="addressInfo">-->
+                <#--<label class="form-label col-1 col-sm-1"></label>-->
+                <#--<div class="formControls col-2 col-sm-2" style="position: relative;">-->
+                    <#--<span class="select-box">-->
+                        <#--<select name="provinceNumber" class="select" id="province"-->
+                                <#--ulcValName="province" ulcValId="provinceId"  ulcURL="/address/list_province" ulcMsg="" ulcList="provinceList"-->
+                                <#--ulcIsFristSelect="true" ulcFristSelectMsg="请选择省份">-->
+                        <#--</select>-->
+                    <#--</span>-->
+                <#--</div>-->
+                <#--<div class="formControls col-2 col-sm-2">-->
+                    <#--<span class="select-box">-->
+                        <#--<select name="cityNumber" class="select" id="city"-->
+                                <#--ulcValName="city" ulcValId="cityId"  ulcURL="/address/list_city?provinceId=" ulcMsg="" ulcList="cityList"-->
+                                <#--ulcIsFristSelect="true" ulcFristSelectMsg="请选择市">-->
+                        <#--</select>-->
+                    <#--</span>-->
+                <#--</div>-->
+                <#--<div class="formControls col-2 col-sm-2" style="position: relative;">-->
+                    <#--<span class="select-box">-->
+                        <#--<select name="areaNumber" class="select" id="district"-->
+                                <#--ulcValName="district" ulcValId="districtId"  ulcURL="/address/list_district?cityId=" ulcMsg="" ulcList="districtList"-->
+                                <#--ulcIsFristSelect="true" ulcFristSelectMsg="请选择区/县">-->
+                        <#--</select>-->
+                    <#--</span>-->
+                <#--</div>-->
+                <#--<input type="hidden" name="relationSendMergeAddress" id="relationSendMergeAddress">-->
+            <#--</div>-->
+
+            <div class="row cl recipientAddress relation_address" style="display: none;" code="returnCode" msg="resultMsg" data="returnMsg">
                 <input type="hidden" id="addressInfo">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
                     <span class="select-box">
-                         <select id="province" class="select" name="provinceNumber">
-
-                         </select>
-                     </span>
+                        <select name="provinceNumber" class="select" id="province"
+                                ulcValName="province" ulcValId="provinceId"  ulcURL="/address/list_province" ulcMsg="" ulcList="provinceList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择省份">
+                        </select>
+                    </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                        <select id="city" class="select" name="cityNumber">
+                        <select name="cityNumber" class="select" id="city"
+                                ulcValName="city" ulcValId="cityId"  ulcURL="/address/list_city?provinceId=" ulcMsg="" ulcList="cityList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择市">
                         </select>
                     </span>
                 </div>
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
                     <span class="select-box">
-                        <select id="district" class="select" name="areaNumber">
+                        <select name="areaNumber" class="select" id="district"
+                                ulcValName="district" ulcValId="districtId"  ulcURL="/address/list_district?cityId=" ulcMsg="" ulcList="districtList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择区/县">
                         </select>
                     </span>
                 </div>
-
                 <input type="hidden" name="relationSendMergeAddress" id="relationSendMergeAddress">
-
             </div>
+
             <div class="row cl recipientAddress" id="" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
@@ -710,9 +746,9 @@
 
 <script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
-<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>-->
+<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>-->
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 
@@ -729,6 +765,8 @@
 
     /*加载TDS地址信息*/
     var addressUlc = init_address($(".init_address"));
+    //处理方式   地址信息
+    var ulcRelationAddress = init_address($(".relation_address"));
 
     var customerId = "${customerInfo.customerId!''}";
 
@@ -955,24 +993,27 @@
      * 设置省市区
      */
     function setAddressInfo(){
-        var proId = setPro(null,1);  //创建省
-        <#if cmRelation.provinceNumber?? >
-            var proId = ${cmRelation.provinceNumber!''};
-            $("#province option[value='"+ proId +"']").attr("selected","true"); //设置省
-        </#if>
-
-        var cityId = setCity(null,proId,2);
-        <#if cmRelation.cityNumber?? >
-            var cityId = ${cmRelation.cityNumber!''};
-            $("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市
-        </#if>
-
-        setDistrict(null, cityId, 2);
-        <#if cmRelation.areaNumber?? >
-            var disId = ${cmRelation.areaNumber!''};
-            $("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区
-            isInitAddress = 1;
-        </#if>
+        ulcRelationAddress.setUlcById(0,${cmRelation.provinceNumber!''},${cmRelation.cityNumber!''},${cmRelation.areaNumber!''});
+
+        <#--var proId = setPro(null,1);  //创建省-->
+        <#--<#if cmRelation.provinceNumber?? >-->
+            <#--var proId = ;-->
+            <#--$("#province option[value='"+ proId +"']").attr("selected","true"); //设置省-->
+        <#--</#if>-->
+
+        <#--var cityId = setCity(null,proId,2);-->
+        <#--<#if cmRelation.cityNumber?? >-->
+            <#--var cityId = ${cmRelation.cityNumber!''};-->
+            <#--$("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市-->
+        <#--</#if>-->
+
+        <#--setDistrict(null, cityId, 2);-->
+        <#--<#if cmRelation.areaNumber?? >-->
+            <#--var disId = ${cmRelation.areaNumber!''};-->
+            <#--$("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区-->
+        <#--</#if>-->
+
+        isInitAddress = 1;
     }
 </script>
 <!--/请在上方写此页面业务相关的脚本-->

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -13,19 +13,19 @@ getCompany();
 /*===============================TDS 城市加载  -- start -- =============================== */
 $(function(){
 
-    $("#province").ProvinceCity();
+    // $("#province").ProvinceCity();
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',
         radioClass: 'iradio-blue',
         increaseArea: '20%'
     });
-    $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
-        console.log($(this)[0].value);
-        $("#city2").click()
-    },
-        attachObject:'#suggest'
-    });
-    $("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
+    // $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
+    //     console.log($(this)[0].value);
+    //     $("#city2").click()
+    // },
+    //     attachObject:'#suggest'
+    // });
+    // $("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
 });
 /*===============================TDS 城市加载  -- start -- =============================== */
 
@@ -448,12 +448,12 @@ function initProcessResult(procMethodIsBack,procMethodIsSend){
             setAddressInfo();       //修改页面才会调用
         }else{
             /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
-            if(isInitAddress == 0){
-                var proId = setPro(null,2);
-                var cityId = setCity(null,proId,2);
-                setDistrict(null,cityId,2);
-                isInitAddress = 1;
-            }
+            // if(isInitAddress == 0){
+            //     var proId = setPro(null,2);
+            //     var cityId = setCity(null,proId,2);
+            //     setDistrict(null,cityId,2);
+            //     isInitAddress = 1;
+            // }
         }
 
         $("#salesChannelsSelect").show();  //展示销售公司
@@ -726,15 +726,6 @@ function sendPhone(type,node){
     }else if(type == "m"){
         phone = $("#m-phone").val();
         questionId = complaint_questionId;
-
-        //desc = UE.getEditor('sendAddressSms').getContent();
-        //desc = $("#sendAddressSmsHtml").html();    //取值从html填写  -- 邮寄地址不用传过去，直接后台取
-
-        // if(desc == null || desc == ""){
-        //     layer.close(index);
-        //     layer.msg("请填写邮寄信息内容！", {icon: 5, time: 3000});
-        //     return false;
-        // }
     }else{
         layer.close(index);
         layer.msg("发送报错！", {icon: 5, time: 3000});
@@ -944,7 +935,7 @@ function setSelectOrder(orderId){
             $("#showSalesOrderId").html(html);  //显示订单
 
             $("#addressInfo").val(address);
-            setAdress();  //显示地址
+            setAdress(address);  //显示地址
             setProduce(orderItemList); //显示产品
 
             $("#companyId").val(companyId);
@@ -962,29 +953,40 @@ function setSelectOrder(orderId){
 /**
  * 设置地址
  */
-function setAdress(){
-    var addres = $("#addressInfo").val();
-
+function setAdress(addres){
     $("#addrssMsg").html("");
     if(addres == null){
         $("#addrssMsg").html("*未能获取到地址，请手动选择地址");
         return;
     }
     var addresList = addres.split("-");
-    if(addresList[0] == null || addresList[1]==null || addresList[2]==null || addresList[3]==null){
-        $("#addrssMsg").html("*未能获取到地址，请手动选择地址");
-        return;
-    }
-    var proId = setPro(getAddress(addresList[0],0),1);
-    var cityId = setCity(getAddress(addresList[1],1),proId,1);
-    setDistrict(getAddress(addresList[2],2),cityId,1);
-    var sendAddress = addresList[3];
-    if(addresList.length > 4){
-        for(var k = 4;k< addresList.length;k++){
-            sendAddress += addresList[k];
+    if(addresList == null || addresList.length < 3){
+        addresList = addres.split(" ");
+        if(addresList == null || addresList.length < 3){
+            addresList = addres.split("_");
+            if(addresList == null || addresList.length < 3){
+                addresList = addres.split("@");
+                if(addresList == null || addresList.length < 3){
+                    $("#addrssMsg").html("*未能获取到地址，请手动选择地址:"+addres);
+                    return;
+                }
+            }
         }
     }
-    $("#sendAddress").val(sendAddress);
+    ulcRelationAddress.setUlcByName(0,addresList[0],addresList[1],addresList[2]);
+    $("#sendAddress").val(addresList[3]);
+
+
+    // var proId = setPro(getAddress(addresList[0],0),1);
+    // var cityId = setCity(getAddress(addresList[1],1),proId,1);
+    // setDistrict(getAddress(addresList[2],2),cityId,1);
+    // var sendAddress = addresList[3];
+    // if(addresList.length > 4){
+    //     for(var k = 4;k< addresList.length;k++){
+    //         sendAddress += addresList[k];
+    //     }
+    // }
+
 }
 
 /***
@@ -1037,6 +1039,7 @@ function setPro(provinceName,type) {
     }
     if(province!=null){
         var provinceHtml = ''
+        provinceHtml += '<option value="">请选择省份</option>';
         for(var i=0;i<province.length;i++){
             provinceHtml += '<option value="'+ province[i].provinceId +'">'+ province[i].province +'</option>';
         }
@@ -1446,8 +1449,10 @@ function addCustomerReady(){
     var province = $("#province").find("option:selected").text();
     var city = $("#city").find("option:selected").text();
     var district = $("#district").find("option:selected").text();
-    var relationSendMergeAddress = province + "-" + city + "-" + district;
-    $("#relationSendMergeAddress").val(relationSendMergeAddress);
+    if(district != null  && district != "请选择区/县"){
+        var relationSendMergeAddress = province + "-" + city + "-" + district;
+        $("#relationSendMergeAddress").val(relationSendMergeAddress);
+    }
     /* 地址拼接  */
 
     /*----问题描述- start --*/