From e35651b3e9745db39287bada9d3deb4a6d03938e Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 06 May 2022 15:34:00 +0800 Subject: [PATCH] 20220505 --- zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 132 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 124 insertions(+), 8 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 e5ac024..4cd5937 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 @@ -1,11 +1,14 @@ package com.matrix.system.padApi.action; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.matrix.component.asyncmessage.AsyncMessageManager; import com.matrix.core.constance.MatrixConstance; 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; @@ -15,21 +18,21 @@ import com.matrix.system.constance.Dictionary; import com.matrix.system.hive.action.BaseController; import com.matrix.system.hive.action.util.QueryUtil; -import com.matrix.system.hive.bean.SysOrder; -import com.matrix.system.hive.bean.SysShopInfo; -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.dao.ShoppingGoodsDao; -import com.matrix.system.hive.dao.SysVipLabelDao; +import com.matrix.system.hive.bean.*; +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.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; +import com.matrix.system.shopXcx.api.vo.ScoreUseRecordVo; import com.matrix.system.shopXcx.mqTask.AsyncMessageRouting; import com.matrix.system.wechart.templateMsg.UniformMsgParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -84,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); } @@ -157,6 +168,111 @@ } } + @Resource + private SysProjUseService projUseService; + + @ApiOperation(value = "项目使用情况", notes = "") + @PostMapping(value = "/projectList") + public AjaxResult showTc(@RequestBody PadProjectDto padProjectDto) { + + int offset = (padProjectDto.getPageNum() - 1) * padProjectDto.getPageSize(); + int limit = padProjectDto.getPageSize(); + PaginationVO pageVo = new PaginationVO(); + pageVo.setOffset(offset); + pageVo.setLimit(limit); + + SysProjUse sysProjUse = new SysProjUse(); + sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM); + sysProjUse.setTaocanId(-1L); + 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(); + 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()); + 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)); + } + + + @Autowired + private SysVipInfoDao sysVipInfoDao; + + @Autowired + private ScoreUseRecordDao scoreUseRecordDao; + + @ApiOperation(value = "积分流水记录", notes = "") + @PostMapping(value = "/flowList") + @ApiResponses({ + @ApiResponse(code = 200, message = "ok", response = ScoreUseRecordVo.class) + }) + public AjaxResult getFlowList(@RequestBody ScoreFlowDto scoreFlowDto) { + SysVipInfo vipInfo = sysVipInfoDao.selectById(scoreFlowDto.getVipId()); + scoreFlowDto.setVipId(vipInfo.getId()); + Page<ScoreUseRecordVo> page=new Page<>(scoreFlowDto.getPageNum(),scoreFlowDto.getPageSize()); + IPage<ScoreUseRecordVo> shopScoreRecord = scoreUseRecordDao.selectFlowList(page,scoreFlowDto); + AjaxResult result=AjaxResult.buildSuccessInstance(shopScoreRecord.getRecords(),shopScoreRecord.getTotal()); + return result; + } + + + + @Autowired + private SysSkinCheckRecordDao sysSkinCheckRecordDao; + + @ApiOperation(value = "皮肤检测记录", notes = "") + @PostMapping(value = "/skinList") + public @ResponseBody AjaxResult showList(@RequestBody PadSkinDto padSkinDto) { + + int offset = (padSkinDto.getPageNum() - 1) * padSkinDto.getPageSize(); + int limit = padSkinDto.getPageSize(); + PaginationVO pageVo = new PaginationVO(); + pageVo.setOffset(offset); + pageVo.setLimit(limit); + + SysSkinCheckRecord sysSkinCheckRecord = new SysSkinCheckRecord(); + List<SysSkinCheckRecord> dataList = sysSkinCheckRecordDao.selectInPage(sysSkinCheckRecord, pageVo); + AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, + sysSkinCheckRecordDao.selectTotalRecord(sysSkinCheckRecord)); + return result; + } + /** * 充值 查询门店所有员工 */ -- Gitblit v1.9.1