فهرست منبع

修改客诉bug

wangxiaoming 6 سال پیش
والد
کامیت
a153da2a8d

+ 2 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -1138,6 +1138,7 @@ public class AdminOrderController {
                                 efastOrderStyle.setStyleColor("color:red;");
                         }
                         newFaultNum ++;
+                        break;
                     }else{
                         for(EfastOrder efastOrderStyle:orderEfasts){
                             if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
@@ -1152,6 +1153,7 @@ public class AdminOrderController {
                             efastOrderStyle.setStyleColor("color:red;");
                     }
                     newFaultNum ++;
+                    break;
                 }
          }
         /*if(!bl){

+ 421 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order_new.ftl

@@ -0,0 +1,421 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <#include "/base/list_base.ftl">
+    <link rel="stylesheet" type="text/css" href="${path}/common/lib/jquery.ui/jquery-ui.css" />
+    <title>Excel - 选择文件内容 - Watero-RST 1.0</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 订单管理 <span class="c-gray en">&gt;</span> 文件内容转换 <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
+<div class="page-container">
+    <input type="hidden" id="productUrl" value="${productUrl}">
+    <table class="table table-border table-bordered table-bg">
+        <thead>
+        <tr class="text-c">
+            <th width="50">对象名称</th>
+            <th width="400">文件头&nbsp;&nbsp;&nbsp;(选择您上传文件中和“对象名称”匹配的列,如是多列构成,则选择多列并拖动选择顺序)</th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr class="text-c">
+                <td width="55">平台订单编号</td>
+                <td style="text-align: left;">
+                    <select class="my-select" name="addr-platformOrders" id="addr-platformOrders" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">收货人姓名</td>
+                <td style="text-align: left;">
+                    <select class="my-select" name="addr-name" id="addr-name" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">收货人电话</td>
+                <td style="text-align: left;">
+                <select class="my-select" name="addr-tel" id="addr-tel" style="height: 30px;width: 180px;margin: 0px;">
+                    <#list heads as head>
+                        <option value="${head}" >${head}</option>
+                    </#list>
+                </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">收货人地址</td>
+                <#--<td class="sortable">-->
+                <td style="text-align: left;">
+                    <div style="width: 100%;">
+                        <div class="formControls col-10 col-sm-10 skin-minimal customerSourceType_text_all"  style="width: 100%;">
+                            <div class="radio-box">
+                                <input type="radio" id="cityInfo-1" name="cityInfo" value="1" checked >
+                                <label for="cityInfo-1" style="height: 30px; line-height: 30px;">有省市区信息</label>
+                            </div>
+                            <div class="radio-box">
+                                <input type="radio" id="cityInfo-2" name="cityInfo" value="2" >
+                                <label for="cityInfo-2" style="height: 30px; line-height: 30px;">无省市区信息</label>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div>
+                        <div class="addr-pcd" style="float: left;">
+                            省:
+                            <select class="my-select " name="addr-info" id="addr-province" style="height: 30px;width: 180px;margin: 0px;">
+                            <#list heads as head>
+                                <option value="${head}" >${head}</option>
+                            </#list>
+                            </select>&nbsp;&nbsp;
+                        </div>
+
+                        <div class="addr-pcd" style="float: left;">
+                            市:
+                            <select class="my-select " name="addr-info" id="addr-city" style="height: 30px;width: 180px;margin: 0px;">
+                            <#list heads as head>
+                                <option value="${head}" >${head}</option>
+                            </#list>
+                            </select>&nbsp;&nbsp;
+                        </div>
+
+                        <div class="addr-pcd" style="float: left;">
+                            区:
+                            <select class="my-select " name="addr-info" id="addr-district" style="height: 30px;width: 180px;margin: 0px;">
+                            <#list heads as head>
+                                <option value="${head}" >${head}</option>
+                            </#list>
+                            </select>&nbsp;&nbsp;
+                        </div>
+
+                        <div style="float: left;">
+                            地址详情:
+                            <select class="my-select" name="addr-info" id="addr-addressInfo" style="height: 30px;width: 180px;margin: 0px;">
+                            <#list heads as head>
+                                <option value="${head}" >${head}</option>
+                            </#list>
+                            </select>
+                        </div>
+
+                    </div>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">产品名称</td>
+                <td style="text-align: left;">
+                    <select class="my-select" name="product-name" id="product-name" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">购买产品数量</td>
+                <td style="text-align: left;">
+                    <select class="my-select"  name="product-shop-num" id="product-shop-num" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">备注</td>
+                <td style="text-align: left;">
+                    <select class="my-select" name="product-remark" id="product-remark" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">物流方式</td>
+                <td style="text-align: left;">
+                    <label><input type="radio" value="ems" checked="checked" class="product-post-type" name="product-post-type"/>EMS</label>
+                    <label><input type="radio" value="sto" class="product-post-type" name="product-post-type"/>申通</label>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td width="55">选择仓库</td>
+                <td  style="text-align: left;">
+                    <label>
+                        <select class="my-select" name="shop-id" id="shop-id" style="height: 30px;width: 180px;margin: 0px;">
+                        <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
+                            <#list listStoreInfo as info>
+                                <option value="${info.storeEfast!''}" >${info.storeName!''}</option>
+                            </#list>
+                        </#if>
+                        </select>
+                    </label>
+                </td>
+            </tr>
+            <tr class="text-c">
+                <td colspan="2"  style="text-align: left;">
+                    <button onClick="subToExcel();" class="btn btn-primary radius" type="submit">提交,获取第三方平台和Efast产品关联关系</button>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    <table class="table table-border table-bordered table-bg" id="showProduct" style="display: none">
+        <thead>
+        <tr class="text-c">
+            <th width="50">第三方平台名称</th>
+            <th width="400">请选择和我们平台对应的产品</th>
+        </tr>
+        </thead>
+        <tbody id="tbody">
+        </tbody>
+    </table>
+    <button style="margin-left: 40%;margin-top: 10px;" onClick="sub();" class="btn btn-primary radius" type="submit"><i class="Hui-iconfont">&#xe632;</i> 提交保存,并推送Efast</button>
+
+    <!-- 推送结果 -->
+    <div id="modal-demo" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content radius">
+                <div class="modal-header">
+                    <h3 class="modal-title">本次上传的订单</h3>
+                    <a class="close" data-dismiss="modal" aria-hidden="true" href="javascript:void();">×</a>
+                </div>
+                <div class="modal-body">
+                    <b style="margin-bottom: 10px">
+                        <p>共<span id="order_total"></span>个订单,失败<span style="color: red;" id="order_fault_num"></span>个</p>
+                        <p>总数不对?
+                            &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="check_fault()">查看校验失败内容</button>
+                            &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="download_order_id()">保存交易号</button>
+                        </p>
+                    </b>
+                    <table class="table table-border table-bordered table-bg" style="margin-top: 10px;">
+                        <thead>
+                        <tr class="text-c">
+                            <th width="50">收货人姓名</th>
+                            <th width="80">收货人电话</th>
+                            <th width="50">省份</th>
+                            <th width="50">城市</th>
+                            <th width="50">区域</th>
+                            <th width="200">地址</th>
+                            <th width="80">产品名称</th>
+                            <th width="30">购买数量</th>
+                            <th width="30">备注</th>
+                            <#--<th width="80">推送状态</th>-->
+                        </tr>
+                        </thead>
+                        <tbody id="send_tbody">
+                        </tbody>
+                    </table>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" aria-hidden="true">确定</button>
+                    <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+</body>
+<script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
+<script type="text/javascript">
+
+    var download_order_id_path = "";
+    /*保存交易号*/
+    function download_order_id(){
+        if(download_order_id_path != null && download_order_id_path != ""){
+            window.location.href=root_path + '/admin/order/download_order_txt?file='+download_order_id_path;
+        }
+    }
+
+    // 初始化排序
+//    $(function() {
+//        $( ".sortable" ).sortable({
+//            revert: true
+//        });
+//    });
+
+
+    $(function(){
+        /*监听城市*/
+        $("[name='cityInfo']").on('ifChecked', function(event){
+            if($(this).val() == 1){
+                $(".addr-pcd").show();
+            }else{
+                $(".addr-pcd").hide();
+            }
+        });
+
+        /*初始化单选框样式*/
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    })
+
+
+    // 对话框 - 推送结果
+    function modaldemo(){
+        $("#modal-demo").modal("show")
+    }
+
+    // 获取对应Excel中对应的 我们系统的69码
+    function subToExcel() {
+        var productName = $("#product-name").val();
+        $.post(root_path + "/admin/order/get_producttype_colors",{"productName":productName, "productUrl":$("#productUrl").val()},function(result){
+            if (result.returnCode != 200) {
+                layer.msg('加载失败,请重试!',{icon: 5,time:3000});
+            } else {
+                $("#tbody").html("");
+                for (var i = 0; i < result.returnMsg.values.length; i++) {
+                    var temp = '<tr class="text-c"><td>' + result.returnMsg.values[i] + '</td><td>';
+                    for (var j = 0; j < result.returnMsg.colors.length; j++) {
+                        temp = temp + '<label><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j].colorBar + '_' + result.returnMsg.values[i] + '"/>'
+                                + result.returnMsg.colors[j].colorName + '(' + result.returnMsg.colors[j].colorBar + ')</label>';
+                    }
+                    temp = temp + '</td></tr>';
+                    $("#tbody").append(temp);
+                }
+            }
+        });
+        $("#showProduct").show();
+    }
+
+    // 提交
+    function sub() {
+
+        var map = $(".productmap:checked");                 // 第三方平台的产品信息和Efast的产品信息管理数据 id-name
+        var mapArray = new Array();
+        for (var i = 0; i < map.length; i++) {
+            mapArray[i] = map[i].value;
+        }
+
+        var platformOrders = $(".addr-platformOrders:checked");                 // 订单编号
+        var platformOrdersArray = new Array();
+        for (var i = 0; i < platformOrders.length; i++) {
+            platformOrdersArray[i] = platformOrders[i].value;
+        }
+        var platformOrdersName = platformOrdersArray[0];
+
+        var name = $(".addr-name:checked");                 // 用户名称列
+        var nameArray = new Array();
+        for (var i = 0; i < name.length; i++) {
+            nameArray[i] = name[i].value;
+        }
+
+        var tel = $(".addr-tel:checked");                   // 用户电话列
+        var telArray = new Array();
+        for (var i = 0; i < tel.length; i++) {
+            telArray[i] = tel[i].value;
+        }
+
+        var info = $(".addr-info:checked");                 // 用户收货地址列(可能多个组合)
+        var infoArray = new Array();
+        for (var i = 0; i < info.length; i++) {
+            infoArray[i] = info[i].value;
+        }
+
+        var productShopNum = $(".product-shop-num:checked");// 销售数量
+        var numArray = new Array();
+        for (var i = 0; i < productShopNum.length; i++) {
+            numArray[i] = productShopNum[i].value;
+        }
+
+        var orderRemark = $(".product-remark:checked");// 备注
+        var remarkArray = new Array();
+        for (var i = 0; i < orderRemark.length; i++) {
+            remarkArray[i] = orderRemark[i].value;
+        }
+
+        var productName = $(".product-name:checked");
+
+        if(platformOrdersName == nameArray[0] ){
+            layer.msg('订单编号不能与收货人姓名列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        if(platformOrdersName == telArray[0] ){
+            layer.msg('订单编号与收货人电话列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        if(platformOrdersName == numArray[0] ){
+            layer.msg('订单编号与产品数量列重复!',{icon: 5,time:3000});
+            return false;
+        }
+        for(var k =0;k<infoArray.length;k++){
+            if(infoArray[k] == platformOrdersName){
+                layer.msg('订单编号与地址列重复!',{icon: 5,time:3000});
+                return false;
+            }
+        }
+
+        // 对应好Excel和系统需要的数据以后,准备推送Efast
+        $.post(root_path + "/admin/order/toobj_sendefast",{
+                "filePath":$("#productUrl").val(),
+                "map":mapArray,
+                "platformOrder" : platformOrdersArray,
+                "name":nameArray,
+                "productName":productName.val(),
+                "tel":telArray,
+                "info":infoArray,
+                "postType":$(".product-post-type").val(),
+                "shopId":$("#shop-id").val(),
+                "num":numArray,
+                "remark":remarkArray
+        },function(result){
+            if (result.returnCode != 200) {
+                layer.msg('加载失败,请重试,请确认选择内容对应无误!',{icon: 5,time:3000});
+            } else {
+                var $body = $("#send_tbody");
+                var list = result.returnMsg.order_list;
+                var faultNum = 0;
+                var newFaultNum = result.returnMsg.newFaultNum;
+                var mapSalesOrderSize = result.returnMsg.mapSalesOrderSize;
+                for (var i = 0; i < list.length; i++) {
+                    var order = list[i];
+                    // 推送失败 展示 颜色
+                    var style = order.styleColor;
+                    /*if (order.returnStatus != 'SUCCESS') {
+                        style = 'color:red;';
+                        faultNum ++;
+                    }else{
+                        style = 'color:black;';
+                    }*/
+                    $body.append('<tr class="text-c">'+
+                            '<td style="' + style + '">' + order.orderAddressName + '</td>'+
+                            '<td style="' + style + '">' + order.orderAddressTel + '</td>'+
+                            '<td style="' + style + '">' + order.orderProvince + '</td>'+
+                            '<td style="' + style + '">' + order.orderCity + '</td>'+
+                            '<td style="' + style + '">' + order.orderArea + '</td>'+
+                            '<td style="' + style + '">' + order.orderAddress + '</td>'+
+                            '<td style="' + style + '">' + order.orderProductName + '</td>'+
+                            '<td style="' + style + '">' + order.orderNum + '</td>'+
+                            '<td style="' + style + '">' + order.orderRemark + '</td>'+
+                            /*'<td style="' + style + '">' + order.returnMsg + '</td>'+*/
+                            '</tr>');
+                }
+                error_path = result.returnMsg.errorPath;
+                $("#order_total").text(mapSalesOrderSize);
+                $("#order_fault_num").text(newFaultNum);
+                modaldemo();
+
+                var fileName = result.returnMsg.fileName;
+                download_order_id_path = fileName;
+            }
+        });
+    }
+
+    var error_path = null;
+    function check_fault() {
+        window.location.href = error_path;
+    }
+</script>
+</html>