Merge branch 'master' of https://gitee.com/youlaitech/youlai-mall

mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/admin/PmsSpuController.java

@@ -30,8 +30,8 @@ public class PmsSpuController {
 
     @ApiOperation(value = "商品分页列表")
     @GetMapping("/pages")
-    public PageResult listPmsSpuPages(SpuPageQuery queryParams) {
-        IPage<PmsSpuPageVO> result = spuServiced.listPmsSpuPages(queryParams);
+    public PageResult getSpuPage(SpuPageQuery queryParams) {
+        IPage<PmsSpuPageVO> result = spuServiced.getSpuPage(queryParams);
         return PageResult.success(result);
     }
 

mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/controller/app/SpuController.java

@@ -29,8 +29,8 @@ public class SpuController {
 
     @ApiOperation(value = "商品分页列表")
     @GetMapping("/pages")
-    public PageResult listSpuPages(SpuPageQuery queryParams) {
-        IPage<SpuPageVO> result = spuService.listSpuPages(queryParams);
+    public PageResult getSpuPageForApp(SpuPageQuery queryParams) {
+        IPage<SpuPageVO> result = spuService.getSpuPageForApp(queryParams);
         return PageResult.success(result);
     }
 

mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/mapper/PmsSpuMapper.java

@@ -20,7 +20,7 @@ public interface PmsSpuMapper extends BaseMapper<PmsSpu> {
      * @param queryParams
      * @return
      */
-    List<PmsSpuPageVO> listPmsSpuPages(Page<PmsSpuPageVO> page, SpuPageQuery queryParams);
+    List<PmsSpuPageVO> getSpuPage(Page<PmsSpuPageVO> page, SpuPageQuery queryParams);
 
     /**
      * 「应用端」商品分页列表
@@ -29,7 +29,7 @@ public interface PmsSpuMapper extends BaseMapper<PmsSpu> {
      * @param queryParams
      * @return
      */
-    List<SpuPageVO> listSpuPages(Page<SpuPageVO> page, SpuPageQuery queryParams);
+    List<SpuPageVO> getSpuPageForApp(Page<SpuPageVO> page, SpuPageQuery queryParams);
 
 
 }

mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/SpuService.java

@@ -24,7 +24,7 @@ public interface SpuService extends IService<PmsSpu> {
      * @param queryParams
      * @return
      */
-    IPage<PmsSpuPageVO> listPmsSpuPages(SpuPageQuery queryParams);
+    IPage<PmsSpuPageVO> getSpuPage(SpuPageQuery queryParams);
 
     /**
      * 「应用端」商品分页列表
@@ -32,7 +32,7 @@ public interface SpuService extends IService<PmsSpu> {
      * @param queryParams
      * @return
      */
-    IPage<SpuPageVO> listSpuPages(SpuPageQuery queryParams);
+    IPage<SpuPageVO> getSpuPageForApp(SpuPageQuery queryParams);
 
 
     /**

mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/service/impl/SpuServiceImpl.java

@@ -59,9 +59,9 @@ public class SpuServiceImpl extends ServiceImpl<PmsSpuMapper, PmsSpu> implements
      * @return
      */
     @Override
-    public IPage<PmsSpuPageVO> listPmsSpuPages(SpuPageQuery queryParams) {
+    public IPage<PmsSpuPageVO> getSpuPage(SpuPageQuery queryParams) {
         Page<PmsSpuPageVO> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
-        List<PmsSpuPageVO> list = this.baseMapper.listPmsSpuPages(page, queryParams);
+        List<PmsSpuPageVO> list = this.baseMapper.getSpuPage(page, queryParams);
         page.setRecords(list);
         return page;
     }
@@ -73,9 +73,9 @@ public class SpuServiceImpl extends ServiceImpl<PmsSpuMapper, PmsSpu> implements
      * @return
      */
     @Override
-    public IPage<SpuPageVO> listSpuPages(SpuPageQuery queryParams) {
+    public IPage<SpuPageVO> getSpuPageForApp(SpuPageQuery queryParams) {
         Page<SpuPageVO> page = new Page<>(queryParams.getPageNum(), queryParams.getPageSize());
-        List<SpuPageVO> list = this.baseMapper.listSpuPages(page, queryParams);
+        List<SpuPageVO> list = this.baseMapper.getSpuPageForApp(page, queryParams);
         page.setRecords(list);
         return page;
     }

mall-pms/pms-boot/src/main/resources/mapper/PmsSpuMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.youlai.mall.pms.mapper.PmsSpuMapper">
 
-    <resultMap id="BaseResultMap" type="com.youlai.mall.pms.pojo.vo.PmsSpuPageVO">
+    <resultMap id="SpuPageMap" type="com.youlai.mall.pms.pojo.vo.PmsSpuPageVO">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="categoryId" column="category_id" jdbcType="BIGINT"/>
@@ -33,7 +33,7 @@
     </resultMap>
 
     <!--「管理端」商品分页列表-->
-    <select id="listPmsSpuPages" resultMap="BaseResultMap">
+    <select id="getSpuPage" resultMap="SpuPageMap">
         SELECT
             t1.id,
             t1.name,
@@ -65,7 +65,7 @@
 
 
     <!--「应用端」商品分页列表-->
-    <select id="listSpuPages" resultType="com.youlai.mall.pms.pojo.vo.SpuPageVO">
+    <select id="getSpuPageForApp" resultType="com.youlai.mall.pms.pojo.vo.SpuPageVO">
         SELECT
             id,
             NAME,