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

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -869,7 +869,7 @@ public class AdminCustomerController {
     public ResponseJson updateRenewedInfo(HttpServletRequest request, Renewed renewed) throws Exception {
         String closedProducts = request.getParameter("closed_products");
         String closedFittings = request.getParameter("closed_fittings");
-
+        String mergeAddress = request.getParameter("merge_address");
         if (!StringUtils.isNotEmpty(renewed.getRenewedId().toString())) {
             return new ResponseJson(500, "该换新信息不能修改!", 500);
         }
@@ -879,6 +879,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(renewed.getRenewedBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
         }
+        if (StringUtils.isNotEmpty(mergeAddress)) {
+            renewed.setRenewedSendMergeAddress(mergeAddress);
+        }
         //修改换新信息
         int num = renewedService.updateRenewedInfo(renewed, closedProducts, closedFittings);
         if (num > 0) {
@@ -952,6 +955,7 @@ public class AdminCustomerController {
         String provinceNumber = request.getParameter("repairProvinceNumber");
         String cityNumber = request.getParameter("repairCityNumber");
         String areaNumber = request.getParameter("repairAreaNumber");
+        String mergeAddress = request.getParameter("merge_address");
         if (StringUtils.isNotEmpty(provinceNumber)) {
             repair.setProvinceNumber(Integer.parseInt(provinceNumber));
         }
@@ -967,6 +971,9 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(repair.getRepairBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
         }
+        if (StringUtils.isNotEmpty(mergeAddress)) {
+            repair.setRepairSendMergeAddress(mergeAddress);
+        }
 
         /*SalesOrder order = new SalesOrder();
         order.setSalesOrderStatus(1);
@@ -1114,6 +1121,7 @@ public class AdminCustomerController {
         String provinceNumber = request.getParameter("reissueProvinceNumber");
         String cityNumber = request.getParameter("reissueCityNumber");
         String areaNumber = request.getParameter("reissueAreaNumber");
+        String mergeAddress = request.getParameter("merge_address");
         if (!StringUtils.isNotEmpty(reissue.getReissueId().toString())) {
             return new ResponseJson(500, "该售后补寄信息不能修改!", 500);
         }
@@ -1126,6 +1134,9 @@ public class AdminCustomerController {
         if (StringUtils.isNotEmpty(areaNumber)) {
             reissue.setAreaNumber(Integer.parseInt(areaNumber));
         }
+        if (StringUtils.isNotEmpty(mergeAddress)) {
+            reissue.setReissueSendMergeAddress(mergeAddress);
+        }
         //修改售后补寄信息
         int num = reissueService.updateReissueInfo(reissue);
         if (num > 0) {

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

@@ -118,6 +118,7 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
                     <span class="select-box">
                         <select name="reissueAreaNumber" id="reissueAreaNumber" class="select"></select>
+                        <input type="hidden" name="merge_address" id="merge_address">
                     </span>
                 </div>
             </div>
@@ -234,6 +235,10 @@
     /*修改售后补寄信息*/
     function update_reissue_info() {
         var reissue_flag = checkReissue();
+        var reissueProvinceNumber = $("#reissueProvinceNumber").find("option:selected").text();
+        var reissueCityNumber = $("#reissueCityNumber").find("option:selected").text();
+        var reissueAreaNumber = $("#reissueAreaNumber").find("option:selected").text();
+        $('#merge_address').val(reissueProvinceNumber+'-'+reissueCityNumber+'-'+reissueAreaNumber);
         if (reissue_flag) {
             $.ajax({
                 cache: true,

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

@@ -187,6 +187,7 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
                     <span class="select-box">
                         <select name="areaNumber" id="areaNumber" class="select"></select>
+                        <input type="hidden" id="merge_address" name="merge_address">
                     </span>
                 </div>
             </div>
@@ -567,6 +568,10 @@
     /*修改换新信息*/
     function update_renewed_info() {
         var renewed_flag = checkRenewed();
+        var provinceNumber = $("#provinceNumber").find("option:selected").text();
+        var cityNumber = $("#cityNumber").find("option:selected").text();
+        var areaNumber = $("#areaNumber").find("option:selected").text();
+        $('#merge_address').val(provinceNumber+'-'+cityNumber+'-'+areaNumber);
         if (renewed_flag) {
             $.ajax({
                 cache: true,
@@ -763,13 +768,13 @@
     });
 
     /*监听省选择事件*/
-    $(document).on('change', '#repairProvinceNumber', function() {
-        var proId = $("#repairProvinceNumber").val();
-        $('#repairCityNumber option').remove();
-        getCity('repairCityNumber',proId);
+    $(document).on('change', '#provinceNumber', function() {
+        var proId = $("#provinceNumber").val();
+        $('#cityNumber option').remove();
+        getCity('cityNumber',proId);
         var cityId = $("#cityNumber").val();
-        $('#repairAreaNumber option').remove();
-        getDistrict('repairAreaNumber',cityId);
+        $('#areaNumber option').remove();
+        getDistrict('areaNumber',cityId);
     });
 
 </script>

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

@@ -188,6 +188,7 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
                     <span class="select-box">
                         <select name="repairAreaNumber" id="repairAreaNumber" class="select"></select>
+                        <input type="hidden" name="merge_address" id="merge_address">
                     </span>
                 </div>
             </div>
@@ -567,6 +568,10 @@
     /*修改维修信息*/
     function update_repair_info() {
         var repair_flag = checkRepair();
+        var repairProvinceNumber = $("#repairProvinceNumber").find("option:selected").text();
+        var repairCityNumber = $("#repairCityNumber").find("option:selected").text();
+        var repairAreaNumber = $("#repairAreaNumber").find("option:selected").text();
+        $('#merge_address').val(repairProvinceNumber+'-'+repairCityNumber+'-'+repairAreaNumber);
         if (repair_flag) {
             $.ajax({
                 cache: true,