Explorar o código

Merge remote-tracking branch 'liujiankang/master'

liujiankang %!s(int64=7) %!d(string=hai) anos
pai
achega
12ce6c4f7d

+ 0 - 8
watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -234,12 +234,4 @@ public class BackGoods  implements Serializable {
     public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
         this.backGoodsUpdateTime = backGoodsUpdateTime;
     }
-
-    public String getBackGoodsAlipayName() {
-        return backGoodsAlipayName;
-    }
-
-    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
-        this.backGoodsAlipayName = backGoodsAlipayName;
-    }
 }

+ 6 - 6
watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -6,15 +6,15 @@ jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
 #\u6D4B\u8BD5
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=rst_test
+jdbc.password=RST_test
 #
 
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
-jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=root
-jdbc.password=root
+#jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=root
+#jdbc.password=root
 ### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD end ######
 
 #pool settings

+ 131 - 96
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -33,13 +33,13 @@
 <body>
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-update-backGoods" name="form-update-backGoods">
-        <div class="row cl">
+        <div class="row cl" style="margin-left: -60px;margin-bottom: 20px;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>当前进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" id="backGoodsId" name="backGoodsId" />
-                <span id="backGoodsSchedule" class="c-red"></span>
+                <input type="hidden" id="backGoodsId" name="backGoodsId" seleType="primary"/>
+                <span id="renewedSchedule" class="c-red"></span>
             </div>
         </div>
         <div id="tab_demo" class="HuiTab">
@@ -47,7 +47,9 @@
 
          <div class="tabCon">
 
-        <#--<input type="hidden" id="customerId" name="customerId" value="${customerId!''}">-->
+            <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
+
+
         <#--<div class="row cl">-->
             <#--<div class="formControls col-2 col-sm-2 text-r">-->
                 <#--<strong>产品寄回</strong>-->
@@ -126,30 +128,28 @@
                 </div>
                 <div class="formControls col-10 col-sm-10">
                     <div style="width: 120px;display: inline-block;margin-right: 10px;">
-			<span class="select-box">
-				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
-                    <option value="">物流公司</option>
-					<option value="sto">申通快递</option>
-                    <option value="yto">圆通快递</option>
-                    <option value="sf">顺丰快递</option>
-                    <option value="ems">邮政EMS</option>
-                    <option value="zto">中通快递</option>
-                    <option value="zjs">宅急送</option>
-                    <option value="yunda">韵达快递</option>
-                    <option value="cces">cces快递</option>
-                    <option value="pick">上门提货</option>
-                    <option value="htky">汇通快递</option>
-                    <option value="ttkdex">天天快递</option>
-                    <option value="stars">星晨急便</option>
-                    <option value="jd">京东快递</option>
-                    <option value="01">其他</option>
-                    <option value="02">上门送货</option>
-				</select>
-			</span>
+                        <span class="select-box">
+                            <select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select" seleType="send">
+                                <option value="">物流公司</option>
+                                <option value="sto">申通快递</option>
+                                <option value="yto">圆通快递</option>
+                                <option value="sf">顺丰快递</option>
+                                <option value="ems">邮政EMS</option>
+                                <option value="zto">中通快递</option>
+                                <option value="zjs">宅急送</option>
+                                <option value="yunda">韵达快递</option>
+                                <option value="cces">cces快递</option>
+                                <option value="pick">上门提货</option>
+                                <option value="htky">汇通快递</option>
+                                <option value="ttkdex">天天快递</option>
+                                <option value="stars">星晨急便</option>
+                                <option value="jd">京东快递</option>
+                                <option value="01">其他</option>
+                                <option value="02">上门送货</option>
+                            </select>
+                        </span>
                     </div>
-                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo" seleType="send">
-                <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
-                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">-->
+                    <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">
                 </div>
             </div>
 
@@ -158,10 +158,10 @@
                     <strong>寄件信息</strong>
                 </div>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
+                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName" seleType="send">
                 </div>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
+                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
                 </div>
             </div>
 
@@ -169,7 +169,7 @@
                 <div class="formControls col-2 col-sm-2">
                 </div>
                 <div class="formControls col-8 col-sm-8 text-c">
-                    <button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>
+                    <button onClick="update_back_goods(1);" class="btn btn-primary" type="button">确认提交</button>
                 </div>
             </div>
          </div>
@@ -204,15 +204,19 @@
             </div>
         </div>
 
