From e04441da5005ca573f590f78b70c45d739a744dc Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 10 Jul 2021 13:44:50 +0800
Subject: [PATCH] 新增美度正式环境配置
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 0a52155..d9987fd 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -2,6 +2,8 @@
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.EncrypUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.AddVipDto;
@@ -15,7 +17,9 @@
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.CustomerDataDictionaryDao;
import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.hive.action.BaseController;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.VipAnswerDao;
@@ -32,6 +36,8 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
import java.util.List;
/**
@@ -74,6 +80,11 @@
if (StringUtils.isBlank(vipInfoListDto.getOrder())) {
vipInfoListDto.setOrder("asc");
}
+
+ int offset = (vipInfoListDto.getPageNum() - 1) * vipInfoListDto.getPageSize();
+ int limit = vipInfoListDto.getPageSize();
+ vipInfoListDto.setOffset(offset);
+ vipInfoListDto.setLimit(limit);
return AjaxResult.buildSuccessInstance(sysVipInfoService.findVipAddressBook(vipInfoListDto));
}
@@ -155,7 +166,7 @@
if(!DataAuthUtil.hasAllShopAuth()) {
sysVipInfo.setShopId(user.getShopId());
}
-
+ QueryUtil.setQueryLimitCom(sysVipInfo);
return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
}
@@ -180,7 +191,8 @@
@GetMapping(value = "/findVipQuestions/{vipId}")
public AjaxResult findVipQuestions(@PathVariable("vipId") Long vipId) {
// 获取会员所有的答案,分类型
- List<Question> questions = questionSerivce.findByVipId(vipId);
+ SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ List<Question> questions = questionSerivce.findByVipId(vipId,user.getCompanyId());
AjaxResult result = AjaxResult.buildSuccessInstance("获取成功");
List<QuestionVo> list = QuestionMapper.INSTANCE.entitiesToVos(questions);
result.putInMap("questions", list);
@@ -199,4 +211,18 @@
}
return AjaxResult.buildSuccessInstance("档案更新成功");
}
+
+ @ApiOperation(value = "用户是否存在资金密码", notes = "用户是否存在资金密码")
+ @GetMapping(value = "/isExistFundPassword/{vipId}")
+ public AjaxResult isExistFundPassword(@PathVariable(value = "vipId") Long vipId) {
+ SysVipInfo vipInfo = sysVipInfoService.findById(vipId);
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
+ if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
+ ajaxResult.putInMap("isExist", true);
+ } else {
+ ajaxResult.putInMap("isExist", false);
+ }
+
+ return ajaxResult;
+ }
}
--
Gitblit v1.9.1