Skip to content

M
midjourney-proxy
Commit be565b23 by 郑勇
Options

feat: [1003106] heals优化

parent 76bf7c9e
Showing with 436 additions and 0 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/ListBookGroup4HealsDTO.java 0 → 100644
package com.pcloud.book.group.dto;
import java.io.Serializable;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author lily
* @date 2019/5/8 16:40
*/
@Data
public class ListBookGroup4HealsDTO implements Serializable {
private Long wechatUserId;
private List<Long> classifyIds;
}
pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/ListClassify4WechatDTO.java 0 → 100644
package com.pcloud.book.group.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
/**
* @author lily
* @date 2019/4/29 10:03
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ListClassify4WechatDTO implements Serializable {
@ApiModelProperty("分类标识")
private Long classifyId;
@ApiModelProperty("图书标识")
private Long bookId;
@ApiModelProperty("运营标识")
private Long channelId;
@ApiModelProperty("社群码标识")
private Long bookGroupId;
@ApiModelProperty("分类")
private String classify;
@ApiModelProperty("分类介绍")
private String classifyIntroduce;
@ApiModelProperty("价格")
private BigDecimal price;
@ApiModelProperty("商品标识")
private Long productId;
@ApiModelProperty("规格标识")
private Long productSpecId;
@ApiModelProperty("群人数限制")
private Integer changeNumber;
@ApiModelProperty("分群数")
private Integer groupSeq;
@ApiModelProperty("用户数量")
private Integer userNumber;
@ApiModelProperty("用户头像")
private List<String> headUrl;
@ApiModelProperty("群二维码标识")
private Long groupQrcodeId;
@ApiModelProperty("是否购买")
private Boolean isBuy = false;
public Boolean getBuy() {
return isBuy;
}
public void setBuy(Boolean buy) {
isBuy = buy;
}
public Long getBookId() {
return bookId;
}
public void setBookId(Long bookId) {
this.bookId = bookId;
}
public Long getChannelId() {
return channelId;
}
public void setChannelId(Long channelId) {
this.channelId = channelId;
}
public Long getBookGroupId() {
return bookGroupId;
}
public void setBookGroupId(Long bookGroupId) {
this.bookGroupId = bookGroupId;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public Long getProductId() {
return productId;
}
public void setProductId(Long productId) {
this.productId = productId;
}
public Long getProductSpecId() {
return productSpecId;
}
public void setProductSpecId(Long productSpecId) {
this.productSpecId = productSpecId;
}
public Long getGroupQrcodeId() {
return groupQrcodeId;
}
public void setGroupQrcodeId(Long groupQrcodeId) {
this.groupQrcodeId = groupQrcodeId;
}
public Long getClassifyId() {
return classifyId;
}
public void setClassifyId(Long classifyId) {
this.classifyId = classifyId;
}
public String getClassify() {
return classify;
}
public void setClassify(String classify) {
this.classify = classify;
}
public String getClassifyIntroduce() {
return classifyIntroduce;
}
public void setClassifyIntroduce(String classifyIntroduce) {
this.classifyIntroduce = classifyIntroduce;
}
public Integer getChangeNumber() {
return changeNumber;
}
public void setChangeNumber(Integer changeNumber) {
this.changeNumber = changeNumber;
}
public Integer getGroupSeq() {
return groupSeq;
}
public void setGroupSeq(Integer groupSeq) {
this.groupSeq = groupSeq;
}
public Integer getUserNumber() {
return userNumber;
}
public void setUserNumber(Integer userNumber) {
this.userNumber = userNumber;
}
public List<String> getHeadUrl() {
return headUrl;
}
public void setHeadUrl(List<String> headUrl) {
this.headUrl = headUrl;
}
@Override
public String toString() {
return "ListClassify4WechatVO{" +
"classifyId=" + classifyId +
", bookId=" + bookId +
", channelId=" + channelId +
", bookGroupId=" + bookGroupId +
", classify='" + classify + '\'' +
", classifyIntroduce='" + classifyIntroduce + '\'' +
", price=" + price +
", productId=" + productId +
", productSpecId=" + productSpecId +
", changeNumber=" + changeNumber +
", groupSeq=" + groupSeq +
", userNumber=" + userNumber +
", headUrl=" + headUrl +
", groupQrcodeId=" + groupQrcodeId +
", isBuy=" + isBuy +
'}';
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupClassifyBiz.java
package com.pcloud.book.group.biz;
import com.pcloud.book.group.dto.BookClassifyDTO;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
import com.pcloud.book.group.dto.ClassifyDTO;
import com.pcloud.book.group.dto.ClassifyLearningReportDto;
......@@ -8,6 +9,7 @@ import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
import com.pcloud.book.group.dto.ListClassify4WechatDTO;
import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
import com.pcloud.book.group.entity.BookGroupClassify;
import com.pcloud.book.group.vo.AddClassifyVO;
......@@ -278,4 +280,11 @@ public interface BookGroupClassifyBiz {
*
*/
PageBeanNew<PcloudBookGroupClassifyVO> listGroupClassify4Pcloud(String name, Long proLabelId, Long depLabelId,Long purLabelId,Long firstClassifyId,Long gradeLabelId,Long subjectLabelId,Long agentId,Long adviserId, Integer currentPage, Integer numPerPage);
List<ListClassify4WechatDTO> listClassify4Heals(List<Long> classifyIds, Long wechatUserId);
List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyIds4Heals(List<Long> classifyIds);
List<BookGroupClassifyDTO> getBookGroupClassifyByClassifyIds(List<Long> classifyIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
......@@ -30,6 +30,7 @@ import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
import com.pcloud.book.group.dao.LearningReportTouchRecordDao;
import com.pcloud.book.group.dao.WeixinQrcodeDao;
import com.pcloud.book.group.dto.BookClassifyDTO;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
import com.pcloud.book.group.dto.BookWxQrcodeDTO;
......@@ -42,6 +43,7 @@ import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
import com.pcloud.book.group.dto.ListClassify4WechatDTO;
import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
import com.pcloud.book.group.dto.WeixinQrcodeDTO;
......@@ -1048,6 +1050,35 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
}
/**
* @Author:lili
* @Desr:设置分类下当前使用二维码
* @Date:2019/4/29 14:37
*/
private void setGroupQrcodeInfo4Heals(List<ListClassify4WechatDTO> listClassify4Wechats) {
if (ListUtils.isEmpty(listClassify4Wechats)) {
return;
}
List<Long> groupQrcodeIds = new ArrayList<>();
for (ListClassify4WechatDTO listClassify4WechatVO : listClassify4Wechats) {
groupQrcodeIds.add(listClassify4WechatVO.getGroupQrcodeId());
}
//根据二维码获取二维码基本信息
Map<Long, GroupQrcodeInfoDTO> groupQrcodeMap = groupQrcodeBiz.listQrcodeInfoByIds(groupQrcodeIds);
if (MapUtils.isEmpty(groupQrcodeMap)) {
return;
}
for (ListClassify4WechatDTO listClassify4WechatVO : listClassify4Wechats) {
GroupQrcodeInfoDTO groupQrcodeInfoDTO = groupQrcodeMap.get(listClassify4WechatVO.getGroupQrcodeId());
if (groupQrcodeInfoDTO != null) {
listClassify4WechatVO.setUserNumber(groupQrcodeInfoDTO.getUserNumber());
listClassify4WechatVO.setGroupSeq(groupQrcodeInfoDTO.getGroupSeq());
List<String> headUrls = BookConstant.getRandomHeadUrl(groupQrcodeInfoDTO.getUserNumber() > 9 ? 9 : groupQrcodeInfoDTO.getUserNumber());
listClassify4WechatVO.setHeadUrl(headUrls);
}
}
}
/**
* 获取社群书分类列表(编辑)
* @param adviserId
* @param bookGroupClassify
......@@ -1401,4 +1432,40 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
return pageBeanNew;
}
@Override
public List<ListClassify4WechatDTO> listClassify4Heals(List<Long> classifyIds, Long wechatUserId) {
if(ListUtils.isEmpty(classifyIds)){
return new ArrayList<>();
}
List<ListClassify4WechatDTO> listClassify4WechatVOS = bookGroupClassifyDao.listClassify4Heals(classifyIds, 0);
if (listClassify4WechatVOS == null) {
return new ArrayList<>();
}
//设置二维码信息
setGroupQrcodeInfo4Heals(listClassify4WechatVOS);
//获取头像信息
//setUserHeader(listClassify4WechatVOS);
//设置是否购买
//setIsBuy(listClassify4WechatVOS, Collections.singletonList(wechatUserId));
return listClassify4WechatVOS;
}
@Override
public List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyIds4Heals(List<Long> classifyIds) {
if(ListUtils.isEmpty(classifyIds)){
return new ArrayList<>();
}
List<GroupQrcode4ClassifyDTO> list=bookGroupClassifyDao.getQrcodeByClassifyIds4Heals(classifyIds);
return list;
}
@Override
public List<BookGroupClassifyDTO> getBookGroupClassifyByClassifyIds(List<Long> classifyIds) {
if(ListUtils.isEmpty(classifyIds)){
return new ArrayList<>();
}
List<BookGroupClassifyDTO> bookGroupClassifyByClassifyIds = bookGroupClassifyDao.getBookGroupClassifyByClassifyIds(classifyIds);
return bookGroupClassifyByClassifyIds;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupClassifyDao.java
package com.pcloud.book.group.dao;
import com.pcloud.book.group.dto.BookClassifyDTO;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
import com.pcloud.book.group.dto.ClassifyDTO;
import com.pcloud.book.group.dto.ClassifyKeywordDTO;
......@@ -9,6 +10,7 @@ import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
import com.pcloud.book.group.dto.ListClassify4WechatDTO;
import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
import com.pcloud.book.group.dto.SelfBookGroupStDTO;
import com.pcloud.book.group.entity.BookGroupClassify;
......@@ -291,4 +293,10 @@ public interface BookGroupClassifyDao extends BaseDao<BookGroupClassify> {
*获取群分类下面所有可用的二维码
*/
List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyId4Heals(Long classifyId, Integer changeNumber);
List<ListClassify4WechatDTO> listClassify4Heals(List<Long> classifyIds, Integer rankType);
List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyIds4Heals(List<Long> classifyIds);
List<BookGroupClassifyDTO> getBookGroupClassifyByClassifyIds(List<Long> classifyIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupClassifyDaoImpl.java
......@@ -2,6 +2,7 @@ package com.pcloud.book.group.dao.impl;
import com.pcloud.book.group.dao.BookGroupClassifyDao;
import com.pcloud.book.group.dto.BookClassifyDTO;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
import com.pcloud.book.group.dto.ClassifyDTO;
import com.pcloud.book.group.dto.ClassifyKeywordDTO;
......@@ -10,6 +11,7 @@ import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
import com.pcloud.book.group.dto.ListClassify4WechatDTO;
import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
import com.pcloud.book.group.dto.SelfBookGroupStDTO;
import com.pcloud.book.group.entity.BookGroupClassify;
......@@ -290,4 +292,26 @@ public class BookGroupClassifyDaoImpl extends BaseDaoImpl<BookGroupClassify> imp
paramMap.put("changeNumber", changeNumber);
return this.getSqlSession().selectList(this.getStatement("getQrcodeByClassifyId4Heals"), paramMap);
}
@Override
public List<ListClassify4WechatDTO> listClassify4Heals(List<Long> classifyIds, Integer rankType) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("classifyIds", classifyIds);
paramMap.put("rankType", rankType);
return this.getSqlSession().selectList(this.getStatement("listClassify4Heals"), paramMap);
}
@Override
public List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyIds4Heals(List<Long> classifyIds) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("classifyIds", classifyIds);
return this.getSqlSession().selectList(this.getStatement("getQrcodeByClassifyIds4Heals"), paramMap);
}
@Override
public List<BookGroupClassifyDTO> getBookGroupClassifyByClassifyIds(List<Long> classifyIds) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("classifyIds", classifyIds);
return this.getSqlSession().selectList(this.getStatement("getBookGroupClassifyByClassifyIds"), paramMap);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupClassifyFacade.java
......@@ -260,6 +260,12 @@ public interface BookGroupClassifyFacade {
@RequestParam(value = "classifyId") Long classifyId
) throws BizException;
@ApiOperation("根据群分类下面所有的可用的群")
@RequestMapping(value = "/getQrcodeByClassifyIds4Heals", method = RequestMethod.POST)
ResponseDto<List<GroupQrcode4ClassifyDTO>> getQrcodeByClassifyIds4Heals(
@RequestBody List<Long> classifyIds
) throws BizException;
@ApiOperation("根据群分类下面最新可用的群")
@GetMapping("getQrcodeInfo4Heals")
ResponseDto<GroupQrcode4ClassifyDTO> getQrcodeInfo4Heals(@RequestParam("wechatUserId") Long wechatUserId,
......@@ -285,4 +291,7 @@ public interface BookGroupClassifyFacade {
@GetMapping("getGroupQrcodeByClassify")
ResponseDto<String> getGroupQrcodeByClassify(@RequestHeader("token") String token,@RequestParam("classifyId") Integer classifyId) throws BizException,PermissionException;
@ApiOperation("根据群分类ID获取群二维码")
@PostMapping("getBookGroupClassifyByClassifyIds")
ResponseDto<List<BookGroupClassifyDTO>> getBookGroupClassifyByClassifyIds(@RequestBody List<Long> classifyIds) throws BizException,PermissionException;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupClassifyFacadeImpl.java
......@@ -5,6 +5,8 @@ import com.pcloud.book.group.biz.BookGroupClassifyBiz;
import com.pcloud.book.group.biz.GroupQrcodeBiz;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.dto.ListBookGroup4HealsDTO;
import com.pcloud.book.group.dto.ListClassify4WechatDTO;
import com.pcloud.book.group.facade.BookGroupClassifyFacade;
import com.pcloud.book.group.vo.*;
import com.pcloud.common.core.constant.SystemCode;
......@@ -282,6 +284,13 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
}
@Override
@RequestMapping(value = "/getQrcodeByClassifyIds4Heals", method = RequestMethod.POST)
public ResponseDto<List<GroupQrcode4ClassifyDTO>> getQrcodeByClassifyIds4Heals(@RequestBody List<Long> classifyIds) throws BizException {
List<GroupQrcode4ClassifyDTO> list=bookGroupClassifyBiz.getQrcodeByClassifyIds4Heals(classifyIds);
return new ResponseDto<>(list);
}
@Override
@GetMapping("getQrcodeInfo4Heals")
public ResponseDto<GroupQrcode4ClassifyDTO> getQrcodeInfo4Heals(@RequestParam("wechatUserId") Long wechatUserId,
@RequestParam("classifyId") Long classifyId) throws BizException {
......@@ -320,4 +329,18 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
return new ResponseDto<>(groupQrcodeBiz.getChangeGroupQrCode(Long.valueOf(classifyId)));
}
@PostMapping("listClassify4Heals")
public ResponseDto<List<ListClassify4WechatDTO>> listClassify4Heals(@RequestBody ListBookGroup4HealsDTO listBookGroup4HealsDTO) {
Long wechatUserId = listBookGroup4HealsDTO.getWechatUserId();
List<ListClassify4WechatDTO> listClassify4WechatVOS = bookGroupClassifyBiz.listClassify4Heals(listBookGroup4HealsDTO.getClassifyIds(), wechatUserId);
return new ResponseDto<>(listClassify4WechatVOS);
}
@Override
@PostMapping("getBookGroupClassifyByClassifyIds")
public ResponseDto<List<BookGroupClassifyDTO>> getBookGroupClassifyByClassifyIds(@RequestBody List<Long> classifyIds) throws BizException, PermissionException {
List<BookGroupClassifyDTO> list = bookGroupClassifyBiz.getBookGroupClassifyByClassifyIds(classifyIds);
return new ResponseDto<>(list);
}
}
pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml
......@@ -1077,6 +1077,27 @@
ORDER BY t.create_time DESC
</select>
<select id="getBookGroupClassifyByClassifyIds" parameterType="map" resultType="com.pcloud.book.group.dto.BookGroupClassifyDTO">
SELECT
t.id classifyId,
t.classify classify,
count(t1.id) groupNumber
FROM
book_group_qrcode t1
LEFT JOIN book_group_classify t ON t.id = t1.classify_id
AND t1.is_delete = 0
WHERE
t.id in
<foreach collection = "classifyIds" item = "item" open = "(" separator= "," close = ")">
#{item}
</foreach>
AND t.is_delete = 0
and t.price=0
GROUP BY
t.id
ORDER BY t.create_time DESC
</select>
<select id="getQrcodeByClassifyId4Heals" parameterType="map" resultType="com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO">
SELECT
id groupQrcodeId,
......@@ -1136,5 +1157,56 @@
ORDER BY a.create_time DESC
</select>
<select id="listClassify4Heals" resultType="com.pcloud.book.group.dto.ListClassify4WechatDTO" parameterType="map">
SELECT
c.id classifyId,
c.book_id bookId,
c.channel_id channelId,
c.book_group_id bookGroupId,
c.classify,
c.change_number changeNumber,
c.classify_introduce classifyIntroduce,
c.price,
c.product_id productId,
c.product_spec_id productSpecId,
max(q.id) groupQrcodeId
FROM
book_group_classify c
JOIN
book_group_qrcode q
ON
c.id = q.classify_id
where
c.is_delete = 0
AND q.is_delete = 0
and c.id in
<foreach collection="classifyIds" open="(" separator="," close=")" index="index" item="item">
#{item}
</foreach>
GROUP BY c.id
<if test="rankType == 0">
order by sum(q.user_number) desc, c.id
</if>
<if test="rankType == 1">
order by c.rank asc, c.id
</if>
</select>
<select id="getQrcodeByClassifyIds4Heals" parameterType="map" resultType="com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO">
SELECT
a.id groupQrcodeId,
a.qrcode_url qrcodeUrl,
a.weixin_group_id weixinGroupId,
a.group_name groupName
FROM
book_group_qrcode a
LEFT JOIN book_group_classify b on a.classify_id=b.id
where b.id in
<foreach collection="classifyIds" open="(" separator="," close=")" index="index" item="item">
#{item}
</foreach>
and a.user_number <![CDATA[ < ]]> b.change_number AND a.use_state = 1 AND a.is_delete = 0 order by a.user_number asc
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment