Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-18 c56a36e83371a5aaa4dc314b8c18cd9f4af98837

Merge branch 'local_20221104' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComShopFlowerGoodsMapper.xml

@@ -36,20 +36,20 @@
        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_flower_goods c
        left join com_convenient_merchants ccm on c.store_id=ccm.id
        <where>and
        where  c.delete_status = 1 and ccm.id_del = 0
            <if test='pageComShopFlowerGoodsDTO.storeName != null and pageComShopFlowerGoodsDTO.storeName.trim() != &quot;&quot;'>
                c.delete_status = 1 and ccm.id_del = 0
                and ccm.name like concat('%',#{pageComShopFlowerGoodsDTO.storeName},'%')
            </if>
            <if test='pageComShopFlowerGoodsDTO.name != null and pageComShopFlowerGoodsDTO.name.trim() != &quot;&quot;'>and c.name
                like concat('%',#{pageComShopFlowerGoodsDTO.name},'%')
            <if test='pageComShopFlowerGoodsDTO.name != null and pageComShopFlowerGoodsDTO.name.trim() != &quot;&quot;'>
                and c.name like concat('%',#{pageComShopFlowerGoodsDTO.name},'%')
            </if>
            <if test='pageComShopFlowerGoodsDTO.storeId != null'>and ccm.id=#{pageComShopFlowerGoodsDTO.storeId}
            <if test='pageComShopFlowerGoodsDTO.storeId != null'>
                and ccm.id=#{pageComShopFlowerGoodsDTO.storeId}
            </if>
            <if test='pageComShopFlowerGoodsDTO.status != null'>and c.status like
                concat('%',#{pageComShopFlowerGoodsDTO.status},'%')
            <if test='pageComShopFlowerGoodsDTO.status != null'>
                and c.status like concat('%',#{pageComShopFlowerGoodsDTO.status},'%')
            </if>
        </where>

        order by c.create_at desc
    </select>
    <select id="pageShopGoodsByStoreId" resultType="com.panzhihua.common.model.vos.shop.ComShopFlowerGoodsVO">