-                <div class="row cl" id="postageInformation">
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <strong>邮费信息</strong>
-                    </div>
-                    <div class="formControls col-2 col-sm-2 text-r">
-                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
-                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
-                    </div>
-                </div>
+        <div class="row cl" id="postageInformation">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong>邮费信息</strong>
+            </div>
+            <div class="formControls col-2 col-sm-2 text-r">
+                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
+                <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
+                <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="backGoodsAlipayName" name="backGoodsAlipayName" seleType="postage">
+
+            </div>
+        </div>
+
+
         <div class="row cl" style="display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
@@ -224,6 +228,7 @@
                 <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
             </div>
         </div>
+
         <#--<div class="row cl">-->
             <#--<div class="formControls col-2 col-sm-2 text-r">-->
                 <#--<strong>寄回产品</strong>-->
@@ -269,9 +274,10 @@
             <div class="formControls col-2 col-sm-2">
             </div>
             <div class="formControls col-8 col-sm-8 text-c">
-                <button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>
+                <button onClick="update_back_goods(2);" class="btn btn-primary" type="button">确认提交</button>
             </div>
         </div>
+
            </div>
     </form>
     </div>
@@ -539,17 +545,26 @@
     }
 
     /*修改售后退货信息*/
-    function update_back_goods() {
-        var backGoods_flag = checkBackGoods();
+    function update_back_goods(type) {
+        var backGoods_flag = checkBackGoods(type);
 
         var backGoodsBackPostage = $("#backGoodsBackPostage").val();
         $("#backGoodsBackPostage").val(parseInt(backGoodsBackPostage*100));
 
+        var obj = null;
+        if(type == 1){
+            obj = getseleType("send");
+        }else if(type == 2){
+            obj = getseleType("postage");
+        }else if(type ==3){
+            obj = getseleType("sendInformation");
+        }
+
         if (backGoods_flag) {
             $.ajax({
                 cache: true,
                 type: "POST",
-                data: $('#form-update-backGoods').serialize(),
+                data: obj,
                 url: "${path}/admin/customer/update_back_goods",
                 async: false,
                 success: function(data){
@@ -569,85 +584,105 @@
                 }
             })
         }
+
+
     }
 
     /*校验退货填写信息*/
-    function checkBackGoods() {
+    function checkBackGoods(type) {
         var backGoods_flag = true;
+
         var backGoodsBackStatus = $('input[name="backGoodsBackStatus"]:checked').val();//寄回状态
-        var backGoodsBackLogisticsNo = $('#backGoodsBackLogisticsNo').val().trim();//物流单号
+        var backGoodsBackLogisticsNo = $('#backGoodsBackLogisticsNo').val();//物流单号
         var backGoodsBackPostage = $('#backGoodsBackPostage').val().trim();//寄回邮费
         var backGoodsBackLogisticsCompany = $("#backGoodsBackLogisticsCompany option:selected").val();//寄回物流公司
         var backGoodsBackName = $('#backGoodsBackName').val();
         var backGoodsBackTel = $('#backGoodsBackTel').val();
-        /*var backGoodsBackMachineNo = $('#backGoodsBackMachineNo').val();*/
-        if (backGoodsBackStatus == 1) {
-//            if (backGoodsBackLogisticsNo != null && backGoodsBackLogisticsNo != '') {
-//                alert("产品未寄回,不能有物流信息!");
-//                vailErrorMsg($("#datemin"),"产品未寄回,不能有物流信息!");
-//                backGoods_flag = false;
-//                return backGoods_flag;
-//            }
-//            if (backGoodsBackPostage != null && backGoodsBackPostage != '') {
-//                alert("产品未寄回,不能有邮费!");
-//                backGoods_flag = false;
-//                return backGoods_flag;
-//            }
-//            if (backGoodsBackLogisticsCompany != null && backGoodsBackLogisticsCompany != '') {
-//                alert("产品未寄回,不能选择物流公司!");
-//                backGoods_flag = false;
-//                return backGoods_flag;
-//            }
-//            if (backGoodsBackName != null && backGoodsBackName != '') {
-//                alert("产品未寄回,不能填写寄回人信息!");
-//                backGoods_flag = false;
-//                return backGoods_flag;
-//            }
-//            if (backGoodsBackTel != null && backGoodsBackTel != '') {
-//                alert("产品未寄回,不能填写寄回人电话号码!");
-//                backGoods_flag = false;
-//                return backGoods_flag;
-//            }
-            /*if (backGoodsBackMachineNo != null && backGoodsBackMachineNo != '') {
-                alert("产品未寄回,不能填写机器编号!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }*/
-        } else if (backGoodsBackStatus == 2 || backGoodsBackStatus == 3) {
-            if (backGoodsBackLogisticsNo == null || backGoodsBackLogisticsNo == '') {
-                vailErrorMsg($('#backGoodsBackLogisticsNo'),"物流信息不能为空!");
-                backGoods_flag = false;
-                return backGoods_flag;
+        var backGoodsAlipay = $("#backGoodsAlipay").val();
+        var backGoodsAlipayName = $("#backGoodsAlipayName").val();
+
+        if(type == 1 ){ //寄回信息
+            if(backGoodsBackStatus == 2 || backGoodsBackStatus == 3){
+                if (backGoodsBackLogisticsCompany == null || backGoodsBackLogisticsCompany == '') {
+                    vailErrorMsg($('#backGoodsBackLogisticsCompany'),"需要选择物流公司!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (backGoodsBackLogisticsNo == null || backGoodsBackLogisticsNo == '') {
+                    vailErrorMsg($('#backGoodsBackLogisticsNo'),"需要填写物流单号!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (backGoodsBackName == null || backGoodsBackName == '') {
+                    vailErrorMsg($('#backGoodsBackName'),"需要填写寄件人信息!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (backGoodsBackTel == null || backGoodsBackTel == '') {
+                    vailErrorMsg($('#backGoodsBackTel'),"需要填写寄件人信息!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+                if (!mobile.test(backGoodsBackTel)) {
+                    vailErrorMsg($('#backGoodsBackTel'),"寄回人电话号码格式不正确,请重新输入!");
+                    backGoods_flag = false;
+                    return backGoods_flag;
+                }
+//                if (!uname.test(backGoodsBackName)) {
+//                    alert("寄回人信息格式不正确,请重新输入!");
+//                    backGoods_flag = false;
+//                    return backGoods_flag;
+//                }
             }
-            if (!money.test(backGoodsBackPostage)) {
-                alert("邮费格式不正确,请重新输入!");
+        }else if(type == 2){
+            if (backGoodsBackPostage == null || backGoodsBackPostage == '') {
+                vailErrorMsg($('#backGoodsBackPostage'),"需要填写邮费!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }
-            if (backGoodsBackLogisticsCompany == null || backGoodsBackLogisticsCompany == '') {
-                vailErrorMsg($('#backGoodsBackLogisticsCompany'),"请选择物流公司!");
+            if (!money.test(backGoodsBackPostage)) {
+                vailErrorMsg($('#backGoodsBackPostage'),"邮费格式不正确,请重新输入!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }
-            if (!uname.test(backGoodsBackName)) {
-                alert("寄回人信息格式不正确,请重新输入!");
+            if (backGoodsAlipay == null || backGoodsAlipay == '') {
+                vailErrorMsg($('#backGoodsAlipay'),"需要填写支付宝账户!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }
-            if (!mobile.test(backGoodsBackTel)) {
-                alert("寄回人电话号码格式不正确,请重新输入!");
+            if (backGoodsAlipayName == null || backGoodsAlipayName == '') {
+                vailErrorMsg($('#backGoodsAlipayName'),"需要填写支付宝姓名!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }
-            /*if (backGoodsBackMachineNo == null || backGoodsBackMachineNo == '') {
-                alert("机器编号不能为空!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }*/
         }
         return backGoods_flag;
     }
 
+    function getseleType(type){
+        var obj = new Object();
+        var oldName = "";
+        $("[seleType="+ type +"]").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name
+                if($(this).attr("type") == "radio"){
+                    obj[name] = $("[name="+ name +"]:checked").val();
+                }else{
+                    obj[name] = $("[name="+ name +"]").val();
+                }
+            }
+        });
+        $("[seleType='primary']").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name;
+                obj[name] = $("[name="+ name +"]").val();
+            }
+        });
+        return obj;
+    }
+
 </script>
 </body>
 </html>

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

@@ -19,8 +19,6 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 20px;background-color: #32a3d8;color: #fff;}
 
-
-
         .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
         .tabBar {border-bottom: 2px solid #222}
         .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}

+ 1 - 1
watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -191,7 +191,7 @@ function keyFun(node,maxNumber,minNumber){
  * 用于展示错误信息,并让该节点得到焦点
  */
 function vailErrorMsg(node,msg){
-    layer.msg(msg, {icon: 5, time: 3000});
+    layer.msg(msg, {icon: 5, time: 2000});
     node.select();
     window.setTimeout(function(){
         node.focus();

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

@@ -65,7 +65,7 @@ var tool = [
     'fontborder', //字符边框
     'superscript', //上标
     'formatmatch', //格式刷
-    'source', //源代码 --
+    // 'source', //源代码 --
     'blockquote', //引用
     'pasteplain', //纯文本粘贴模式
     'selectall', //全选