From a9c91e3bc4aca78fb0c3333a888ea39eb770cae8 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Fri, 24 Feb 2023 10:27:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=95=86=E5=93=81=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=97=E8=A1=A8=E5=8A=A0=E8=BD=BD=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/configure/ChWebMvcConfigurer.java    |  2 +-
 .../admin/AdminGoodsController.java           |  3 +-
 .../cn/chjyj/szwh/mapper/GoodsMapper.java     |  4 ++-
 .../cn/chjyj/szwh/service/GoodsService.java   |  9 ++++++
 .../szwh/service/impl/GoodsServiceImpl.java   | 32 +++++++++++++++++++
 .../resources/mapper/szwh/GoodsMapper.xml     |  8 +++--
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java b/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
index 0aeaaf2..386bc0b 100644
--- a/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
+++ b/src/main/java/cn/chjyj/szwh/configure/ChWebMvcConfigurer.java
@@ -26,7 +26,7 @@ public class ChWebMvcConfigurer  implements WebMvcConfigurer {
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new ChInterceptor()).addPathPatterns("/admin/**");
+        registry.addInterceptor(new ChInterceptor()).addPathPatterns("/**");
         log.debug("拦截器注册:"+registry.toString());
     }
 
diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index 28b0027..8cbf607 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -124,7 +124,8 @@ public class AdminGoodsController extends BaseController {
         //qmap.put("orderway",StringUtils.isBlank(orderStatus)?"1":orderStatus);
 
         // 查询返回的结果
-        Map retmap = goodsService.getGoodsByMap(qmap,ipage,ilimit);
+        Map retmap = goodsService.getAdminGoodsByMap(qmap,ipage,ilimit);
+        //Map retmap = goodsService.getGoodsByMap(qmap,ipage,ilimit);
 
         // 结果
         jsonObject.put("code",200);
diff --git a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
index dea4280..a6d942c 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
@@ -90,7 +90,9 @@ public interface GoodsMapper {
      * @param gmap
      * @return
      */
-    List<Goods> getGoodsListByMap(@Param("map")Map gmap,@Param("limit") int limit);
+    List<Goods> getGoodsListByMap(@Param("map")Map gmap,
+                                  @Param("startrs")int start,
+                                  @Param("limit") int limit);
 
     /**
      * 筛选产品列表
diff --git a/src/main/java/cn/chjyj/szwh/service/GoodsService.java b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
index d4aaca8..96ad65d 100644
--- a/src/main/java/cn/chjyj/szwh/service/GoodsService.java
+++ b/src/main/java/cn/chjyj/szwh/service/GoodsService.java
@@ -45,6 +45,15 @@ public interface GoodsService {
      */
     Map<String,Object> getGoodsByMap(Map gmap,int page,int limit);
 
+    /**
+     * 管理端商品列表
+     * @param map
+     * @param page
+     * @param limit
+     * @return
+     */
+    Map getAdminGoodsByMap(Map map,int page,int limit);
+
     /**
      * 根据islicode 获取产品信息
      * @param islicode
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index 461675e..a46f687 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -249,6 +249,38 @@ public class GoodsServiceImpl implements GoodsService {
         return retmap;
     }
 
+    /**
+     * 管理端商品列表
+     * @param map
+     * @param page
+     * @param limit
+     * @return
+     */
+    @Override
+    public Map getAdminGoodsByMap(Map map, int page, int limit) {
+        int startrs = page>1?(page-1)*limit:0;
+        int end = page * limit;
+        List<Goods> goodsList = goodsMapper.getGoodsListByMap(map,startrs,limit);
+        //
+        Map rtmap = new HashMap();
+
+        rtmap.put("data", goodsList);
+        // 总的记录
+        int total = goodsMapper.countGoodsListVo(map);
+        rtmap.put("total", total);
+
+        if (total < end) {
+            end = total;
+        }
+
+        rtmap.put("per_page", limit);
+        rtmap.put("start", startrs + 1); // start 默认为0
+        rtmap.put("end", end);
+        rtmap.put("curr_page", page);
+        rtmap.put("last_page", Math.ceil(total/limit));
+        return rtmap;
+    }
+
     @Override
     public Map<String, Object> getGoodsDetail(String islicode) {
         Map retmap = new HashMap();
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index 55f6c16..7764144 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -12,6 +12,8 @@
   goods_status as goodsStatus,old_status as oldStatus,entrust_status as entrustStatus,apply_out as applyOut,is_deleted as isDelete,
   contract_status as contractStatus,contractual_start_time as contractualStartTime, contractualtime_end_time as contractualtimeEndTime
     </sql>
+    <!-- simple columns-->
+    <sql id="scols">id,username,createtime,goods_status as goodsStatus</sql>
     <sql id="tbName">goods</sql>
 
     <!--  统计条件总数  -->
@@ -36,7 +38,7 @@
 
     <!--根据map组装条件进行查询-->
     <select id="getGoodsListByMap" parameterType="java.util.Map" resultType="cn.chjyj.szwh.bean.Goods">
-        SELECT <include refid="column"/>
+        SELECT <include refid="scols"/>
         FROM <include refid="tbName"/>
         <where>
             <foreach collection="map" item="v" index="k" separator="and">
@@ -51,7 +53,7 @@
                 </if>
             </foreach>
         </where>
-        limit #{limit}
+        limit #{startrs},#{limit}
     </select>
 
     <!--根据islicode查询商品 -->
@@ -64,7 +66,7 @@
 
     <!-- 筛选商品列表 -->
     <select id="getGoodsVoList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.vo.GoodsListVo">
-        SELECT g.id,g.username,gd.goods_name,gd.goods_image,gd.price,gd.createtime,
+        SELECT g.id,g.username,g.recommend_sort,g.sale_count,g.click_count,g.is_recommend,gd.goods_name,gd.goods_image,gd.price,gd.createtime,
            gd.updatetime,gd.goods_islicode,gd.goods_entrust,gd.goods_type,gd.charges_type
         FROM goods as g
         INNER JOIN goods_detail as gd