Merge branch 'zhuyajie' into 'master'

群分类查询

See merge request rays/pcloud-book!14

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/GroupClassifyQrcodeDTO.java

 package com.pcloud.book.group.dto;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author lily
@@ -42,6 +43,10 @@ public class GroupClassifyQrcodeDTO implements Serializable {
      * 群二维码标识
      */
     private Long weixinQrcodeId;
+    /**
+     * 群分类价格
+     */
+    private BigDecimal price;
 
     public Long getBookId() {
         return bookId;
@@ -99,6 +104,14 @@ public class GroupClassifyQrcodeDTO implements Serializable {
         this.weixinQrcodeId = weixinQrcodeId;
     }
 
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
     @Override
     public String toString() {
         return "GroupClassifyQrcodeDTO{" +
@@ -109,6 +122,7 @@ public class GroupClassifyQrcodeDTO implements Serializable {
                 ", adviserId=" + adviserId +
                 ", groupQrcodeId=" + groupQrcodeId +
                 ", weixinQrcodeId=" + weixinQrcodeId +
+                ", price=" + price +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupClassifyBiz.java

@@ -7,21 +7,7 @@ import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
 import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
 import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
 import com.pcloud.book.group.entity.BookGroupClassify;
-import com.pcloud.book.group.vo.AddClassifyVO;
-import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
-import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
-import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
-import com.pcloud.book.group.vo.ClassifyNameVO;
-import com.pcloud.book.group.vo.ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcodeVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
-import com.pcloud.book.group.vo.ListClassify4WechatVO;
-import com.pcloud.book.group.vo.ListClassifyVO;
-import com.pcloud.book.group.vo.ListGroupQrParam;
-import com.pcloud.book.group.vo.StatisticVO;
-import com.pcloud.book.group.vo.UpdateClassifyVO;
-import com.pcloud.book.group.vo.UpdateRankVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 
@@ -186,4 +172,6 @@ public interface BookGroupClassifyBiz {
      * @Date:2019/4/17 15:53
      */
     PageBeanNew<ClassifyDTO> listSimpleBookGroupClassify4Adviser(Long adviserId, BookGroupClassify bookGroupClassify, PageParam pageParam);
+
+    PageBeanNew<AdviserClassifyVO> listAdviserClassify(Long adviserId, AdviserClassifyParam adviserClassifyParam);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -30,21 +30,7 @@ import com.pcloud.book.group.entity.BookQrcodeUser;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.RankTypeEnum;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
-import com.pcloud.book.group.vo.AddClassifyVO;
-import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
-import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
-import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
-import com.pcloud.book.group.vo.ClassifyNameVO;
-import com.pcloud.book.group.vo.ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcodeVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
-import com.pcloud.book.group.vo.ListClassify4WechatVO;
-import com.pcloud.book.group.vo.ListClassifyVO;
-import com.pcloud.book.group.vo.ListGroupQrParam;
-import com.pcloud.book.group.vo.StatisticVO;
-import com.pcloud.book.group.vo.UpdateClassifyVO;
-import com.pcloud.book.group.vo.UpdateRankVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.enums.NotifyOriginTypeEnum;
@@ -764,4 +750,19 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         }
         return bookGroupClassifyDao.listPageNew(pageParam,paramMap,"listSimpleBookGroupClassify4Adviser");
     }
+
+    @Override
+    @ParamLog("获取编辑的分类")
+    public PageBeanNew<AdviserClassifyVO> listAdviserClassify(Long adviserId, AdviserClassifyParam adviserClassifyParam) {
+        PageParam pageParam = new PageParam(adviserClassifyParam.getCurrentPage(), adviserClassifyParam.getNumPerPage());
+        Map<String,Object> paramMap = new HashMap<>();
+        paramMap.put("adviserId",adviserId);
+        paramMap.put("classify",adviserClassifyParam.getClassify());
+        PageBeanNew<AdviserClassifyVO> pageBeanNew = bookGroupClassifyDao.listPageNew(pageParam, paramMap, "listAdviserClassify");
+        if(pageBeanNew == null){
+            return new PageBeanNew<>(adviserClassifyParam.getCurrentPage(), adviserClassifyParam.getNumPerPage(), new ArrayList<>());
+        }
+        return pageBeanNew;
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupClassifyFacade.java

 package com.pcloud.book.group.facade;
 
-import com.pcloud.book.group.vo.AddClassifyVO;
-import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
-import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
-import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
-import com.pcloud.book.group.vo.ClassifyNameVO;
-import com.pcloud.book.group.vo.ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcodeVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeExportParamVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
-import com.pcloud.book.group.vo.ListClassify4WechatVO;
-import com.pcloud.book.group.vo.ListClassifyVO;
-import com.pcloud.book.group.vo.ListGroupQrParam;
-import com.pcloud.book.group.vo.StatisticVO;
-import com.pcloud.book.group.vo.UpdateClassifyVO;
-import com.pcloud.book.group.vo.UpdateRankVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.permission.PermissionException;
 
+import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,11 +18,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-
 /**
  * @author lily
  * @date 2019/4/16 21:00
@@ -169,4 +150,12 @@ public interface BookGroupClassifyFacade {
     @GetMapping("getStatistic4Adviser")
     ResponseDto<StatisticVO> getStatistic4Adviser(@RequestHeader("token") String token) throws PermissionException;
 
+    @ApiOperation(value = "获取编辑的所有分类", httpMethod = "POST")
+    @RequestMapping(value = "listAdviserClassify", method = RequestMethod.POST)
+    @ApiImplicitParams({@ApiImplicitParam(name = "token", value = "token", dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "adviserClassifyParam", value = "编辑分类参数", dataType = "AdviserClassifyParam", paramType = "body")
+    })
+    @PostMapping("listAdviserClassify")
+    ResponseDto<PageBeanNew<AdviserClassifyVO>> listAdviserClassify(@RequestHeader("token") String token, @RequestBody AdviserClassifyParam adviserClassifyParam) throws PermissionException;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupClassifyFacadeImpl.java

@@ -2,22 +2,7 @@ package com.pcloud.book.group.facade.impl;
 
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
 import com.pcloud.book.group.facade.BookGroupClassifyFacade;
-import com.pcloud.book.group.vo.AddClassifyVO;
-import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
-import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
-import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
-import com.pcloud.book.group.vo.ClassifyNameVO;
-import com.pcloud.book.group.vo.ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
-import com.pcloud.book.group.vo.GroupQrcodeVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeExportParamVO;
-import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
-import com.pcloud.book.group.vo.ListClassify4WechatVO;
-import com.pcloud.book.group.vo.ListClassifyVO;
-import com.pcloud.book.group.vo.ListGroupQrParam;
-import com.pcloud.book.group.vo.StatisticVO;
-import com.pcloud.book.group.vo.UpdateClassifyVO;
-import com.pcloud.book.group.vo.UpdateRankVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
@@ -25,6 +10,7 @@ import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
 
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -164,4 +150,11 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
         return new ResponseDto<>(statisticVO == null ? new StatisticVO() : statisticVO);
     }
 
+    @Override
+    @PostMapping("listAdviserClassify")
+    public ResponseDto<PageBeanNew<AdviserClassifyVO>> listAdviserClassify(@RequestHeader("token") String token, @RequestBody AdviserClassifyParam adviserClassifyParam) throws PermissionException {
+        Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        return new ResponseDto<>(bookGroupClassifyBiz.listAdviserClassify(adviserId, adviserClassifyParam));
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/AdviserClassifyParam.java

+package com.pcloud.book.group.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lily
+ * @date 2019/6/5 17:36
+ */
+@ApiModel
+public class AdviserClassifyParam {
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer numPerPage;
+
+    @ApiModelProperty("分类名称")
+    private String classify;
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getNumPerPage() {
+        return numPerPage;
+    }
+
+    public void setNumPerPage(Integer numPerPage) {
+        this.numPerPage = numPerPage;
+    }
+
+    public String getClassify() {
+        return classify;
+    }
+
+    public void setClassify(String classify) {
+        this.classify = classify;
+    }
+
+    @Override
+    public String toString() {
+        return "AdviserClassifyParam{" +
+                "currentPage=" + currentPage +
+                ", numPerPage=" + numPerPage +
+                ", classify='" + classify + '\'' +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/AdviserClassifyVO.java

+package com.pcloud.book.group.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lily
+ * @date 2019/6/5 17:30
+ */
+public class AdviserClassifyVO {
+
+    @ApiModelProperty("分类标识")
+    private Long classifyId;
+
+    @ApiModelProperty("图书名")
+    private String bookName;
+
+    @ApiModelProperty("分类名称")
+    private String classify;
+
+    public Long getClassifyId() {
+        return classifyId;
+    }
+
+    public void setClassifyId(Long classifyId) {
+        this.classifyId = classifyId;
+    }
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public String getClassify() {
+        return classify;
+    }
+
+    public void setClassify(String classify) {
+        this.classify = classify;
+    }
+
+    @Override
+    public String toString() {
+        return "AdviserClassifyVO{" +
+                "classifyId=" + classifyId +
+                ", bookName='" + bookName + '\'' +
+                ", classify='" + classify + '\'' +
+                '}';
+    }
+}

pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml

@@ -305,6 +305,7 @@
         c.book_id bookId,
         c.channel_id channelId,
         c.book_group_id bookGroupId,
+        c.price price,
         q.id groupQrcodeId,
         q.weixin_qrcode_id weixinQrcodeId
         from
@@ -583,6 +584,19 @@
         </foreach>
     </select>
 
+    <select id="listAdviserClassify" resultType="AdviserClassifyVO" parameterType="map">
+        select
+            id classifyId, classify, book_name bookName
+        from
+            book_group_classify c
+        left join
+            book b on c.book_id = b.book_id
+        where c.create_user = #{adviserId}
+        <if test="classify!=null">
+            and classify like concat('%', #{classify}, '%')
+        </if>
+    </select>
+
     <select id="getProAssocGroupAndUserNumber" resultType="ProAssocGroupAndUserNumberDTO" parameterType="Long">
         SELECT
             count(1) groupCount,