From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
index fed9f78..b80eb06 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java
@@ -7,14 +7,13 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
+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.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.bean.SystemDictionary;
-import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.service.SystemDictionaryService;
@@ -31,6 +30,7 @@
import com.matrix.system.hive.service.*;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +56,11 @@
@Controller
@RequestMapping(value = "admin/vipInfo")
public class VipInfoController extends BaseController {
+
+
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
+
@Resource
private SysVipInfoService vipInfoService;
@@ -296,6 +301,9 @@
if(vipInfo.getShopId()==null){
vipInfo.setShopId(users.getShopId());
}
+ if(vipInfo.getCompanyId()==null){
+ vipInfo.setCompanyId(users.getCompanyId());
+ }
return add(vipInfoService, vipInfo, "会员信息");
}
}
@@ -329,8 +337,14 @@
@RequestMapping(value = "/del")
public @ResponseBody
AjaxResult del(String keys) {
-
- return remove(vipInfoService, keys);
+ List<Long> ids = StringUtils.strToCollToLong(keys, ",");
+ int i = vipInfoService.removeLogic(ids);
+ if (i > 0) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功删除" + i + "条数据");
+ } else {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "删除失败");
+ }
+// return remove(vipInfoService, keys);
}
/**
@@ -605,12 +619,14 @@
return showList(vipInfoService, info, null);
}
+
+
@RequestMapping(value = "/importVipInfo")
@ResponseBody
public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException {
String fileName = file.getOriginalFilename();
- String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+ String dirPath = fileStoragePath;
// String dirPath = "C:/Users/wzy19/Desktop/zq";
File fileDir = new File(dirPath);
LogUtil.info("#----->{}#", fileDir.exists());
@@ -633,4 +649,23 @@
public String toImportForm() {
return "admin/hive/vip/vipImport-form";
}
+
+ @RequestMapping(value = "/validFlagChange")
+ @ResponseBody
+ public AjaxResult validFlagChange(Long id) {
+ SysVipInfo sysVipInfo = vipInfoService.findById(id);
+
+ if (sysVipInfo == null) {
+ return AjaxResult.buildFailInstance("用户不存在");
+ }
+
+ if (SysVipInfo.VALID_FLAG_Y == sysVipInfo.getValidFlag()) {
+ sysVipInfo.setValidFlag(SysVipInfo.VALID_FLAG_N);
+ } else {
+ sysVipInfo.setValidFlag(SysVipInfo.VALID_FLAG_Y);
+ }
+
+ vipInfoService.modify(sysVipInfo);
+ return AjaxResult.buildSuccessInstance("设置成功");
+ }
}
--
Gitblit v1.9.1