From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 09 Oct 2022 21:41:13 +0800
Subject: [PATCH] Merge branch 'score_shop'
---
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 d71a0a0..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
@@ -13,7 +13,6 @@
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;
@@ -243,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;
}
/**
@@ -294,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, "会员信息添加失败");
+ }
+
}
}
@@ -328,15 +339,7 @@
}
- /**
- * 删除会员信息
- */
- @RequestMapping(value = "/del")
- public @ResponseBody
- AjaxResult del(String keys) {
- return remove(vipInfoService, keys);
- }
/**
* 弹出框，会员信息
@@ -473,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, "会员修改失败");
+ }
}
@@ -599,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")
@@ -607,7 +617,9 @@
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;
}
--
Gitblit v1.9.1