From 74f10367c4bb507d086cbdc7fd11528582addfb9 Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Mon, 11 Jan 2021 13:23:48 +0800 Subject: [PATCH] 修改跟进bug --- zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 7 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java index f63cc98..59424ef 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java @@ -6,9 +6,11 @@ import com.matrix.core.pojo.PaginationVO; import com.matrix.core.pojo.VerifyResult; import com.matrix.core.tools.DateUtil; +import com.matrix.core.tools.StringUtils; import com.matrix.core.tools.WebUtil; import com.matrix.system.app.dto.CreateServiceOrderDto; import com.matrix.system.app.dto.ServiceOrderListDto; +import com.matrix.system.app.dto.ServiceVipProjDto; import com.matrix.system.app.mapper.SysBeauticianStateMapper; import com.matrix.system.app.mapper.SysProjServiceMapper; import com.matrix.system.app.mapper.SysProjUseMapper; @@ -35,6 +37,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -62,9 +65,9 @@ @ApiResponses({ @ApiResponse(code = 200, message = "ok", response = ServiceProductListVo.class) }) - @GetMapping(value = "/findVipProject/{vipId}") - public AjaxResult findVipProject(@PathVariable("vipId") Long vipId) { - SysVipInfo vipInfo = sysVipInfoService.findById(vipId); + @PostMapping(value = "/findVipProject") + public AjaxResult findVipProject(@RequestBody @Validated ServiceVipProjDto serviceVipProjDto) { + SysVipInfo vipInfo = sysVipInfoService.findById(serviceVipProjDto.getVipId()); if (vipInfo == null) { throw new GlobleException("会员不存在"); @@ -72,14 +75,38 @@ ServiceProductListVo productListVo = new ServiceProductListVo(); productListVo.setName(vipInfo.getVipName()); - productListVo.setVipId(vipId); + productListVo.setVipId(serviceVipProjDto.getVipId()); SysProjUse queryUse = new SysProjUse(); - queryUse.setVipId(vipId); + queryUse.setVipId(serviceVipProjDto.getVipId()); queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM); queryUse.setTaocanId(-1L); - queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); - queryUse.setIsOver(Dictionary.FLAG_NO_N); + if (serviceVipProjDto.getType() != null) { + switch (serviceVipProjDto.getType()) { + case "0": + break; + case "1": + queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); + queryUse.setIsOver(Dictionary.FLAG_NO_N); + break; + case "2": + queryUse.setStatus(Dictionary.TAOCAN_STATUS_WX); + queryUse.setIsOver(Dictionary.FLAG_YES_Y); + break; + case "3": + queryUse.setTargetFailTime(DateUtil.getDateAfterMonth(new Date(), 1)); + break; + default: + queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); + queryUse.setIsOver(Dictionary.FLAG_NO_N); + break; + } + } else { + queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX); + queryUse.setIsOver(Dictionary.FLAG_NO_N); + } + + queryUse.setQueryKey(serviceVipProjDto.getQueryKey()); List<SysProjUse> projList = projUseService.findInPage(queryUse, null); List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList); @@ -109,6 +136,14 @@ if (CollectionUtils.isEmpty(serviceOrderDto.getProjItems())) { throw new GlobleException("请选择服务"); } + SysVipInfo vipInfo = sysVipInfoService.findById(serviceOrderDto.getVipId()); + if (StringUtils.isBlank(vipInfo.getPassWord())) { + return AjaxResult.buildFailInstance("未设置资金密码"); + } + + if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) { + return AjaxResult.buildFailInstance("资金密码错误"); + } SysProjServices sysProjServices = new SysProjServices(); sysProjServices.setVipId(serviceOrderDto.getVipId()); -- Gitblit v1.9.1