From 6e35192ad8eb1f93a831fc6888e874344ecfd4eb Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 13 Jun 2022 16:29:57 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
index b2b2653..b0d5330 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java
@@ -141,7 +141,12 @@
} catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
e.printStackTrace();
}
- 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 {
try {
@@ -152,7 +157,12 @@
} catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
e.printStackTrace();
}
- 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, "会员信息添加失败");
+ }
}
}
@@ -179,22 +189,6 @@
}
- /**
- * 删除会员信息
- */
- @RequestMapping(value = "/del")
- public @ResponseBody
- AjaxResult del(String 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);
- }
/**
* 弹出框，会员信息
@@ -331,7 +325,13 @@
@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, "会员修改失败");
+ }
}
--
Gitblit v1.9.1