CeDo
2021-04-27 7c11b241c3b16bccd1dc9ea62a16d2b5d64dbc4f
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -75,7 +75,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);
                }
            });
@@ -219,7 +221,7 @@
                        .filter(order -> order.getStatus() < ComShopOrderDO.status.dpj)
                        .collect(Collectors.toList());
                if(!filterOrder.isEmpty()){
                    return R.fail("店铺下还有订单未完成");
                    return R.fail("该商家还有订单未完成,不能删除");
                }
                //删除商家下的订单
                comShopOrderDOS.forEach(order->{