From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 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 6ef63fc..e7e992d 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
@@ -6,20 +6,22 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.AddVipDto;
import com.matrix.system.app.dto.ModifyVipDto;
+import com.matrix.system.app.dto.QuestionAnswerDto;
import com.matrix.system.app.dto.VipInfoListDto;
-import com.matrix.system.app.vo.VipInfoDetailVo;
-import com.matrix.system.app.vo.VipInfoListVo;
-import com.matrix.system.app.vo.VipInfoVo;
+import com.matrix.system.app.mapper.MoneyCardUseMapper;
+import com.matrix.system.app.mapper.QuestionMapper;
+import com.matrix.system.app.vo.*;
import com.matrix.system.common.bean.CustomerDataDictionary;
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.hive.action.BaseController;
-import com.matrix.system.hive.bean.MoneyCardUse;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.system.hive.bean.SysVipLevel;
-import com.matrix.system.hive.dao.MoneyCardUseDao;
+import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.*;
+import com.matrix.system.hive.dao.VipAnswerDao;
+import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.MoneyCardUseService;
+import com.matrix.system.hive.service.QuestionSerivce;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.SysVipLevelService;
import io.swagger.annotations.Api;
@@ -53,6 +55,12 @@
@Autowired
private MoneyCardUseService moneyCardUseService;
+ @Autowired
+ private QuestionSerivce questionSerivce;
+
+ @Autowired
+ private VipAnswerDao vipAnswerDao;
+
@ApiOperation(value = "获取会员通讯录列表", notes = "获取会员通讯录列表")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = VipInfoListVo.class)
@@ -66,6 +74,16 @@
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));
}
@@ -147,16 +165,63 @@
if(!DataAuthUtil.hasAllShopAuth()) {
sysVipInfo.setShopId(user.getShopId());
}
-
+ QueryUtil.setQueryLimitCom(sysVipInfo);
return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
}
- @ApiOperation(value = "获取会员卡项列表")
+ @ApiOperation(value = "卡项 - 获取会员卡项列表", notes = "卡项 - 获取会员卡项列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = VipCardListVo.class)
+ })
@GetMapping(value = "/findVipCardInfo/{vipId}")
public AjaxResult findVipCardInfo(@PathVariable("vipId") Long vipId) {
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(vipId);
List<MoneyCardUse> list = moneyCardUseService.findVipCardUseInPage(moneyCardUse, null);
- return null;
+
+ List<VipCardListVo> dataList = MoneyCardUseMapper.INSTANCE.entitiesToCardListVos(list);
+ return AjaxResult.buildSuccessInstance(dataList);
+ }
+
+ @ApiOperation(value = "会员档案 - 获取客户档案问题", notes = "会员档案 - 获取客户档案问题")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = QuestionVo.class)
+ })
+ @GetMapping(value = "/findVipQuestions/{vipId}")
+ public AjaxResult findVipQuestions(@PathVariable("vipId") Long 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);
+ return result;
+ }
+
+ @ApiOperation(value = "会员档案 - 提交会员档案", notes = "会员档案 - 提交会员档案")
+ @PostMapping(value = "/saveVipQuestionsAnswer")
+ public AjaxResult saveVipQuestionsAnswer(@RequestBody QuestionAnswerDto questionAnswerDto) {
+ VipAnswer delAnswer = new VipAnswer();
+ delAnswer.setVipId(questionAnswerDto.getVipId());
+ vipAnswerDao.deleteByModel(delAnswer);
+ if (CollectionUtils.isNotEmpty(questionAnswerDto.getItems())) {
+ List<VipAnswer> vipAnswers = QuestionMapper.INSTANCE.dtosToVipAnswers(questionAnswerDto.getItems());
+ vipAnswerDao.batchInsert(vipAnswers);
+ }
+ 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