From e23c8975e6bb0934cb5db46a94d0f83c9739d9ab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Mar 2022 16:33:17 +0800
Subject: [PATCH] 重构：套餐项目
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 f50de16..ab9b83e 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
@@ -4,13 +4,11 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
-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.*;
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;
@@ -236,6 +234,8 @@
}
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
@@ -245,8 +245,8 @@
public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
String fileName = file.getOriginalFilename();
- String dirPath = "E:";
- //PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+// String dirPath = "E:";
+ String dirPath = fileStoragePath;
File saveFile = new File(dirPath + "/" + fileName);
file.transferTo(saveFile);
@@ -255,7 +255,7 @@
List<ExcelSheetPO> excelSheetPOList = ExcelUtil.readExcel(saveFile, null, null);
-/*
+
//项目资料导入
List<List<Object>> dataList = excelSheetPOList.get(0).getDataList();
List<SysProjUse> projUseList = new ArrayList<>();
@@ -280,7 +280,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))) {
//切换下一个套餐
@@ -299,7 +299,6 @@
//套餐资料导入=======end===
-*/
//充值卡资料导入
List<List<Object>> cardList = excelSheetPOList.get(2).getDataList();
List<MoneyCardUse> cardUseArrayList = new ArrayList<>();
@@ -389,10 +388,14 @@
vipInfoDao.insert(vipInfo);
}
String goodNo = String.valueOf(objects.get(3));
- String goodName = String.valueOf(objects.get(2)).trim();
-
-
ShoppingGoods goods = shoppingGoodsDao.findByCode(goodNo);
+
+ String goodName = String.valueOf(objects.get(2)).trim();
+ if("储值卡".equals(goodName)){
+ goods= shoppingGoodsDao.selectVipCzGoods();
+ }
+
+
if (goods != null || "储值卡".equals(goodName)) {
moneyCardUse.setVipId(vipInfo.getId());
--
Gitblit v1.9.1