From a8ba074e4b0807cee707614a55e31e34ea0fbbde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 10:29:52 +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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 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 9e6e1c0..ce306d0 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
@@ -19,7 +19,9 @@
import com.panzhihua.service_community.dao.ComShopStoreDAO;
import com.panzhihua.service_community.model.dos.ComShopGoodsAttrDO;
import com.panzhihua.service_community.model.dos.ComShopGoodsDO;
+import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import com.panzhihua.service_community.model.dos.ComShopStoreDO;
+import com.panzhihua.service_community.service.ComShopOrderService;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -27,6 +29,8 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* @auther lyq
@@ -41,9 +45,6 @@
private ComShopGoodsDAO shopGoodsDAO;
@Resource
private ComShopGoodsAttrDAO comShopGoodsAttrDAO;
- @Resource
- private UserService userService;
-
/**
* 查询店铺列表
*
@@ -57,6 +58,11 @@
IPage<PageShopStoreVO> comShopStoreVOIPage = this.baseMapper.pageShopStore(page, pageComShopStoreDTO);
return R.ok(comShopStoreVOIPage);
}
+
+ @Resource
+ private UserService userService;
+ @Resource
+ private ComShopOrderService orderService;
/**
* 查询店铺详情
@@ -185,11 +191,22 @@
.lambda().eq(ComShopGoodsDO::getStoreId,shopStoreDO.getId())
.eq(ComShopGoodsDO::getDeleteStatus,ComShopGoodsDO.deleteStatus.no)
.eq(ComShopGoodsDO::getStatus,ComShopGoodsDO.status.sell));
-
if(!shopGoodsList.isEmpty()){//如果有正常商品则提示无法删除
return R.fail("店铺下有商品正在出售，无法删除店铺");
}
-
+ List<ComShopOrderDO> comShopOrderDOS = orderService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopOrderDO>()
+ .eq(ComShopOrderDO::getStoreId,shopStoreDO.getId()));
+ List<ComShopOrderDO> filterOrder = comShopOrderDOS.stream()
+ .filter(order -> order.getStatus() < ComShopOrderDO.status.dpj)
+ .collect(Collectors.toList());
+ if(!filterOrder.isEmpty()){
+ return R.fail("店铺下还有订单未完成");
+ }
+ //删除商家下的订单
+ comShopOrderDOS.forEach(order->{
+ order.setDeleteStatus(ComShopOrderDO.deleteStatus.yes);
+ orderService.getBaseMapper().updateById(order);
+ });
shopStoreDO.setDeleteStatus(2);
this.baseMapper.updateById(shopStoreDO);
}
--
Gitblit v1.7.1