From 31d69134d1bcaac9c50b6a57784aeb436d5bd75c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 08 Apr 2021 19:21:10 +0800
Subject: [PATCH] 扫码登录
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 44754b5..01db2dd 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
@@ -42,7 +42,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -131,7 +130,7 @@
if (CollectionUtils.isNotEmpty(serviceTcVos)) {
serviceTcVos.forEach(item -> {
- List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId());
+ List<SysProjUse> sysProjUses = projUseService.selectTaocanProjUse(item.getId(), queryUse.getStatus());
List<ServiceProjVo> taocanProj = SysProjUseMapper.INSTANCE.entityListToProjVoList(sysProjUses);
item.setProj(taocanProj);
});
@@ -151,9 +150,7 @@
throw new GlobleException("请选择服务");
}
SysVipInfo vipInfo = sysVipInfoService.findById(serviceOrderDto.getVipId());
-// if (StringUtils.isBlank(vipInfo.getPassWord())) {
-// return AjaxResult.buildFailInstance("未设置资金密码");
-// }
+
if (StringUtils.isNotBlank(vipInfo.getPassWord())) {
if (!vipInfo.getPassWord().equals(serviceOrderDto.getPassword())) {
@@ -215,6 +212,7 @@
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
orderListDto.setShopId(user.getShopId());
}
+ QueryUtil.setQueryLimitCom(orderListDto);
return AjaxResult.buildSuccessInstance(projServicesService.findApiServiceOrderListInPage(orderListDto, pageVo), projServicesService.findApiServiceOrderListTotal(orderListDto));
}
--
Gitblit v1.9.1