From 064c765a04dacbede3674ac7a8a9a201037a47e5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 11:46:07 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 6de9138..411293c 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
@@ -7,6 +7,8 @@
import com.matrix.system.app.dto.AddVipDto;
import com.matrix.system.app.dto.ModifyVipDto;
import com.matrix.system.app.dto.VipInfoListDto;
+import com.matrix.system.app.mapper.MoneyCardUseMapper;
+import com.matrix.system.app.vo.VipCardListVo;
import com.matrix.system.app.vo.VipInfoDetailVo;
import com.matrix.system.app.vo.VipInfoListVo;
import com.matrix.system.app.vo.VipInfoVo;
@@ -15,8 +17,11 @@
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.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.hive.service.SysVipLevelService;
import io.swagger.annotations.Api;
@@ -46,6 +51,9 @@
@Autowired
private CustomerDataDictionaryDao customerDataDictionaryDao;
+
+ @Autowired
+ private MoneyCardUseService moneyCardUseService;
@ApiOperation(value = "获取会员通讯录列表", notes = "获取会员通讯录列表")
@ApiResponses({
@@ -145,8 +153,17 @@
return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo));
}
+ @ApiOperation(value = "获取会员卡项列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = VipCardListVo.class)
+ })
@GetMapping(value = "/findVipCardInfo/{vipId}")
public AjaxResult findVipCardInfo(@PathVariable("vipId") Long vipId) {
- return null;
+ MoneyCardUse moneyCardUse = new MoneyCardUse();
+ moneyCardUse.setVipId(vipId);
+ List<MoneyCardUse> list = moneyCardUseService.findVipCardUseInPage(moneyCardUse, null);
+
+ List<VipCardListVo> dataList = MoneyCardUseMapper.INSTANCE.entitiesToCardListVos(list);
+ return AjaxResult.buildSuccessInstance(dataList);
}
}
--
Gitblit v1.9.1