From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 e4c3c05..a0c350b 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
@@ -6,7 +6,7 @@
 import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
 import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
 import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
-import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
+import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -27,18 +27,23 @@
 
     @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 " +
             "<if test='pageComShopGoodsDTO.storeName != null and pageComShopGoodsDTO.storeName.trim() != &quot;&quot;'>" +
             "and css.name like concat('%',#{pageComShopGoodsDTO.storeName},'%') \n" +
             " </if> " +
             "<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> " +
             " </where>" +
+            " order by c.create_at desc" +
             "</script>")
     IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO")  PageComShopGoodsDTO pageComShopGoodsDTO);
 
@@ -63,11 +68,16 @@
      * @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 as csg " +
-            " where 1=1  and csg.delete_status = 1 and csg.status = 1" +
+            "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 " +
+            " 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 !=&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 +90,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);
 
 }

--
Gitblit v1.7.1