Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 df2af91da98ddf3cd12300a42d4b8b657d4ce54f

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java

@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * @auther lyq
@@ -49,7 +50,6 @@
    private ComShopOrderService orderService;
    @Resource
    private UserService userService;

    /**
     * 查询店铺列表
     *
@@ -74,7 +74,9 @@
                                .eq(ComShopOrderDO::getDeleteStatus, 1)
                                .in(ComShopOrderDO::getStatus, notDoneOrderStatus)
                        );
                if (orderCount != null && orderCount.intValue() > 0) {
                if(orderCount==null || orderCount.intValue() <= 0){
                    shopStoreVO.setOrderDone(true);
                }else{
                    shopStoreVO.setOrderDone(false);
                }
            });
@@ -226,7 +228,7 @@
                        .filter(order -> order.getStatus() < ComShopOrderDO.status.dpj)
                        .collect(Collectors.toList());
                if (!filterOrder.isEmpty()) {
                    return R.fail("店铺下还有订单未完成");
                    return R.fail("该商家还有订单未完成，不能删除");
                }
                //删除商家下的订单
                comShopOrderDOS.forEach(order -> {