Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-27 89ba913d4f49dbe117be075174601b471b7f8c25

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java

@@ -63,4 +63,7 @@
    @ApiModelProperty("店内商品列表")
    private List<ComShopGoodsVO> goodsList;

    @ApiModelProperty("该商家是否订单完成")
    private Boolean orderDone;

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java

@@ -29,7 +29,7 @@
            "select c.id,c.type_id,css.name as storeName,c.name,c.store_id,c.goods_pic,c.images,c.status,c.sale,c.original_price,c.price,c.unit,c.order,c.stock,c.details,c.remark,c.goods_describe,c.delivery_type,c.delete_status,c.create_at,c.update_at from com_shop_goods c \n" +
            " left join com_shop_store css on c.store_id=css.id\n" +
            " <where>" +
            " and c.delete_status = 1 " +
            " and c.delete_status = 1 and css.delete_status = 1 " +
            "<if test='pageComShopGoodsDTO.storeName != null and pageComShopGoodsDTO.storeName.trim() != &quot;&quot;'>" +
            "and css.name like concat('%',#{pageComShopGoodsDTO.storeName},'%') \n" +
            " </if> " +

 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;

    /**
     * 查询店铺详情