From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
index 0cfaa0d..9a12a20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
@@ -27,8 +27,9 @@
@Select("<script>" +
"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" +
- "right join com_shop_store css on c.store_id=css.id\n" +
+ " left join com_shop_store css on c.store_id=css.id\n" +
" <where>" +
+ " and c.delete_status = 1 and css.delete_status = 1 " +
"<if test='pageComShopGoodsDTO.storeName != null and pageComShopGoodsDTO.storeName.trim() != ""'>" +
"and css.name like concat('%',#{pageComShopGoodsDTO.storeName},'%') \n" +
" </if> " +
@@ -38,40 +39,42 @@
"<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> " +
" </where>" +
" order by c.create_at desc" +
"</script>")
- IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO);
+ IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO);
/**
* 根据店铺id查询商品列表
- * @param page 分页参数
- * @param pageComShopStoreDTO 请求参数
- * @return 分页商品列表
+ *
+ * @param page 分页参数
+ * @param pageComShopStoreDTO 请求参数
+ * @return 分页商品列表
*/
@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" +
" where store_id = #{pageComShopStoreDTO.storeId} and delete_status = 1 and status = 1" +
- " order by sale desc,create_at desc "+
+ " order by sale desc,create_at desc " +
"</script> ")
IPage<ComShopGoodsVO> pageShopGoodsByStoreId(Page page, @Param("pageComShopStoreDTO") PageComShopStoreDTO pageComShopStoreDTO);
/**
* 分页查询商品列表
- * @param page 分页参数
- * @param comShopGoodsDTO 请求参数
- * @return 商品列表
+ *
+ * @param page 分页参数
+ * @param comShopGoodsDTO 请求参数
+ * @return 商品列表
*/
@Select("<script> " +
- "select id,`name`,store_id,goods_pic,images,`status`,sale,original_price,price,unit" +
- ",`order`,stock,details,delivery_type, create_at " +
+ "select csg.id,csg.`name`,csg.store_id,csg.goods_pic,csg.images,csg.`status`,csg.sale,csg.original_price " +
+ ",csg.price,csg.unit,csg.`order`,csg.stock,csg.details,csg.delivery_type, csg.create_at " +
" from com_shop_goods as csg " +
- " where 1=1 and csg.delete_status = 1 " +
+ " left join com_shop_store as css on css.id = csg.store_id " +
+ " where 1=1 and csg.delete_status = 1 and css.`status` = 1" +
"<if test='comShopGoodsDTO.name != null and comShopGoodsDTO.name !=""'>" +
" AND csg.`name` like concat('%',#{comShopGoodsDTO.name},'%') " +
" </if> " +
@@ -90,5 +93,4 @@
" order by sale desc,create_at desc " +
" </script>")
IPage<ComShopGoodsVO> pageShopGoodByApps(Page page, @Param("comShopGoodsDTO") ComShopGoodsDTO comShopGoodsDTO);
-
}
--
Gitblit v1.7.1