20210413 后台订单管理修改

xiaoyong931011

2021-04-13 455f0337233018ddd3cc9afbbca7c67dd6add23b

20210413 后台订单管理修改

 zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java

@@ -108,13 +108,13 @@
        List<LogisticsImportVo> logisticsImportVos = logisticsImportFile(saveFile);
        if(CollUtil.isNotEmpty(logisticsImportVos)){
            for(LogisticsImportVo logisticsImportVo : logisticsImportVos){
                infoRemind = infoRemind + logisticsImportVo.getRemark()+";//r//n";
                infoRemind = infoRemind + logisticsImportVo.getRemark()+";";
            }
            ajaxResult = AjaxResult.buildSuccessInstance(infoRemind);
            ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
        }else{
            ajaxResult = AjaxResult.buildSuccessInstance("导入成功");
            ajaxResult.setStatus(AjaxResult.STATUS_FAIL);
            ajaxResult.setStatus(AjaxResult.STATUS_SUCCESS);
        }
        return ajaxResult;
    }

 zq-erp/src/main/resources/static/templates/logisticsImport.xls

Binary files differ

 zq-erp/src/main/resources/static/templates/logisticsImport.xlsx

Binary files differ

 zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html

@@ -104,7 +104,7 @@
                });
            } else {
                layer.open({
                    title: '导入快递单',
                    title: '导入快递单,部分失败',
                    content: data.info
                });
            }
@@ -117,7 +117,7 @@


    function download() {
        window.location.href=  "https://xcshop.csxuncong.com/templates/logisticsImport.xls";
        window.location.href=  "https://xcshop.csxuncong.com/templates/logisticsImport.xlsx";
    }
</script>
</body>