Merge branch 'dx-C1000884' into 'master'

收益管理

See merge request rays/pcloud-book!112

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -553,6 +553,7 @@ public class BookDto extends BaseDto {
      */
     private BigDecimal outRate;
 
+
     public String getQrRemark() {
         return qrRemark;
     }

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

@@ -29,6 +29,11 @@ public interface BookGroupClassifyService {
     @GetMapping("getClassifyQrcodeInfo")
     ResponseEntity<ResponseDto<GroupClassifyQrcodeDTO>> getClassifyQrcodeInfo(@RequestParam("weixinGroupId") String weixinGroupId);
 
+    @ApiOperation("根据id获取微信群分类")
+    @PostMapping("getClassifyByIds")
+    ResponseEntity<ResponseDto<Map<Long, String>>> getClassifyByIds(@RequestBody List<Long> weixinGroupClassifyPrimaryIds);
+
+
     @ApiOperation("根据微信群标识获取相关id")
     @PostMapping("listGroupQrcodeBaseInfo")
     ResponseEntity<ResponseDto<Map<String, GroupQrcodeBaseDTO>>> listGroupQrcodeBaseInfo(@RequestBody List<String> weixinGroupIds);

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

@@ -67,6 +67,13 @@ public interface BookGroupClassifyBiz {
     ClassifyVO getClassify(Long classifyId);
 
     /**
+     * 根据id获取微信群分类
+     * @param weixinGroupClassifyPrimaryIds
+     * @return
+     */
+    Map<Long, String> getClassifyByIds(List<Long> weixinGroupClassifyPrimaryIds);
+
+    /**
      * @Author:lili
      * @Desr:根据规格对应分类信息
      * @Date:2019/4/19 11:46

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

@@ -400,6 +400,22 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     }
 
     @Override
+    @ParamLog("根据主键id获取群分类")
+    public  Map<Long, String> getClassifyByIds(List<Long> weixinGroupClassifyPrimaryIds) {
+        if (ListUtils.isEmpty(weixinGroupClassifyPrimaryIds)) {
+            return new HashMap<>();
+        }
+        List<BookGroupClassify> bookGroupClassifyList = bookGroupClassifyDao.getClassifyByIds(weixinGroupClassifyPrimaryIds);
+        Map<Long, String> classifyMap = new HashMap<>();
+        bookGroupClassifyList.stream().forEach(eachBookGroupClassify ->{
+            Long key = eachBookGroupClassify.getId();
+            String value = eachBookGroupClassify.getClassify();
+            classifyMap.put(key, value);
+        });
+        return classifyMap;
+    }
+
+    @Override
     @ParamLog("根据规格获取分类基本信息（图书，运营，二维码，分类）")
     public ClassifyDTO getBaseInfoBySpecId(Long productSpecId) {
         ClassifyDTO classifyDTO = bookGroupClassifyDao.getBaseInfoBySpecId(productSpecId);

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupClassifyDao.java

@@ -62,6 +62,14 @@ public interface BookGroupClassifyDao extends BaseDao<BookGroupClassify> {
     Integer getClassifyCount(Long bookGroupId);
 
     /**
+     * 据id获取微信分类
+     * @param weixinGroupClassifyPrimaryIds
+     * @return
+     */
+    List<BookGroupClassify> getClassifyByIds(List<Long> weixinGroupClassifyPrimaryIds);
+
+
+    /**
      * @Author:lili
      * @Desr:获取所有分类列表
      * @Date:2019/4/18 19:46

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupClassifyDaoImpl.java

@@ -65,6 +65,10 @@ public class BookGroupClassifyDaoImpl extends BaseDaoImpl<BookGroupClassify> imp
     }
 
     @Override
+    public List<BookGroupClassify> getClassifyByIds(List<Long> weixinGroupClassifyPrimaryIds) {
+        return this.getSqlSession().selectList(this.getStatement("getClassifyByIds"), weixinGroupClassifyPrimaryIds);
+    }
+    @Override
     public List<ListClassifyVO> listAllClassifyByRank(Long bookGroupId) {
         return this.getSqlSession().selectList(this.getStatement("listAllClassifyByRank"), bookGroupId);
     }

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

@@ -43,6 +43,13 @@ public class BookGroupClassifyServiceImpl implements BookGroupClassifyService {
     }
 
     @Override
+    @PostMapping("getClassifyByIds")
+    public ResponseEntity<ResponseDto<Map<Long, String>>> getClassifyByIds(@RequestBody List<Long> weixinGroupClassifyPrimaryIds) {
+        Map<Long, String> groupClassifyMap =  bookGroupClassifyBiz.getClassifyByIds(weixinGroupClassifyPrimaryIds);
+        return ResponseHandleUtil.toResponse(groupClassifyMap);
+    }
+
+    @Override
     @PostMapping("listGroupQrcodeBaseInfo")
     public ResponseEntity<ResponseDto<Map<String, GroupQrcodeBaseDTO>>> listGroupQrcodeBaseInfo(@RequestBody List<String> weixinGroupIds) {
         Map<String, GroupQrcodeBaseDTO> groupQrcodeMap =  bookGroupClassifyBiz.listGroupQrcodeBaseInfo(weixinGroupIds);

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

@@ -183,6 +183,24 @@
             id = #{_parameter,jdbcType=BIGINT}
     </select>
 
+    <resultMap id="getClassifyByIdsMap" type="com.pcloud.book.group.entity.BookGroupClassify">
+        <result property="id" column="id"/>
+        <result property="classify" column="classify"/>
+    </resultMap>
+    <!--根据id获取分类-->
+    <select id="getClassifyByIds" parameterType="list" resultMap="getClassifyByIdsMap">
+        SELECT
+        id id,classify classify
+        FROM
+        book_group_classify
+        WHERE
+        is_delete= 0
+        AND
+        id IN
+        <foreach collection="list" index="index" open="(" close=")" item="item" separator=",">
+            ${item}
+        </foreach>
+    </select>
 
     <select id="listAllClassifyByRank" resultType="ListClassifyVO" parameterType="Long">
         select