From 455f0337233018ddd3cc9afbbca7c67dd6add23b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 20:48:29 +0800
Subject: [PATCH] 20210413 后台订单管理修改
---
/dev/null | 0
zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html | 4 ++--
zq-erp/src/main/resources/static/templates/logisticsImport.xlsx | 0
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java | 4 ++--
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
index 3185e15..a26663e 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java
+++ b/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;
}
diff --git a/zq-erp/src/main/resources/static/templates/logisticsImport.xls b/zq-erp/src/main/resources/static/templates/logisticsImport.xls
deleted file mode 100644
index aae51b2..0000000
--- a/zq-erp/src/main/resources/static/templates/logisticsImport.xls
+++ /dev/null
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx b/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx
new file mode 100644
index 0000000..f14dabd
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/logisticsImport.xlsx
Binary files differ
diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html b/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
index 030bd6e..c19f9d2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/logisticsImport-form.html
+++ b/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>
--
Gitblit v1.9.1