From c46272806303d309aadac6517417b4177eebca1f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sun, 26 Jun 2022 09:49:05 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpVipInfoController.java | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 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 a412f07..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
@@ -2,6 +2,7 @@
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.anotations.SaveRequestToken;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
@@ -32,7 +33,6 @@
import com.matrix.system.hive.service.SysVipLevelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -43,7 +43,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -142,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 {
@@ -153,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, "会员信息添加失败");
+ }
}
}
@@ -180,15 +189,6 @@
}
- /**
- * 删除会员信息
- */
- @RequestMapping(value = "/del")
- public @ResponseBody
- AjaxResult del(String keys) {
-
- return remove(vipInfoService, keys);
- }
/**
* 弹出框，会员信息
@@ -223,7 +223,8 @@
public @ResponseBody
AjaxResult getVipQuestions(Long id, HttpServletRequest request) {
// 获取会员所有的答案,分类型
- List<Question> questions = questionSerivce.findByVipId(id);
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ List<Question> questions=questionSerivce.findByVipId(id,user.getCompanyId());
request.setAttribute("questions", questions);
AjaxResult result = new AjaxResult();
result.putInMap("questions", questions);
@@ -324,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, "会员修改失败");
+ }
}
@@ -399,26 +406,16 @@
}
@RequestMapping(value = "/exportExcel")
- public void report(ModelMap model, HttpServletRequest request, HttpServletResponse response,
+ public void report(HttpServletResponse response,
SysVipInfo vipInfo)
throws IOException {
+
QueryUtil.setQueryLimitCom(vipInfo );
- if (vipInfo.getVipType() != null && !(vipInfo.getVipType().equals(""))) {
- vipInfo.setVipType(URLDecoder.decode(vipInfo.getVipType(), "UTF-8"));
- }
- if (vipInfo.getVipName() != null && !"".equals(vipInfo.getVipName())) {
- vipInfo.setVipName(URLDecoder.decode(vipInfo.getVipName(), "UTF-8"));
- }
- if (vipInfo.getArrivalWay() != null && !"".equals(vipInfo.getArrivalWay())) {
- vipInfo.setArrivalWay(URLDecoder.decode(vipInfo.getArrivalWay(), "UTF-8"));
- }
- if (vipInfo.getVipState() != null && !"".equals(vipInfo.getVipState())) {
- vipInfo.setVipState(URLDecoder.decode(vipInfo.getVipState(), "UTF-8"));
- }
+
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
- String title = "每日单据明细";
+ String title = "会员资料";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
String[] header = {"会员编号", "姓名", "性别", "手机号码", "会员类型", "会员活跃度", "到店途径", "健康顾问", "所属门店"};
--
Gitblit v1.9.1