Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 30db4510c06202b3ad0ad4920e561f5f5541d69f

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

@@ -35,9 +35,14 @@
            "<if test='pageComShopGoodsDTO.name != null and pageComShopGoodsDTO.name.trim() != &quot;&quot;'>" +
            "and c.name like concat('%',#{pageComShopGoodsDTO.name},'%') \n" +
            " </if> " +
            "<if test='pageComShopGoodsDTO.storeId != null'>" +
            "and css.id=#{pageComShopGoodsDTO.storeId} \n" +
            " </if> " +

            "<if test='pageComShopGoodsDTO.status != null'>" +
            "and c.status like concat('%',#{pageComShopGoodsDTO.status},'%') \n" +
            " </if> " +
            " order by c.create_at desc" +
            " </where>" +
            "</script>")
    IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO")  PageComShopGoodsDTO pageComShopGoodsDTO);
@@ -64,10 +69,14 @@
     */
    @Select("<script> " +
            "select id,`name`,store_id,goods_pic,images,`status`,sale,original_price,price,unit" +
            ",`order`,stock,details,delivery_type from com_shop_goods as csg " +
            " where 1=1  and csg.delete_status = 1 and csg.status = 1" +
            ",`order`,stock,details,delivery_type, create_at " +
            " from com_shop_goods as csg " +
            " where 1=1  and csg.delete_status = 1 " +
            "<if test='comShopGoodsDTO.name != null and comShopGoodsDTO.name !=&quot;&quot;'>" +
            " AND csg.`name` like concat('%',#{comShopGoodsDTO.name},'%') " +
            " </if> " +
            "<if test='comShopGoodsDTO.status != null '>" +
            " AND csg.`status` = #{comShopGoodsDTO.status}" +
            " </if> " +
            "<if test='comShopGoodsDTO.storeId != null '>" +
            " AND csg.store_id = #{comShopGoodsDTO.storeId} " +
@@ -80,6 +89,6 @@
            " </if> " +
            " order by sale desc,create_at desc " +
            " </script>")
    IPage<ComShopGoodsVO> pageShopGoods(Page page, @Param("comShopGoodsDTO") ComShopGoodsDTO comShopGoodsDTO);
    IPage<ComShopGoodsVO> pageShopGoodByApps(Page page, @Param("comShopGoodsDTO") ComShopGoodsDTO comShopGoodsDTO);

}