From 698e4871447e4a7b5459ec1684418d60f6b57269 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 08 五月 2021 15:26:34 +0800
Subject: [PATCH] bugfixed: 商家订单导出问题
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
index 8117877..106ba37 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtBusinessServiceImpl.java
@@ -146,7 +146,7 @@
}
@Override
- public R getComCvtBusiness(Long id, String cityCode) {
+ public R getComCvtBusiness(Long id) {
ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(id);
if (null == comCvtBusinessDO) {
return R.fail("商家不存在");
@@ -157,18 +157,11 @@
if(comCvtBusinessDO.getAreaFlag()==1){
LambdaQueryWrapper<ComActDO> lambdaQueryWrapper = new LambdaQueryWrapper<ComActDO>().eq(ComActDO::getState,0);
- if(!StringUtils.isEmpty(cityCode)){
- lambdaQueryWrapper.eq(ComActDO::getCityCode, cityCode);
- }
comActDOS = comActDAO.selectList(lambdaQueryWrapper);
}else{
List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
if(!ObjectUtils.isEmpty(areaIds)){
List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds);
- if(!StringUtils.isEmpty(cityCode) && busiDO!=null && busiDO.size()>0){
- comActDOS = busiDO.stream().filter(comActDO -> cityCode.equals(comActDO.getCityCode()))
- .collect(Collectors.toList());
- }
}
}
--
Gitblit v1.7.1