From 3e859e26a595e075ac566484280bf3e577ac8fac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 17:01:31 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
index 96cf830..595fefd 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
@@ -21,9 +21,7 @@
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.pojo.CzXkVo;
import com.matrix.system.hive.service.*;
-import com.matrix.system.padApi.dto.PadProjectDto;
-import com.matrix.system.padApi.dto.PadSkinDto;
-import com.matrix.system.padApi.dto.PadVipListDto;
+import com.matrix.system.padApi.dto.*;
import com.matrix.system.score.dao.ScoreUseRecordDao;
import com.matrix.system.score.dao.ScoreVipDetailDao;
import com.matrix.system.shopXcx.api.dto.ScoreFlowDto;
@@ -181,6 +179,47 @@
projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
}
+ /**
+ * 会员充值卡的列表显示
+ */
+ @ApiOperation(value = "充值卡的列表显示", notes = "")
+ @PostMapping(value = "/showVipMoneyCardList")
+ public AjaxResult showVipMoneyCardList(@RequestBody PadVipCardDto padVipCardDto) {
+
+ int offset = (padVipCardDto.getPageNum() - 1) * padVipCardDto.getPageSize();
+ int limit = padVipCardDto.getPageSize();
+ PaginationVO pageVo = new PaginationVO();
+ pageVo.setOffset(offset);
+ pageVo.setLimit(limit);
+
+ MoneyCardUse moneyCardUse = new MoneyCardUse();
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardUseService.findVipCardUseInPage(
+ moneyCardUse, pageVo), cardUseService.findTotalVipCardUse(moneyCardUse));
+ }
+
+
+ @Resource
+ private SysProjUseService sysProjUseService;
+
+ @ApiOperation(value = "套餐使用情况", notes = "")
+ @PostMapping(value = "/tcList")
+ public AjaxResult showTc(@RequestBody PadTcDto padTcDto) {
+ int offset = (padTcDto.getPageNum() - 1) * padTcDto.getPageSize();
+ int limit = padTcDto.getPageSize();
+ PaginationVO pageVo = new PaginationVO();
+ pageVo.setOffset(offset);
+ pageVo.setLimit(limit);
+
+ SysProjUse sysProjUse = new SysProjUse();
+ sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
+ List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,null);
+ //设置套餐中的项目
+ projUseList.forEach(taocanProjUse -> {
+ taocanProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(taocanProjUse.getId(),sysProjUse.getStatus()));
+ });
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, projUseList, sysProjUseService.findTotal(sysProjUse));
+ }
+
@Autowired
private SysVipInfoDao sysVipInfoDao;
--
Gitblit v1.9.1