From 8a58ae03919ae18cf56980f9d6ba8b0a1a82b3cf Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 27 Dec 2020 23:01:48 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 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 f299c30..a2c7233 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 @@ -36,6 +36,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; /** @@ -79,8 +80,25 @@ 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); + 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; + } queryUse.setQueryKey(serviceVipProjDto.getQueryKey()); List<SysProjUse> projList = projUseService.findInPage(queryUse, null); List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList); -- Gitblit v1.9.1