From 237fc1d3a8127e0c91742096f649f0b4c09a5633 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jun 2022 17:02:34 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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..5731447 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
@@ -8,6 +8,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.CustomerDataDictionary;
import com.matrix.system.common.bean.SysUsers;
@@ -21,9 +22,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;
@@ -88,6 +87,14 @@
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset(offset);
pageVo.setLimit(limit);
+
+ //默认排序
+ if (StringUtils.isBlank(pageVo.getSort())) {
+ pageVo.setSort("create_time");
+ }
+ if (StringUtils.isBlank(pageVo.getOrder())) {
+ pageVo.setOrder("desc");
+ }
return showList(vipInfoService, vipInfo, pageVo);
}
@@ -177,8 +184,61 @@
SysProjUse sysProjUse = new SysProjUse();
sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
sysProjUse.setTaocanId(-1L);
+ sysProjUse.setVipId(padProjectDto.getVipId());
+ if(StrUtil.isNotEmpty(padProjectDto.getState())){
+ sysProjUse.setStatus(padProjectDto.getState());
+ }
return new AjaxResult(AjaxResult.STATUS_SUCCESS,
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();
+ moneyCardUse.setVipId(padVipCardDto.getVipId());
+ if(StrUtil.isNotEmpty(padVipCardDto.getState())){
+ moneyCardUse.setStatus(padVipCardDto.getState());
+ }
+ 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);
+ sysProjUse.setVipId(padTcDto.getVipId());
+ if(StrUtil.isNotEmpty(padTcDto.getState())){
+ sysProjUse.setStatus(padTcDto.getState());
+ }
+ List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,pageVo);
+ //设置套餐中的项目
+ projUseList.forEach(taocanProjUse -> {
+ taocanProjUse.setTaocanProjUse(sysProjUseService.selectTaocanProjUse(taocanProjUse.getId(),sysProjUse.getStatus()));
+ });
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, projUseList, sysProjUseService.findTotal(sysProjUse));
}
@@ -218,6 +278,7 @@
pageVo.setLimit(limit);
SysSkinCheckRecord sysSkinCheckRecord = new SysSkinCheckRecord();
+ sysSkinCheckRecord.setUserId(padSkinDto.getVipId());
List<SysSkinCheckRecord> dataList = sysSkinCheckRecordDao.selectInPage(sysSkinCheckRecord, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
sysSkinCheckRecordDao.selectTotalRecord(sysSkinCheckRecord));
--
Gitblit v1.9.1