From 4f9fed5969a02a4cf74888931ae674b3b27e7302 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sun, 26 Jun 2022 09:48:50 +0800
Subject: [PATCH] fead:库存流向记录新增原单号和会员显示
---
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 74 ++++++++++++++++++++++++++++---------
1 files changed, 56 insertions(+), 18 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..c3daa86 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,12 @@
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.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 +29,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 +55,11 @@
@Controller
@RequestMapping(value = "admin/vipInfo")
public class VipInfoController extends BaseController {
+
+
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
+
@Resource
private SysVipInfoService vipInfoService;
@@ -238,8 +242,9 @@
QueryUtil.setQueryLimit(vipInfo);
-
- return showList(vipInfoService, vipInfo, pageVo);
+ List<SysVipInfo> dataList = vipInfoService.findInPage(vipInfo, pageVo);
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, vipInfoService.findTotal(vipInfo));
+ return result;
}
/**
@@ -289,14 +294,25 @@
public @ResponseBody
AjaxResult addOrModify(SysVipInfo vipInfo) {
if (vipInfo.getId() != null) {
- return modify(vipInfoService, vipInfo, "会员信息");
+ int i = vipInfoService.modify(vipInfo);
+ if (i > 0) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "会员信息修改成功");
+ } else {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "会员信息修改失败");
+ }
} else {
vipInfo.setVipState(Dictionary.VIP_STATE_HY);
SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
if(vipInfo.getShopId()==null){
vipInfo.setShopId(users.getShopId());
}
- return add(vipInfoService, vipInfo, "会员信息");
+ int i = vipInfoService.add(vipInfo);
+ if (i > 0) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "会员信息添加成功");
+ } else {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "会员信息添加失败");
+ }
+
}
}
@@ -323,15 +339,7 @@
}
- /**
- * 删除会员信息
- */
- @RequestMapping(value = "/del")
- public @ResponseBody
- AjaxResult del(String keys) {
- return remove(vipInfoService, keys);
- }
/**
* 弹出框，会员信息
@@ -468,7 +476,12 @@
@RequestMapping(value = "/modifyVip")
public @ResponseBody
AjaxResult modifyVip(SysVipInfo vipInfo) {
- return modify(vipInfoService, vipInfo, "会员");
+ int i = vipInfoService.modify(vipInfo);
+ if (i > 0) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "会员修改成功");
+ } else {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "会员修改失败");
+ }
}
@@ -594,7 +607,9 @@
@RequestMapping(value = "/findAllVipInfo")
@ResponseBody
public AjaxResult findAllVipInfo() {
- return showList(vipInfoService, null, null);
+ List<SysVipInfo> dataList = vipInfoService.findInPage(null, null);
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, vipInfoService.findTotal(null));
+ return result;
}
@RequestMapping(value = "/findAllVipInfoWithShop")
@@ -602,15 +617,19 @@
public AjaxResult findAllVipInfoWithShop() {
SysVipInfo info = new SysVipInfo();
info.setShopId(getMe().getShopId());
- return showList(vipInfoService, info, null);
+ List<SysVipInfo> dataList = vipInfoService.findInPage(info, null);
+ AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, vipInfoService.findTotal(info));
+ return result;
}
+
+
@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 +652,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