From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
index 6198d78..2b8dd86 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
@@ -1,14 +1,17 @@
package com.matrix.system.hive.action;
+import cn.hutool.core.util.StrUtil;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.*;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.LogUtil;
+import com.matrix.core.tools.StringUtils;
+import com.matrix.core.tools.WebUtil;
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
@@ -234,6 +237,8 @@
}
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
@@ -243,11 +248,18 @@
public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
String fileName = file.getOriginalFilename();
-// String dirPath = "E:";
- String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+// String dirPath = "E:";
+ String dirPath = fileStoragePath;
- File saveFile = new File(dirPath + "/" + fileName);
- file.transferTo(saveFile);
+ File saveFile =new File (new File(dirPath).getAbsolutePath() + File.separator + fileName);
+ if (!saveFile.exists())
+ {
+ if (!saveFile.getParentFile().exists())
+ {
+ saveFile.getParentFile().mkdirs();
+ }
+ }
+ file.transferTo(saveFile.getAbsoluteFile());
SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
@@ -278,7 +290,7 @@
List<Object> objects = taocanDataList.get(j);
LogUtil.info("导入套餐第" + j + "行" + objects);
Object vipName = objects.get(0);
- String vipNameStr = vipName.toString();
+ String vipNameStr = vipName==null?"":vipName.toString();
if (taocan == null
|| (taocan != null && StringUtils.isNotBlank(vipNameStr))) {
//切换下一个套餐
@@ -319,13 +331,14 @@
Object tel = objects.get(1);
if (tel != null) {
String telStr = tel.toString();
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr,sysUsers.getCompanyId());
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(StrUtil.trim(telStr),sysUsers.getCompanyId());
if (vipInfo == null) {
vipInfo = new SysVipInfo();
vipInfo.setShopId(sysUsers.getShopId());
vipInfo.setPhone(telStr);
vipInfo.setPhoto(defaultWoman);
vipInfo.setName(objects.get(0).toString());
+ vipInfo.setIsDelete(Dictionary.DELETED_N);
vipInfoDao.insert(vipInfo);
}
@@ -376,13 +389,14 @@
Object tel = objects.get(1);
if (tel != null) {
String telStr = tel.toString();
- SysVipInfo vipInfo = vipInfoDao.selectByPhone(telStr,sysUsers.getCompanyId());
+ SysVipInfo vipInfo = vipInfoDao.selectByPhone(StrUtil.trim(telStr),sysUsers.getCompanyId());
if (vipInfo == null) {
vipInfo = new SysVipInfo();
vipInfo.setShopId(sysUsers.getShopId());
vipInfo.setPhone(telStr);
vipInfo.setPhoto(defaultWoman);
vipInfo.setName(objects.get(0).toString());
+ vipInfo.setIsDelete(Dictionary.DELETED_N);
vipInfoDao.insert(vipInfo);
}
String goodNo = String.valueOf(objects.get(3));
--
Gitblit v1.9.1