From 05a82deffa89a22fa35abaa9196053f43cbc1103 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:51:07 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 a29654a..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
@@ -184,6 +184,10 @@
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));
}
@@ -202,6 +206,10 @@
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));
}
@@ -221,7 +229,11 @@
SysProjUse sysProjUse = new SysProjUse();
sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
- List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,null);
+ 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()));
@@ -266,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