From d0d5cbe5c5484a7c5c27cfc3526869bc43edc1f2 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Sat, 07 May 2022 10:28:59 +0800 Subject: [PATCH] 20220505 --- zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 24 +++++++++++++++++++++++- 1 files changed, 23 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 595fefd..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; @@ -86,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); } @@ -175,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)); } @@ -193,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)); } @@ -212,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())); @@ -257,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