From a9fac3d1e2fdba55d61196cc14377c48c66e6daf Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 27 四月 2021 10:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
index c1e9169..a173dad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -28,7 +28,9 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -45,6 +47,10 @@
private ComShopGoodsDAO shopGoodsDAO;
@Resource
private ComShopGoodsAttrDAO comShopGoodsAttrDAO;
+ @Resource
+ private ComShopOrderService orderService;
+ @Resource
+ private UserService userService;
/**
* 查询店铺列表
*
@@ -56,13 +62,26 @@
public R pageStoreList(PageComShopStoreDTO pageComShopStoreDTO) {
Page page = new Page<>(pageComShopStoreDTO.getPageNum(), pageComShopStoreDTO.getPageSize());
IPage<PageShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO);
+ if(comShopStoreVOIPage!=null){
+ Optional.ofNullable(comShopStoreVOIPage.getRecords()).orElse(new ArrayList<>()).forEach(shopStoreVO ->{
+ List<Integer> notDoneOrderStatus = new ArrayList<>();
+ notDoneOrderStatus.add(1);
+ notDoneOrderStatus.add(2);
+ notDoneOrderStatus.add(3);
+ notDoneOrderStatus.add(4);
+ Integer orderCount = orderService.getBaseMapper()
+ .selectCount(new LambdaQueryWrapper<ComShopOrderDO>()
+ .eq(ComShopOrderDO::getStoreId, shopStoreVO.getId())
+ .eq(ComShopOrderDO::getDeleteStatus, 1)
+ .in(ComShopOrderDO::getStatus, notDoneOrderStatus)
+ );
+ if(orderCount!=null && orderCount.intValue()>0){
+ shopStoreVO.setOrderDone(false);
+ }
+ });
+ }
return R.ok(comShopStoreVOIPage);
}
-
- @Resource
- private UserService userService;
- @Resource
- private ComShopOrderService orderService;
/**
* 查询店铺详情
--
Gitblit v1.7.1