Skip to content

M
midjourney-proxy
Commit c02872d8 by 阮思源
Options

Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-book into rsy-feat-1001514

parents e470ca5d 114d53d5
Showing with 1642 additions and 98 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/advertising/service/AdvertisingSpaceService.java
package com.pcloud.book.advertising.service; package com.pcloud.book.advertising.service;
import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import com.pcloud.common.exceptions.BizException; import org.springframework.web.bind.annotation.RequestParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import java.util.Map; import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@FeignClient(value = "pcloud-service-book", qualifier = "advertisingSpaceServiceCloud", path = "book/v1.0/advertisingSpaceService") @FeignClient(value = "pcloud-service-book", qualifier = "advertisingSpaceServiceCloud", path = "book/v1.0/advertisingSpaceService")
@Api(description = "广告位内部接口") @Api(description = "广告位内部接口")
public interface AdvertisingSpaceService { public interface AdvertisingSpaceService {
...@@ -26,4 +34,9 @@ public interface AdvertisingSpaceService { ...@@ -26,4 +34,9 @@ public interface AdvertisingSpaceService {
@ApiOperation("发送广告计划") @ApiOperation("发送广告计划")
@PostMapping("sendAdvertisingPlan") @PostMapping("sendAdvertisingPlan")
void sendAdvertisingPlan(@RequestBody Map<String, Object> map) throws BizException; void sendAdvertisingPlan(@RequestBody Map<String, Object> map) throws BizException;
@ApiOperation(value = "根据登录用户获取标记的微信群列表", httpMethod = "GET")
@ApiImplicitParam(name = "userId", value = "用户登录id", dataType = "long", required = true, paramType = "query")
@GetMapping("getTagWxGroupIdsByUserId")
ResponseEntity<ResponseDto<List<String>>> getTagWxGroupIdsByUserId(@RequestParam("userId") Long userId);
} }
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
...@@ -553,6 +553,10 @@ public class BookDto extends BaseDto { ...@@ -553,6 +553,10 @@ public class BookDto extends BaseDto {
*/ */
private BigDecimal outRate; private BigDecimal outRate;
/**
* 编辑手机号
*/
private String phone;
public String getQrRemark() { public String getQrRemark() {
return qrRemark; return qrRemark;
...@@ -1478,6 +1482,14 @@ public class BookDto extends BaseDto { ...@@ -1478,6 +1482,14 @@ public class BookDto extends BaseDto {
this.outRate = outRate; this.outRate = outRate;
} }
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
@Override @Override
public String toString() { public String toString() {
return "BookDto{" + return "BookDto{" +
...@@ -1485,6 +1497,7 @@ public class BookDto extends BaseDto { ...@@ -1485,6 +1497,7 @@ public class BookDto extends BaseDto {
", typeCode='" + typeCode + '\'' + ", typeCode='" + typeCode + '\'' +
", typeName='" + typeName + '\'' + ", typeName='" + typeName + '\'' +
", isbn='" + isbn + '\'' + ", isbn='" + isbn + '\'' +
", isDelete=" + isDelete +
", bookName='" + bookName + '\'' + ", bookName='" + bookName + '\'' +
", bookPrice='" + bookPrice + '\'' + ", bookPrice='" + bookPrice + '\'' +
", originName='" + originName + '\'' + ", originName='" + originName + '\'' +
...@@ -1588,6 +1601,7 @@ public class BookDto extends BaseDto { ...@@ -1588,6 +1601,7 @@ public class BookDto extends BaseDto {
", avgBrowseTimes=" + avgBrowseTimes + ", avgBrowseTimes=" + avgBrowseTimes +
", outNum=" + outNum + ", outNum=" + outNum +
", outRate=" + outRate + ", outRate=" + outRate +
", phone='" + phone + '\'' +
'}'; '}';
} }
} }
pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java
...@@ -236,18 +236,24 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -236,18 +236,24 @@ public class AdNewsBizImpl implements AdNewsBiz {
// 查询要发的记录 // 查询要发的记录
List<AdNews> adNewsList = null; List<AdNews> adNewsList = null;
AdContentFromEnum adContentFromEnum = AdContentFromEnum.WECHAT_ADVISER;
adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser4Own(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount()); adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser4Own(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount());
// 如果自有公众号的数据为空，则查询系统推荐公众号数据
if (ListUtils.isEmpty(adNewsList)) { if (ListUtils.isEmpty(adNewsList)) {
adContentFromEnum = AdContentFromEnum.WECHAT;
adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount()); adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount());
if (ListUtils.isEmpty(adNewsList)) { }else if (adNewsList.size() < adNewsSet.getSendCount()) {
LOGGER.info("记录为空，没有可供发送的早晚报！"); // 如果自有公众号的数据条数少于要发送的条数，则用系统推荐公众号的补齐剩余的条数
return; List<AdNews> _adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSetId, adNewsSet.getCreateUser(), adNewsSet.getSendCount()-adNewsList.size());
if(!ListUtils.isEmpty(_adNewsList)){
adNewsList.addAll(_adNewsList);
} }
} }
if (ListUtils.isEmpty(adNewsList)) {
LOGGER.info("记录为空，没有可供发送的早晚报！");
return;
}
// 构建记录对象 // 构建记录对象
for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) { for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS) {
for (AdNews adNews : adNewsList) { for (AdNews adNews : adNewsList) {
...@@ -259,6 +265,7 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -259,6 +265,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId()); adNewsGroupRecord.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser()); adNewsGroupRecord.setCreateUser(adNewsSet.getCreateUser());
adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser()); adNewsGroupRecord.setUpdateUser(adNewsSet.getCreateUser());
adNewsGroupRecord.setContentFrom(adNews.getContentFrom());
adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO)); adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
adNewsGroupRecords.add(adNewsGroupRecord); adNewsGroupRecords.add(adNewsGroupRecord);
} }
...@@ -269,7 +276,6 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -269,7 +276,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId()); adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId()); adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser()); adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser());
adNewsMessageStatistic.setContentFrom(adContentFromEnum.key);
adNewsMessageStatistic.setMessageCount(adNewsList.size()); adNewsMessageStatistic.setMessageCount(adNewsList.size());
adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO)); adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
adNewsMessageStatistics.add(adNewsMessageStatistic); adNewsMessageStatistics.add(adNewsMessageStatistic);
...@@ -327,6 +333,7 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -327,6 +333,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
adNewsGroupRecord.setCustomContent(customContent); adNewsGroupRecord.setCustomContent(customContent);
adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO)); adNewsGroupRecord.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
adNewsGroupRecord.setContentType(adNewsSet.getContentType()); adNewsGroupRecord.setContentType(adNewsSet.getContentType());
adNewsGroupRecord.setContentFrom(adNewsSet.getContentFrom());
adNewsGroupRecords.add(adNewsGroupRecord); adNewsGroupRecords.add(adNewsGroupRecord);
// 统计记录 // 统计记录
adNewsMessageStatistic = new AdNewsMessageStatistic(); adNewsMessageStatistic = new AdNewsMessageStatistic();
...@@ -335,7 +342,6 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -335,7 +342,6 @@ public class AdNewsBizImpl implements AdNewsBiz {
adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId()); adNewsMessageStatistic.setClassifyId(groupQrcodeFoAdDTO.getClassifyId());
adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId()); adNewsMessageStatistic.setQrcodeId(groupQrcodeFoAdDTO.getQrcodeId());
adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser()); adNewsMessageStatistic.setCreateUser(adNewsSet.getCreateUser());
adNewsMessageStatistic.setContentFrom(adNewsSet.getContentFrom());
adNewsMessageStatistic.setMessageCount(1); adNewsMessageStatistic.setMessageCount(1);
adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO)); adNewsMessageStatistic.setInsertMark(groupQrcodeFoAdDTOS.indexOf(groupQrcodeFoAdDTO));
adNewsMessageStatistics.add(adNewsMessageStatistic); adNewsMessageStatistics.add(adNewsMessageStatistic);
...@@ -663,7 +669,7 @@ public class AdNewsBizImpl implements AdNewsBiz { ...@@ -663,7 +669,7 @@ public class AdNewsBizImpl implements AdNewsBiz {
map.put("partyId", partyId); map.put("partyId", partyId);
map.put("title", title); map.put("title", title);
map.put("beginTime", beginTime); map.put("beginTime", beginTime);
map.put("endTime", StringUtil.isEmpty(endTime) ? null : endTime.concat(" 23:59:59")); map.put("endTime", endTime);
map.put("proLabelId", proLabelId); map.put("proLabelId", proLabelId);
map.put("depLabelId", depLabelId); map.put("depLabelId", depLabelId);
map.put("purLabelId", purLabelId); map.put("purLabelId", purLabelId);
......
pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNews.java
...@@ -44,6 +44,9 @@ public class AdNews extends BaseEntity { ...@@ -44,6 +44,9 @@ public class AdNews extends BaseEntity {
@ApiModelProperty("公众号") @ApiModelProperty("公众号")
private String wechatName; private String wechatName;
@ApiModelProperty("内容来源")
private Integer contentFrom;
public String getType() { public String getType() {
return type; return type;
} }
...@@ -124,6 +127,14 @@ public class AdNews extends BaseEntity { ...@@ -124,6 +127,14 @@ public class AdNews extends BaseEntity {
this.wechatName = wechatName; this.wechatName = wechatName;
} }
public Integer getContentFrom() {
return contentFrom;
}
public void setContentFrom(Integer contentFrom) {
this.contentFrom = contentFrom;
}
@Override @Override
public String toString() { public String toString() {
return "AdNews{" + return "AdNews{" +
...@@ -137,6 +148,7 @@ public class AdNews extends BaseEntity { ...@@ -137,6 +148,7 @@ public class AdNews extends BaseEntity {
", hasUsed=" + hasUsed + ", hasUsed=" + hasUsed +
", hasBan=" + hasBan + ", hasBan=" + hasBan +
", wechatName='" + wechatName + '\'' + ", wechatName='" + wechatName + '\'' +
", contentFrom=" + contentFrom +
'}'; '}';
} }
} }
pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsGroupRecord.java
...@@ -46,6 +46,9 @@ public class AdNewsGroupRecord extends BaseEntity{ ...@@ -46,6 +46,9 @@ public class AdNewsGroupRecord extends BaseEntity{
@ApiModelProperty("内容类型，0：早报；1：晚报") @ApiModelProperty("内容类型，0：早报；1：晚报")
private Integer contentType; private Integer contentType;
@ApiModelProperty(value = "内容来源；0：来源于公众号；1：自定义早晚报；2：自有公众号；",dataType = "com.pcloud.book.adnews.enums.AdContentFromEnum")
private Integer contentFrom;
@ApiModelProperty("insert时父子表标识") @ApiModelProperty("insert时父子表标识")
Integer insertMark; Integer insertMark;
} }
pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsMessageStatistic.java
...@@ -27,9 +27,6 @@ public class AdNewsMessageStatistic extends BaseEntity { ...@@ -27,9 +27,6 @@ public class AdNewsMessageStatistic extends BaseEntity {
@ApiModelProperty("编辑新闻设置id") @ApiModelProperty("编辑新闻设置id")
private Long adNewsSetId; private Long adNewsSetId;
@ApiModelProperty("内容来源")
private Integer contentFrom;
@ApiModelProperty("发送消息数") @ApiModelProperty("发送消息数")
private Integer messageCount; private Integer messageCount;
......
pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdContentFromEnum.java
...@@ -13,7 +13,7 @@ public enum AdContentFromEnum { ...@@ -13,7 +13,7 @@ public enum AdContentFromEnum {
WECHAT(0, "系统推荐公众号"), WECHAT(0, "系统推荐公众号"),
CUSTOM(1, "自定义内容 "), CUSTOM(1, "自定义内容 "),
WECHAT_ADVISER(2,"自有公众号"); // 目前只使用于 ad_news_message_statistic.content_from WECHAT_ADVISER(2,"自有公众号");
public final Integer key; public final Integer key;
......
pcloud-service-book/src/main/java/com/pcloud/book/adnews/vo/AdNewsMessageStatisticVO.java
...@@ -47,9 +47,6 @@ public class AdNewsMessageStatisticVO { ...@@ -47,9 +47,6 @@ public class AdNewsMessageStatisticVO {
@ApiModelProperty("目的Id") @ApiModelProperty("目的Id")
private Long purLabelId; private Long purLabelId;
@ApiModelProperty("内容来源")
private Integer contentFrom;
@ApiModelProperty("发送消息数") @ApiModelProperty("发送消息数")
private Integer messageCount; private Integer messageCount;
...@@ -62,4 +59,7 @@ public class AdNewsMessageStatisticVO { ...@@ -62,4 +59,7 @@ public class AdNewsMessageStatisticVO {
@ApiModelProperty("点击人数") @ApiModelProperty("点击人数")
private Long userCount; private Long userCount;
@ApiModelProperty("内容来源")
private String contentFroms;
} }
pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/GroupMasterTagBiz.java 0 → 100644
package com.pcloud.book.advertising.biz;
import com.pcloud.book.advertising.dto.AdvertisingMasterDTO;
import com.pcloud.book.advertising.dto.Book4AdvertisingMasterDTO;
import com.pcloud.book.advertising.dto.GroupMasterAddDTO;
import com.pcloud.book.advertising.dto.GroupMasterDTO;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBeanNew;
import java.util.List;
import java.util.Map;
/**
* @描述：微信群标记广告主
* @作者：zhuyajie
* @创建时间：18:47 2019/8/22
* @版本：1.0
*/
public interface GroupMasterTagBiz {
/**
* 微信群广告主标记列表
* @param currentPage
* @param numPerPage
* @param paramMap
* @return
*/
PageBeanNew<GroupMasterDTO> listPageGroupMaster(Integer currentPage, Integer numPerPage, Map<String, Object> paramMap);
/**
* 获取品牌方广告主
* @return
* @throws BizException
*/
List<AdvertisingMasterDTO> getBrandMaster() throws BizException;
/**
* 微信群标记广告主
* @param groupMasterAddDTO
*/
void setGroupMaster(GroupMasterAddDTO groupMasterAddDTO);
/**
* 广告主标记-图书列表
* @param currentPage
* @param numPerPage
* @param name
* @return
*/
PageBeanNew<Book4AdvertisingMasterDTO> listPageBook4AdMaster(Integer currentPage, Integer numPerPage, String name);
/**
* 品牌方广告主-微信群列表
* @param userId
* @param currentPage
* @param numPerPage
* @param paramMap
* @return
*/
PageBeanNew<GroupMasterDTO> listPageGroupList4Master(Long userId, Integer currentPage, Integer numPerPage, Map<String, Object> paramMap);
/**
* 微信群广告主标记列表-导出
* @param name
* @param proLabelId
* @param depLabelId
* @param purLabelId
* @param masterId
*/
void exportGroupMaster(String name, Long proLabelId, Long depLabelId, Long purLabelId, Long masterId, Long partyId);
/**
* 品牌方广告主-微信群导出
* @param partyId
* @param paramMap
*/
void exportGroupList4Master(Long partyId, Map<String, Object> paramMap, Long userId);
/**
* 根据登录用户获取标记的微信群列表
* @param userId
* @return
*/
List<String> getTagWxGroupIdsByUserId(Long userId);
/**
* 品牌方广告主-微信群基本信息列表
* @param currentPage
* @param numPerPage
* @param name
* @param userId
* @return
*/
PageBeanNew<GroupMasterDTO> listPageGroupBaseInfo4Master(Integer currentPage, Integer numPerPage, String name, Long userId);
/**
* 修改广告主的登录id
* @param masterId
* @param loginId
*/
void updateMasterLoginId(Long masterId, Long loginId);
/**
* 广告主已标记的书刊id
* @param masterId
* @return
*/
List<Long> getTagBookIds4AdMatser(Long masterId);
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java
...@@ -5,10 +5,51 @@ import com.pcloud.appcenter.app.service.AppTypeService; ...@@ -5,10 +5,51 @@ import com.pcloud.appcenter.app.service.AppTypeService;
import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz; import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
import com.pcloud.book.advertising.biz.BmBiz; import com.pcloud.book.advertising.biz.BmBiz;
import com.pcloud.book.advertising.check.AdvertisingPlanCheck; import com.pcloud.book.advertising.check.AdvertisingPlanCheck;
import com.pcloud.book.advertising.dao.*; import com.pcloud.book.advertising.dao.AdvertisingAdviserPermissionDao;
import com.pcloud.book.advertising.dto.*; import com.pcloud.book.advertising.dao.AdvertisingAgentPermissionDao;
import com.pcloud.book.advertising.entity.*; import com.pcloud.book.advertising.dao.AdvertisingBrowseRecordDao;
import com.pcloud.book.advertising.enums.*; import com.pcloud.book.advertising.dao.AdvertisingClickRecordDao;
import com.pcloud.book.advertising.dao.AdvertisingDetailFileDao;
import com.pcloud.book.advertising.dao.AdvertisingDistributionBookDao;
import com.pcloud.book.advertising.dao.AdvertisingExposureRecordDao;
import com.pcloud.book.advertising.dao.AdvertisingGroupTagDao;
import com.pcloud.book.advertising.dao.AdvertisingIncomeDailyDao;
import com.pcloud.book.advertising.dao.AdvertisingMasterDao;
import com.pcloud.book.advertising.dao.AdvertisingPilotRecordDao;
import com.pcloud.book.advertising.dao.AdvertisingPlanDao;
import com.pcloud.book.advertising.dao.AdvertisingPlanGroupDao;
import com.pcloud.book.advertising.dao.AdvertisingPutDao;
import com.pcloud.book.advertising.dao.AdvertisingSettlementMethodDao;
import com.pcloud.book.advertising.dao.AdvertisingSpaceDao;
import com.pcloud.book.advertising.dto.AdvertisingDistributionDTO;
import com.pcloud.book.advertising.dto.AdvertisingMasterDTO;
import com.pcloud.book.advertising.dto.AdvertisingSettlementMethodDTO;
import com.pcloud.book.advertising.dto.AdvertisingSpaceDTO;
import com.pcloud.book.advertising.dto.QrcodeAdvertisingSpaceCountDTO;
import com.pcloud.book.advertising.dto.WechatGroupClickUserDTO;
import com.pcloud.book.advertising.dto.WeixinClassifyInfoDTO;
import com.pcloud.book.advertising.entity.AdvertisingAdviserPermission;
import com.pcloud.book.advertising.entity.AdvertisingAgentPermission;
import com.pcloud.book.advertising.entity.AdvertisingBrowseRecord;
import com.pcloud.book.advertising.entity.AdvertisingClickRecord;
import com.pcloud.book.advertising.entity.AdvertisingDetailFile;
import com.pcloud.book.advertising.entity.AdvertisingDistributionBook;
import com.pcloud.book.advertising.entity.AdvertisingExposureRecord;
import com.pcloud.book.advertising.entity.AdvertisingMaster;
import com.pcloud.book.advertising.entity.AdvertisingPilotRecord;
import com.pcloud.book.advertising.entity.AdvertisingPlan;
import com.pcloud.book.advertising.entity.AdvertisingPlanGroup;
import com.pcloud.book.advertising.entity.AdvertisingPut;
import com.pcloud.book.advertising.entity.AdvertisingSettlementMethod;
import com.pcloud.book.advertising.entity.AdvertisingSpace;
import com.pcloud.book.advertising.entity.DistributionWechatGroup;
import com.pcloud.book.advertising.enums.AdDetailModeEnum;
import com.pcloud.book.advertising.enums.AdPositionDetailEnum;
import com.pcloud.book.advertising.enums.AdPositionEnum;
import com.pcloud.book.advertising.enums.AdPositionModeEnum;
import com.pcloud.book.advertising.enums.PutTypeEnum;
import com.pcloud.book.advertising.enums.SettlementMethodEnum;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.biz.BookBiz; import com.pcloud.book.book.biz.BookBiz;
import com.pcloud.book.book.dao.BookDao; import com.pcloud.book.book.dao.BookDao;
...@@ -24,6 +65,7 @@ import com.pcloud.book.consumer.resource.ProductConsr; ...@@ -24,6 +65,7 @@ import com.pcloud.book.consumer.resource.ProductConsr;
import com.pcloud.book.consumer.user.AdviserConsr; import com.pcloud.book.consumer.user.AdviserConsr;
import com.pcloud.book.consumer.user.AgentConsr; import com.pcloud.book.consumer.user.AgentConsr;
import com.pcloud.book.consumer.user.ChannelConsr; import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.consumer.user.PartyConsr;
import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr; import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
import com.pcloud.book.group.biz.WeixinQrcodeBiz; import com.pcloud.book.group.biz.WeixinQrcodeBiz;
import com.pcloud.book.group.dao.BookGroupClassifyDao; import com.pcloud.book.group.dao.BookGroupClassifyDao;
...@@ -60,6 +102,7 @@ import com.pcloud.facade.quartz.entity.ScheduleJob; ...@@ -60,6 +102,7 @@ import com.pcloud.facade.quartz.entity.ScheduleJob;
import com.pcloud.facade.quartz.service.ScheduleService; import com.pcloud.facade.quartz.service.ScheduleService;
import com.pcloud.readercenter.wechat.entity.WechatUser; import com.pcloud.readercenter.wechat.entity.WechatUser;
import com.pcloud.resourcecenter.product.service.ProductService; import com.pcloud.resourcecenter.product.service.ProductService;
import com.pcloud.usercenter.user.entity.UserLogin;
import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO; import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO;
import com.sdk.wxgroup.SendArticleMessageVO; import com.sdk.wxgroup.SendArticleMessageVO;
import com.sdk.wxgroup.SendPicMessageVO; import com.sdk.wxgroup.SendPicMessageVO;
...@@ -77,7 +120,16 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -77,7 +120,16 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -176,6 +228,10 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz { ...@@ -176,6 +228,10 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
private ConvertConsr convertConsr; private ConvertConsr convertConsr;
@Autowired @Autowired
private AdvertisingDetailFileDao detailFileDao; private AdvertisingDetailFileDao detailFileDao;
@Autowired
private PartyConsr partyConsr;
@Autowired
private AdvertisingGroupTagDao advertisingGroupTagDao;
private static final String ADVERTISING_PUT_PLAN_SCHEDULE_PRE = "ADVERTISING_PUT_PALN_"; private static final String ADVERTISING_PUT_PLAN_SCHEDULE_PRE = "ADVERTISING_PUT_PALN_";
...@@ -2267,6 +2323,18 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz { ...@@ -2267,6 +2323,18 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
if (null != nameExist && nameExist) { if (null != nameExist && nameExist) {
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主已存在！"); throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主已存在！");
} }
//包含品牌方结算方式
List<String> methods = advertisingMaster.getSettlementMethodList().stream().filter(s -> s.getSettlementMethod() != null).map(AdvertisingSettlementMethod::getSettlementMethod).collect(Collectors.toList());
if (methods.contains(SettlementMethodEnum.Brand.code)) {
/*if (StringUtil.isEmpty(advertisingMaster.getLoginName())) {
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "登录名为空！");
} else {
Long loginUserId = partyConsr.addLoginAccount(advertisingMaster.getLoginName(), advertisingMaster.getPassword());
advertisingMaster.setLoginId(loginUserId);
}*/
//创建子账号，通过更新数据库与广告主关联，登录账号不在这里创建,返回默认的loginUserId
advertisingMaster.setLoginId(123l);
}
advertisingMasterDao.insert(advertisingMaster); advertisingMasterDao.insert(advertisingMaster);
Long masterId = advertisingMaster.getId(); Long masterId = advertisingMaster.getId();
advertisingMaster.getSettlementMethodList().forEach(method -> method.setMasterId(masterId)); advertisingMaster.getSettlementMethodList().forEach(method -> method.setMasterId(masterId));
...@@ -2296,6 +2364,34 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz { ...@@ -2296,6 +2364,34 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
if (null != nameExist && nameExist) { if (null != nameExist && nameExist) {
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主名称不能重复！"); throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主名称不能重复！");
} }
AdvertisingMaster master = advertisingMasterDao.getById(masterId);
if (null == master) {
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "广告主不存在！");
}
//包含品牌方结算方式
List<String> methods = advertisingMaster.getSettlementMethodList().stream().filter(s -> s.getSettlementMethod() != null).map(AdvertisingSettlementMethod::getSettlementMethod).collect(Collectors.toList());
if (methods.contains(SettlementMethodEnum.Brand.code)) {
Long loginId = master.getLoginId();
/*if (StringUtil.isEmpty(advertisingMaster.getLoginName()) || StringUtil.isEmpty(advertisingMaster.getPassword())) {
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "登录名或密码为空！");
}
if (null == loginId) {//新增账号
loginId = partyConsr.addLoginAccount(advertisingMaster.getLoginName(), advertisingMaster.getPassword());
advertisingMaster.setLoginId(loginId);
} else {//修改账号
partyConsr.updateLoginAccount(advertisingMaster.getLoginName(), advertisingMaster.getPassword(), loginId);
}*/
//账号修改通过子账号完成
if (null == loginId) {
LOGGER.error("广告主" + masterId + "是品牌方结算，子账号为空");
}
} else {
if (null != master.getLoginId()) {//删除账号，标记记录
// partyConsr.deleteLoginAccount(master.getLoginId());
advertisingMaster.setLoginId(null);
advertisingGroupTagDao.deleteByMasterId(masterId);
}
}
advertisingMasterDao.update(advertisingMaster); advertisingMasterDao.update(advertisingMaster);
// 删除广告主之前配置的结算方式 // 删除广告主之前配置的结算方式
advertisingSettlementMethodDao.deleteByMasterId(masterId); advertisingSettlementMethodDao.deleteByMasterId(masterId);
...@@ -2345,6 +2441,15 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz { ...@@ -2345,6 +2441,15 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
new BigDecimal(pilotFinishUserNum.doubleValue() / clickUserNum).setScale(4, BigDecimal.ROUND_HALF_UP); new BigDecimal(pilotFinishUserNum.doubleValue() / clickUserNum).setScale(4, BigDecimal.ROUND_HALF_UP);
masterDTO.setPilotFinishUserNum(pilotFinishUserNum); masterDTO.setPilotFinishUserNum(pilotFinishUserNum);
masterDTO.setPilotFinishRate(pilotFinishRate); masterDTO.setPilotFinishRate(pilotFinishRate);
//广告主登录名
AdvertisingMaster master = advertisingMasterDao.getById(masterDTO.getId());
if (null != master && null != master.getLoginId()) {
UserLogin userLogin = partyConsr.getUserLoginInfo(master.getLoginId());
if (null != userLogin) {
masterDTO.setLoginName(userLogin.getUserName());
masterDTO.setPassword(userLogin.getCurrentPassword());
}
}
} }
return pageBean; return pageBean;
} }
......
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/AdvertisingGroupTagDao.java 0 → 100644
package com.pcloud.book.advertising.dao;
import com.pcloud.book.advertising.entity.AdvertisingGroupTag;
import com.pcloud.common.core.dao.BaseDao;
import java.util.List;
/**
* @描述：群标记广告主
* @作者：zhuyajie
* @创建时间：14:52 2019/8/21
* @版本：1.0
*/
public interface AdvertisingGroupTagDao extends BaseDao<AdvertisingGroupTag> {
/**
* 根据广告主删除
* @param masterId
*/
public void deleteByMasterId(Long masterId);
/**
* 已标记的书
* @param masterId
* @return
*/
public List<Long> getBookIdsByMasterId(Long masterId);
/**
* 根据群删除标记
* @param groupQrcodeId
*/
public void deleteByGroupQrcodeId(Long groupQrcodeId);
/**
* 已标记的群
* @param masterId
* @return
*/
public List<Long> getGroupQrcodeIdsByMasterId(Long masterId);
/**
* 根据图书删除标记
* @param bookIds
* @param masterId
*/
void deleteByBook(List<Long> bookIds, Long masterId);
/**
* 查已标记的微信群id
* @param masterId
* @return
*/
List<String> getTagWxGroupIdsByMasterId(Long masterId);
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/AdvertisingMasterDao.java
package com.pcloud.book.advertising.dao; package com.pcloud.book.advertising.dao;
import java.util.List;
import com.pcloud.book.advertising.dto.AdvertisingMasterDTO; import com.pcloud.book.advertising.dto.AdvertisingMasterDTO;
import com.pcloud.book.advertising.entity.AdvertisingMaster; import com.pcloud.book.advertising.entity.AdvertisingMaster;
import com.pcloud.common.core.dao.BaseDao; import com.pcloud.common.core.dao.BaseDao;
import java.util.List;
/** /**
* Description 广告主数据访问层接口 * Description 广告主数据访问层接口
* Created by PENG on 2019/4/26. * Created by PENG on 2019/4/26.
...@@ -23,4 +24,31 @@ public interface AdvertisingMasterDao extends BaseDao<AdvertisingMaster> { ...@@ -23,4 +24,31 @@ public interface AdvertisingMasterDao extends BaseDao<AdvertisingMaster> {
* @return * @return
*/ */
AdvertisingMasterDTO getDTOById(Long masterId); AdvertisingMasterDTO getDTOById(Long masterId);
/**
* 查微信群标记的广告主
* @param groupQrcodeId
* @return
*/
List<AdvertisingMaster> getByGroup(Long groupQrcodeId);
/**
* 获取品牌方广告主
* @return
*/
List<AdvertisingMasterDTO> getBrandMaster();
/**
* 根据登录id查广告主id
* @param loginId
* @return
*/
public Long getIdByUserLoginId(Long loginId);
/**
* 修改广告主登录id
* @param masterId
* @param loginId
*/
public void updateMasterLoginId(Long masterId, Long loginId);
} }
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/impl/AdvertisingGroupTagDaoImpl.java 0 → 100644
package com.pcloud.book.advertising.dao.impl;
import com.pcloud.book.advertising.dao.AdvertisingGroupTagDao;
import com.pcloud.book.advertising.entity.AdvertisingGroupTag;
import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @描述：群标记广告主
* @作者：zhuyajie
* @创建时间：14:53 2019/8/21
* @版本：1.0
*/
@Component("advertisingGroupTagDao")
public class AdvertisingGroupTagDaoImpl extends BaseDaoImpl<AdvertisingGroupTag> implements AdvertisingGroupTagDao {
@Override
public void deleteByMasterId(Long masterId) {
getSessionTemplate().delete(getStatement("deleteByMasterId"), masterId);
}
@Override
public List<Long> getBookIdsByMasterId(Long masterId) {
return getSessionTemplate().selectList(getStatement("getBookIdsByMasterId"), masterId);
}
@Override
public void deleteByGroupQrcodeId(Long groupQrcodeId) {
getSessionTemplate().delete(getStatement("deleteByGroupQrcodeId"), groupQrcodeId);
}
@Override
public List<Long> getGroupQrcodeIdsByMasterId(Long masterId) {
return getSessionTemplate().selectList(getStatement("getGroupQrcodeIdsByMasterId"), masterId);
}
@Override
public void deleteByBook(List<Long> bookIds, Long masterId) {
Map<String, Object> map = new HashMap<>();
map.put("bookIds", bookIds);
map.put("masterId", masterId);
getSessionTemplate().delete(getStatement("deleteByBook"), map);
}
@Override
public List<String> getTagWxGroupIdsByMasterId(Long masterId) {
return getSessionTemplate().selectList(getStatement("getTagWxGroupIdsByMasterId"), masterId);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dao/impl/AdvertisingMasterDaoImpl.java
package com.pcloud.book.advertising.dao.impl; package com.pcloud.book.advertising.dao.impl;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.pcloud.book.advertising.dao.AdvertisingMasterDao; import com.pcloud.book.advertising.dao.AdvertisingMasterDao;
import com.pcloud.book.advertising.dto.AdvertisingMasterDTO; import com.pcloud.book.advertising.dto.AdvertisingMasterDTO;
import com.pcloud.book.advertising.entity.AdvertisingMaster; import com.pcloud.book.advertising.entity.AdvertisingMaster;
import com.pcloud.common.core.dao.BaseDaoImpl; import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* Description 广告主数据访问层接口实现类 * Description 广告主数据访问层接口实现类
* Created by PENG on 2019/4/26. * Created by PENG on 2019/4/26.
...@@ -29,4 +33,27 @@ public class AdvertisingMasterDaoImpl extends BaseDaoImpl<AdvertisingMaster> imp ...@@ -29,4 +33,27 @@ public class AdvertisingMasterDaoImpl extends BaseDaoImpl<AdvertisingMaster> imp
public AdvertisingMasterDTO getDTOById(Long masterId) { public AdvertisingMasterDTO getDTOById(Long masterId) {
return super.getSqlSession().selectOne(getStatement("getDTOById"), masterId); return super.getSqlSession().selectOne(getStatement("getDTOById"), masterId);
} }
@Override
public List<AdvertisingMaster> getByGroup(Long groupQrcodeId) {
return getSessionTemplate().selectList(getStatement("getByGroup"), groupQrcodeId);
}
@Override
public List<AdvertisingMasterDTO> getBrandMaster() {
return getSessionTemplate().selectList(getStatement("getBrandMaster"));
}
@Override
public Long getIdByUserLoginId(Long loginId) {
return getSessionTemplate().selectOne(getStatement("getIdByUserLoginId"), loginId);
}
@Override
public void updateMasterLoginId(Long masterId, Long loginId) {
Map<String, Object> map = new HashMap<>();
map.put("masterId", masterId);
map.put("loginId", loginId);
getSessionTemplate().update(getStatement("updateMasterLoginId"), map);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dto/AdvertisingMasterDTO.java
...@@ -84,6 +84,18 @@ public class AdvertisingMasterDTO extends BaseDto { ...@@ -84,6 +84,18 @@ public class AdvertisingMasterDTO extends BaseDto {
*/ */
private BigDecimal pilotFinishRate; private BigDecimal pilotFinishRate;
/**
* 登录账号id
*/
private Long loginId;
/**
* 登录名
*/
private String loginName;
/**
* 登录密码
*/
private String password;
public Long getId() { public Long getId() {
return id; return id;
...@@ -207,6 +219,30 @@ public class AdvertisingMasterDTO extends BaseDto { ...@@ -207,6 +219,30 @@ public class AdvertisingMasterDTO extends BaseDto {
this.pilotFinishRate = pilotFinishRate; this.pilotFinishRate = pilotFinishRate;
} }
public Long getLoginId() {
return loginId;
}
public void setLoginId(Long loginId) {
this.loginId = loginId;
}
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Override @Override
public String toString() { public String toString() {
return "AdvertisingMasterDTO{" + return "AdvertisingMasterDTO{" +
...@@ -225,6 +261,9 @@ public class AdvertisingMasterDTO extends BaseDto { ...@@ -225,6 +261,9 @@ public class AdvertisingMasterDTO extends BaseDto {
", clickUserNum=" + clickUserNum + ", clickUserNum=" + clickUserNum +
", pilotFinishUserNum=" + pilotFinishUserNum + ", pilotFinishUserNum=" + pilotFinishUserNum +
", pilotFinishRate=" + pilotFinishRate + ", pilotFinishRate=" + pilotFinishRate +
", loginId=" + loginId +
", loginName='" + loginName + '\'' +
", password='" + password + '\'' +
'}'; '}';
} }
} }
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dto/Book4AdvertisingMasterDTO.java 0 → 100644
package com.pcloud.book.advertising.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pcloud.common.dto.BaseDto;
import java.util.Date;
/**
* @描述：广告主标记书刊列表
* @作者：zhuyajie
* @创建时间：11:51 2019/8/22
* @版本：1.0
*/
public class Book4AdvertisingMasterDTO extends BaseDto {
/**
* 书籍标识
*/
private Long bookId;
/**
* 书籍ISBN码
*/
private String isbn;
/**
* 书籍名称
*/
private String bookName;
/**
* 创建日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 微信群数量
*/
private Integer groupCount;
/**
* 群总人数
*/
private Integer groupUserNum;
public Long getBookId() {
return bookId;
}
public void setBookId(Long bookId) {
this.bookId = bookId;
}
public String getIsbn() {
return isbn;
}
public void setIsbn(String isbn) {
this.isbn = isbn;
}
public String getBookName() {
return bookName;
}
public void setBookName(String bookName) {
this.bookName = bookName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getGroupCount() {
return groupCount;
}
public void setGroupCount(Integer groupCount) {
this.groupCount = groupCount;
}
public Integer getGroupUserNum() {
return groupUserNum;
}
public void setGroupUserNum(Integer groupUserNum) {
this.groupUserNum = groupUserNum;
}
@Override
public String toString() {
return "Book4AdvertisingMasterDTO{" +
"bookId=" + bookId +
", isbn='" + isbn + '\'' +
", bookName='" + bookName + '\'' +
", createTime=" + createTime +
", groupCount=" + groupCount +
", groupUserNum=" + groupUserNum +
'}';
}
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dto/GroupMasterAddDTO.java 0 → 100644
package com.pcloud.book.advertising.dto;
import com.pcloud.common.dto.BaseDto;
import java.util.List;
/**
* @描述：微信群标记广告主
* @作者：zhuyajie
* @创建时间：17:19 2019/8/21
* @版本：1.0
*/
public class GroupMasterAddDTO extends BaseDto{
//按微信群标记
/**
* 微信群二维码id
*/
private List<Long> groupQrcodeIdList;
/**
* 广告主id列表
*/
private List<Long> masterIdList;
//按图书标记
/**
* 广告主id
*/
private Long masterId;
/**
* 图书id列表
*/
private List<Long> bookIdList;
public List<Long> getGroupQrcodeIdList() {
return groupQrcodeIdList;
}
public void setGroupQrcodeIdList(List<Long> groupQrcodeIdList) {
this.groupQrcodeIdList = groupQrcodeIdList;
}
public List<Long> getMasterIdList() {
return masterIdList;
}
public void setMasterIdList(List<Long> masterIdList) {
this.masterIdList = masterIdList;
}
public Long getMasterId() {
return masterId;
}
public void setMasterId(Long masterId) {
this.masterId = masterId;
}
public List<Long> getBookIdList() {
return bookIdList;
}
public void setBookIdList(List<Long> bookIdList) {
this.bookIdList = bookIdList;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/dto/GroupMasterDTO.java 0 → 100644
package com.pcloud.book.advertising.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pcloud.book.advertising.entity.AdvertisingMaster;
import com.pcloud.common.dto.BaseDto;
import java.util.Date;
import java.util.List;
/**
* @描述：群广告主标记列表
* @作者：zhuyajie
* @创建时间：15:00 2019/8/21
* @版本：1.0
*/
public class GroupMasterDTO extends BaseDto{
/**
* 微信群id
*/
private String wxGroupId;
/**
* 群二维码id
*/
private Long groupQrcodeId;
/**
* 微信群名称
*/
private String groupName;
/**
* 图书名称
*/
private String bookName;
/**
* 群分类名称
*/
private String classify;
/**
* 专业标签ID
*/
private Long proLabelId;
/**
* 专业标签名称
*/
private String proLabelName;
/**
* 深度标签ID
*/
private Long depLabelId;
/**
* 深度标签名称
*/
private String depLabelName;
/**
* 目的标签ID
*/
private Long purLabelId;
/**
* 目的标签名称
*/
private String purLabelName;
/**
* 出版社名称
*/
private String agentName;
/**
* 编辑id
*/
private Long adviserId;
/**
* 编辑名称
*/
private String adviserName;
/**
* 活跃度
*/
private Integer activeCount;
/**
* 当前群人数
*/
private Integer userNumber;
/**
* 广告位数量
*/
private Integer advertisingSpaceNum;
/**
* 群二维码url
*/
private String qrcodeUrl;
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date createTime;
/**
* 标记的广告主列表
*/
List<AdvertisingMaster> masterList;
/**
* 标记时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date tagTime;
/**
* isbn
*/
private String isbn;
public String getWxGroupId() {
return wxGroupId;
}
public void setWxGroupId(String wxGroupId) {
this.wxGroupId = wxGroupId;
}
public Long getGroupQrcodeId() {
return groupQrcodeId;
}
public void setGroupQrcodeId(Long groupQrcodeId) {
this.groupQrcodeId = groupQrcodeId;
}
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
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;
}
public Long getProLabelId() {
return proLabelId;
}
public void setProLabelId(Long proLabelId) {
this.proLabelId = proLabelId;
}
public String getProLabelName() {
return proLabelName;
}
public void setProLabelName(String proLabelName) {
this.proLabelName = proLabelName;
}
public Long getDepLabelId() {
return depLabelId;
}
public void setDepLabelId(Long depLabelId) {
this.depLabelId = depLabelId;
}
public String getDepLabelName() {
return depLabelName;
}
public void setDepLabelName(String depLabelName) {
this.depLabelName = depLabelName;
}
public Long getPurLabelId() {
return purLabelId;
}
public void setPurLabelId(Long purLabelId) {
this.purLabelId = purLabelId;
}
public String getPurLabelName() {
return purLabelName;
}
public void setPurLabelName(String purLabelName) {
this.purLabelName = purLabelName;
}
public String getAgentName() {
return agentName;
}
public void setAgentName(String agentName) {
this.agentName = agentName;
}
public Long getAdviserId() {
return adviserId;
}
public void setAdviserId(Long adviserId) {
this.adviserId = adviserId;
}
public String getAdviserName() {
return adviserName;
}
public void setAdviserName(String adviserName) {
this.adviserName = adviserName;
}
public Integer getActiveCount() {
return activeCount;
}
public void setActiveCount(Integer activeCount) {
this.activeCount = activeCount;
}
public Integer getUserNumber() {
return userNumber;
}
public void setUserNumber(Integer userNumber) {
this.userNumber = userNumber;
}
public Integer getAdvertisingSpaceNum() {
return advertisingSpaceNum;
}
public void setAdvertisingSpaceNum(Integer advertisingSpaceNum) {
this.advertisingSpaceNum = advertisingSpaceNum;
}
public String getQrcodeUrl() {
return qrcodeUrl;
}
public void setQrcodeUrl(String qrcodeUrl) {
this.qrcodeUrl = qrcodeUrl;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public List<AdvertisingMaster> getMasterList() {
return masterList;
}
public void setMasterList(List<AdvertisingMaster> masterList) {
this.masterList = masterList;
}
public Date getTagTime() {
return tagTime;
}
public void setTagTime(Date tagTime) {
this.tagTime = tagTime;
}
public String getIsbn() {
return isbn;
}
public void setIsbn(String isbn) {
this.isbn = isbn;
}
@Override
public String toString() {
return "GroupMasterDTO{" +
"wxGroupId='" + wxGroupId + '\'' +
", groupQrcodeId=" + groupQrcodeId +
", groupName='" + groupName + '\'' +
", bookName='" + bookName + '\'' +
", classify='" + classify + '\'' +
", proLabelId=" + proLabelId +
", proLabelName='" + proLabelName + '\'' +
", depLabelId=" + depLabelId +
", depLabelName='" + depLabelName + '\'' +
", purLabelId=" + purLabelId +
", purLabelName='" + purLabelName + '\'' +
", agentName='" + agentName + '\'' +
", adviserId=" + adviserId +
", adviserName='" + adviserName + '\'' +
", activeCount=" + activeCount +
", userNumber=" + userNumber +
", advertisingSpaceNum=" + advertisingSpaceNum +
", qrcodeUrl='" + qrcodeUrl + '\'' +
", createTime=" + createTime +
", masterList=" + masterList +
", tagTime=" + tagTime +
", isbn='" + isbn + '\'' +
'}';
}
}
pcloud-service-book/src/main/java/com/pcloud/book/advertising/entity/AdvertisingGroupTag.java 0 → 100644
package com.pcloud.book.advertising.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pcloud.common.entity.BaseEntity;
import java.util.Date;
/**
* 群标记广告主
*/
public class AdvertisingGroupTag extends BaseEntity{
/**
* 被标记的图书id
*/
private Long tagBookId;
/**
* 群二维码id
*/
private Long groupQrcodeId;
/**
* 广告主id
*/
private Long masterId;
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date createTime;
public Long getTagBookId() {
return tagBookId;
}
public void setTagBookId(Long tagBookId) {
this.tagBookId = tagBookId;
}
public Long getGroupQrcodeId() {
return groupQrcodeId;
}
public void setGroupQrcodeId(Long groupQrcodeId) {
this.groupQrcodeId = groupQrcodeId;
}
public Long getMasterId() {
return masterId;
}
public void setMasterId(Long masterId) {
this.masterId = masterId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return "AdvertisingGroupTag{" +
"tagBookId=" + tagBookId +
", groupQrcodeId=" + groupQrcodeId +
", masterId=" + masterId +
", createTime=" + createTime +
'}';
}
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/advertising/entity/AdvertisingMaster.java
...@@ -33,6 +33,19 @@ public class AdvertisingMaster extends BaseEntity { ...@@ -33,6 +33,19 @@ public class AdvertisingMaster extends BaseEntity {
*/ */
private List<AdvertisingSettlementMethod> settlementMethodList; private List<AdvertisingSettlementMethod> settlementMethodList;
/**
* 登录名
*/
private String loginName;
/**
* 登录密码
*/
private String password;
/**
* 登录账号id
*/
private Long loginId;
@Override @Override
public Long getId() { public Long getId() {
return id; return id;
...@@ -79,6 +92,30 @@ public class AdvertisingMaster extends BaseEntity { ...@@ -79,6 +92,30 @@ public class AdvertisingMaster extends BaseEntity {
this.settlementMethodList = settlementMethodList; this.settlementMethodList = settlementMethodList;
} }
public String getLoginName() {
return loginName;
}
public void setLoginName(String loginName) {
this.loginName = loginName;
}
public Long getLoginId() {
return loginId;
}
public void setLoginId(Long loginId) {
this.loginId = loginId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Override @Override
public String toString() { public String toString() {
return "AdvertisingMaster{" + return "AdvertisingMaster{" +
...@@ -87,6 +124,10 @@ public class AdvertisingMaster extends BaseEntity { ...@@ -87,6 +124,10 @@ public class AdvertisingMaster extends BaseEntity {
", createTime=" + createTime + ", createTime=" + createTime +
", updateTime=" + updateTime + ", updateTime=" + updateTime +
", settlementMethodList=" + settlementMethodList + ", settlementMethodList=" + settlementMethodList +
"} " + super.toString(); ", loginName='" + loginName + '\'' +
", password='" + password + '\'' +
", loginId=" + loginId +
'}';
} }
} }
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/advertising/enums/SettlementMethodEnum.java
...@@ -9,7 +9,8 @@ public enum SettlementMethodEnum { ...@@ -9,7 +9,8 @@ public enum SettlementMethodEnum {
CPC("CPC", "按点击量"), CPC("CPC", "按点击量"),
CPM("CPM", "按曝光量"), CPM("CPM", "按曝光量"),
CPA("CPA", "按实际行动"), CPA("CPA", "按实际行动"),
CPS("CPS", "按实际销售"); CPS("CPS", "按实际销售"),
Brand("Brand","品牌方，线下结算");
public final String code; public final String code;
...@@ -32,7 +33,7 @@ public enum SettlementMethodEnum { ...@@ -32,7 +33,7 @@ public enum SettlementMethodEnum {
return null; return null;
} }
public static final String[] SETTLEMENT_METHOD_GATHER = {CPC.code, CPM.code, CPA.code, CPS.code}; public static final String[] SETTLEMENT_METHOD_GATHER = {CPC.code, CPM.code, CPA.code, CPS.code, Brand.code};
public static final String[] SETTLEMENT_METHOD_NEED_PRICE_GATHER = {CPC.code, CPM.code, CPA.code}; public static final String[] SETTLEMENT_METHOD_NEED_PRICE_GATHER = {CPC.code, CPM.code, CPA.code};
} }
pcloud-service-book/src/main/java/com/pcloud/book/advertising/service/impl/AdvertisingSpaceServiceImpl.java
package com.pcloud.book.advertising.service.impl; package com.pcloud.book.advertising.service.impl;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz; import com.pcloud.book.advertising.biz.AdvertisingSpaceBiz;
import com.pcloud.book.advertising.biz.GroupMasterTagBiz;
import com.pcloud.book.advertising.service.AdvertisingSpaceService; import com.pcloud.book.advertising.service.AdvertisingSpaceService;
import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.utils.ResponseHandleUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map; import java.util.Map;
import io.swagger.annotations.ApiOperation;
/** /**
* Description 广告位内部接口实现类 * Description 广告位内部接口实现类
* Created by PENG on 2019/5/6. * Created by PENG on 2019/5/6.
...@@ -23,6 +37,8 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService { ...@@ -23,6 +37,8 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService {
@Autowired @Autowired
private AdvertisingSpaceBiz advertisingSpaceBiz; private AdvertisingSpaceBiz advertisingSpaceBiz;
@Autowired
private GroupMasterTagBiz groupMasterTagBiz;
/** /**
* 每日凌晨计算昨日广告位收益 * 每日凌晨计算昨日广告位收益
...@@ -40,4 +56,12 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService { ...@@ -40,4 +56,12 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService {
LOGGER.info("内部接口群发广告被调用"+map.toString()); LOGGER.info("内部接口群发广告被调用"+map.toString());
advertisingSpaceBiz.sendAdvertisingPlan(new Long(map.get("advertisingPutId").toString())); advertisingSpaceBiz.sendAdvertisingPlan(new Long(map.get("advertisingPutId").toString()));
} }
@Override
@GetMapping("getTagWxGroupIdsByUserId")
@ParamLog("根据登录用户获取标记的微信群列表")
public ResponseEntity<ResponseDto<List<String>>> getTagWxGroupIdsByUserId(@RequestParam("userId") Long userId) {
List<String> list = groupMasterTagBiz.getTagWxGroupIdsByUserId(userId);
return ResponseHandleUtil.toResponse(list);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java
...@@ -200,7 +200,7 @@ public interface BookBiz { ...@@ -200,7 +200,7 @@ public interface BookBiz {
* @return * @return
* @throws BizException * @throws BizException
*/ */
PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException; PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId, Integer hasQrcode) throws BizException;
/** /**
* 首页展示正在做的图书 * 首页展示正在做的图书
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
...@@ -37,6 +37,7 @@ import com.pcloud.book.book.dto.BookNameUpdateDTO; ...@@ -37,6 +37,7 @@ import com.pcloud.book.book.dto.BookNameUpdateDTO;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.entity.BookAdviser; import com.pcloud.book.book.entity.BookAdviser;
import com.pcloud.book.book.set.BookSet; import com.pcloud.book.book.set.BookSet;
import com.pcloud.book.book.tools.BookTools;
import com.pcloud.book.book.vo.ListNoAuthBookParam; import com.pcloud.book.book.vo.ListNoAuthBookParam;
import com.pcloud.book.consumer.analysisengine.SceneRecordConsr; import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
import com.pcloud.book.consumer.app.AssistTempletConsr; import com.pcloud.book.consumer.app.AssistTempletConsr;
...@@ -725,12 +726,24 @@ public class BookBizImpl implements BookBiz { ...@@ -725,12 +726,24 @@ public class BookBizImpl implements BookBiz {
* 获取书籍列表(编辑) * 获取书籍列表(编辑)
*/ */
@Override @Override
public PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException { public PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId, Integer hasQrcode) throws BizException {
LOGGER.info("【书籍应用】获取书籍列表,<START>.[paramMap]=" + paramMap.toString()); LOGGER.info("【书籍应用】获取书籍列表,<START>.[paramMap]=" + paramMap.toString());
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) { if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
return new PageBean(0, 0, new ArrayList<>()); return new PageBean(0, 0, new ArrayList<>());
} }
if (null != hasQrcode && 1 == hasQrcode) {
List<Long> channelIds = BookTools.listChannelIds(pageBean.getRecordList());
List<com.pcloud.channelcenter.qrcode.dto.BookDto> bookIds = qrcodeSceneConsr.getQrcodeBookIds(channelIds, adviserId);
if (ListUtils.isEmpty(bookIds)){
return new PageBean(0, 0, new ArrayList<>());
}
paramMap.put("bookIds", bookIds);
pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
return new PageBean(0, 0, new ArrayList<>());
}
}
// 填充渠道基础信息 // 填充渠道基础信息
bookSet.setChannelInfoList(pageBean.getRecordList()); bookSet.setChannelInfoList(pageBean.getRecordList());
bookSet.setBookSvUvPv4Object(pageBean.getRecordList()); bookSet.setBookSvUvPv4Object(pageBean.getRecordList());
...@@ -1261,8 +1274,8 @@ public class BookBizImpl implements BookBiz { ...@@ -1261,8 +1274,8 @@ public class BookBizImpl implements BookBiz {
LOGGER.info("图书列表（平台端）<START>,paramMap=" + paramMap); LOGGER.info("图书列表（平台端）<START>,paramMap=" + paramMap);
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify", "listBookClassifyCount"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify", "listBookClassifyCount");
if (pageBean != null) { if (pageBean != null) {
// 设置编辑名称 // 设置编辑名称,手机号
bookSet.setAdviserName4BookDto(pageBean.getRecordList()); bookSet.setAdviserInfo4BookDto(pageBean.getRecordList());
// 设置图书读者量、扫码量、浏览量 // 设置图书读者量、扫码量、浏览量
bookSet.setBookSvUvPv4Object(pageBean.getRecordList()); bookSet.setBookSvUvPv4Object(pageBean.getRecordList());
// 设置书刊分类 // 设置书刊分类
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java
...@@ -145,7 +145,8 @@ public interface BookFacade { ...@@ -145,7 +145,8 @@ public interface BookFacade {
@ApiImplicitParam(name = "isFundSupport", value = "只看基金支持", dataType = "int", paramType = "query"), @ApiImplicitParam(name = "isFundSupport", value = "只看基金支持", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "bookId", value = "书籍标识", dataType = "int", paramType = "query"), @ApiImplicitParam(name = "bookId", value = "书籍标识", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "templetId", value = "图书类型标识", dataType = "long", paramType = "query"), @ApiImplicitParam(name = "templetId", value = "图书类型标识", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "bookStatus", value = "图书版权保护状态", dataType = "Integer", paramType = "query")}) @ApiImplicitParam(name = "bookStatus", value = "图书版权保护状态", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "hasQrcode", value = "只看有二维码", dataType = "int", paramType = "query")})
@RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET) @RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET)
ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token, ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token,
@RequestParam(value = "name", required = false) String name, @RequestParam(value = "name", required = false) String name,
...@@ -160,7 +161,8 @@ public interface BookFacade { ...@@ -160,7 +161,8 @@ public interface BookFacade {
@RequestParam(value = "bookId", required = false) Integer bookId, @RequestParam(value = "bookId", required = false) Integer bookId,
@RequestParam(value = "templetId", required = false) Long templetId, @RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "bookStatus", required = false) Integer bookStatus, @RequestParam(value = "bookStatus", required = false) Integer bookStatus,
@RequestParam(value = "secondTempletId", required = false) Long secondTempletId) @RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
@RequestParam(value = "hasQrcode",required = false) Integer hasQrcode)
throws BizException, PermissionException; throws BizException, PermissionException;
@ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET") @ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET")
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
...@@ -238,7 +238,8 @@ public class BookFacadeImpl implements BookFacade { ...@@ -238,7 +238,8 @@ public class BookFacadeImpl implements BookFacade {
@RequestParam(value = "bookId", required = false) Integer bookId, @RequestParam(value = "bookId", required = false) Integer bookId,
@RequestParam(value = "templetId", required = false) Long templetId, @RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "bookStatus", required = false) Integer bookStatus, @RequestParam(value = "bookStatus", required = false) Integer bookStatus,
@RequestParam(value = "secondTempletId",required = false) Long secondTempletId) @RequestParam(value = "secondTempletId",required = false) Long secondTempletId,
@RequestParam(value = "hasQrcode",required = false) Integer hasQrcode)
throws BizException, PermissionException { throws BizException, PermissionException {
Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID); Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) { if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
...@@ -258,7 +259,7 @@ public class BookFacadeImpl implements BookFacade { ...@@ -258,7 +259,7 @@ public class BookFacadeImpl implements BookFacade {
paramMap.put("bookStatus", bookStatus); paramMap.put("bookStatus", bookStatus);
paramMap.put("secondTempletId",secondTempletId); paramMap.put("secondTempletId",secondTempletId);
paramMap.put("secondTempletIds", Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList())); paramMap.put("secondTempletIds", Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
PageBean pageBean = bookBiz.getListPage4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId); PageBean pageBean = bookBiz.getListPage4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId, hasQrcode);
return new ResponseDto<>(pageBean); return new ResponseDto<>(pageBean);
} }
......
pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java
...@@ -3,28 +3,9 @@ ...@@ -3,28 +3,9 @@
*/ */
package com.pcloud.book.book.set; package com.pcloud.book.book.set;
import java.math.BigDecimal; import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto; import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto;
import com.pcloud.appcenter.app.dto.AppDto; import com.pcloud.appcenter.app.dto.AppDto;
import com.pcloud.appcenter.assist.dto.AssistTempletDTO; import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
...@@ -98,6 +79,27 @@ import com.pcloud.usercenter.party.adviser.entity.Adviser; ...@@ -98,6 +79,27 @@ import com.pcloud.usercenter.party.adviser.entity.Adviser;
import com.pcloud.usercenter.party.agent.entity.Agent; import com.pcloud.usercenter.party.agent.entity.Agent;
import com.pcloud.voicemessage.party.merchant.entity.MerchantVideo; import com.pcloud.voicemessage.party.merchant.entity.MerchantVideo;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
/** /**
* @描述：图书信息填充 * @描述：图书信息填充
* @作者：songx * @作者：songx
...@@ -1630,4 +1632,28 @@ public class BookSet { ...@@ -1630,4 +1632,28 @@ public class BookSet {
// 批量填充运营信息 // 批量填充运营信息
BookTools.setChannelNames4NoAuthBookVO(noAuthBookVOS, channelNameMap); BookTools.setChannelNames4NoAuthBookVO(noAuthBookVOS, channelNameMap);
} }
public void setAdviserInfo4BookDto(List<Object> objects) {
LOGGER.info("【书刊基础】批量填充顾问名称、手机号,<START>");
// 组装编辑标识(去重)
List<Long> adviserIds = BookTools.listAdviserIds(objects);
// 从用户中心批量获取编辑名称
Map<Long, AdviserBaseInfoDto> adviserMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(adviserIds);
if (MapUtils.isEmpty(adviserMap)) {
return;
}
// 批量填充编辑名称手机号
for (Object object : objects) {
BookDto bookDto = (BookDto) object;
Long adviserId = bookDto.getAdviserId();
if (adviserMap.containsKey(adviserId)) {
bookDto.setAdviserName(adviserMap.get(adviserId).getPartyName());
bookDto.setPhone(adviserMap.get(adviserId).getPhoneNum());
} else {
bookDto.setAdviserName("");
bookDto.setPhone("");
}
}
LOGGER.info("【书刊基础】批量填充顾问名称、手机号,<END>");
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
package com.pcloud.book.consumer.channel; package com.pcloud.book.consumer.channel;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.channelcenter.qrcode.dto.BookDto;
import com.pcloud.channelcenter.qrcode.dto.GroupQrcodeVO; import com.pcloud.channelcenter.qrcode.dto.GroupQrcodeVO;
import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto; import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService; import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService;
...@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -324,4 +326,16 @@ public class QrcodeSceneConsr { ...@@ -324,4 +326,16 @@ public class QrcodeSceneConsr {
} }
return null; return null;
} }
@ParamLog("获取编辑下有二维码的图书")
public List<BookDto> getQrcodeBookIds(List<Long> channelIds, Long adviserId) {
List<BookDto> bookIds = new ArrayList<>();
try {
bookIds = ResponseHandleUtil.parseListResponse(qrcodeSceneService.getQrcodeBookIds(channelIds, adviserId), BookDto.class);
} catch (Exception e) {
LOGGER.error("【二维码-渠道】 获取编辑下有二维码的图书,<ERROR>.[getQrcodeBookIds]:" + e.getMessage(), e);
}
return bookIds;
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/PartyConsr.java
...@@ -3,26 +3,26 @@ ...@@ -3,26 +3,26 @@
*/ */
package com.pcloud.book.consumer.user; package com.pcloud.book.consumer.user;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.usercenter.party.common.dto.PartyListDto; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.ResponseHandleUtil;
import com.pcloud.usercenter.party.agent.entity.Agent;
import com.pcloud.usercenter.party.common.service.PartyService;
import com.pcloud.usercenter.party.common.vo.PartyIdListVO; import com.pcloud.usercenter.party.common.vo.PartyIdListVO;
import com.pcloud.usercenter.user.entity.UserLogin;
import com.pcloud.usercenter.user.service.UserLoginService; import com.pcloud.usercenter.user.service.UserLoginService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.pcloud.common.exceptions.BizException; import java.util.HashMap;
import com.pcloud.common.utils.ListUtils; import java.util.List;
import com.pcloud.common.utils.ResponseHandleUtil; import java.util.Map;
import com.pcloud.usercenter.party.agent.entity.Agent;
import com.pcloud.usercenter.party.common.service.PartyService;
/** /**
* @描述：当事人中间类 * @描述：当事人中间类
...@@ -76,4 +76,49 @@ public class PartyConsr { ...@@ -76,4 +76,49 @@ public class PartyConsr {
PartyIdListVO partyIdListVO = ResponseHandleUtil.parseResponse(partyIdList, PartyIdListVO.class); PartyIdListVO partyIdListVO = ResponseHandleUtil.parseResponse(partyIdList, PartyIdListVO.class);
return partyIdListVO; return partyIdListVO;
} }
@ParamLog("创建平台端登录账号")
public Long addLoginAccount(String loginName, String password) {
Long loginId = null;
try {
//todo
loginId = 000l;
} catch (Exception e) {
LOGGER.error("【用户中心】创建平台端登录账号失败" + e.getMessage(), e);
}
return loginId;
}
@ParamLog("修改平台端登录账号")
public void updateLoginAccount(String loginName, String password, Long loginId) {
try {
//todo
} catch (Exception e) {
LOGGER.error("【用户中心】修改平台端登录账号失败" + e.getMessage(), e);
}
}
@ParamLog("删除登录账号")
public void deleteLoginAccount(Long loginId) {
try {
//todo
} catch (Exception e) {
LOGGER.error("【用户中心】删除平台端登录账号失败" + e.getMessage(), e);
}
}
@ParamLog("获取登录账号信息")
public UserLogin getUserLoginInfo(Long loginId) {
UserLogin userLogin = new UserLogin();
try {
userLogin = ResponseHandleUtil.parseResponse(userLoginService.getUserLoginInfo(loginId), UserLogin.class);
} catch (Exception e) {
LOGGER.error("【用户中心】获取平台端登录账号失败" + e.getMessage(), e);
}
return userLogin;
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java
...@@ -325,6 +325,17 @@ public class WechatGroupConsr { ...@@ -325,6 +325,17 @@ public class WechatGroupConsr {
return map; return map;
} }
@ParamLog("根据用户微信ID获取用户信息")
public GroupUserDTO getWxUserInfoByWxUserId(String wxUserId) {
GroupUserDTO dto = new GroupUserDTO();
try {
dto = ResponseHandleUtil.parseResponse(groupMemberService.getWxUserInfoByWxId(wxUserId), GroupUserDTO.class);
} catch (Exception e) {
log.error("根据用户微信ID获取用户信息.[getWxUserInfoByWxId]:" + e.getMessage(), e);
}
return dto;
}
@ParamLog(value = "获取可用机器人") @ParamLog(value = "获取可用机器人")
public SelfRobotDTO getAvailableRobot(Long wechatUserId, Integer largeTemplet, Long classifyId) { public SelfRobotDTO getAvailableRobot(Long wechatUserId, Integer largeTemplet, Long classifyId) {
SelfRobotDTO selfRobotDTO = null; SelfRobotDTO selfRobotDTO = null;
...@@ -335,15 +346,19 @@ public class WechatGroupConsr { ...@@ -335,15 +346,19 @@ public class WechatGroupConsr {
} }
return selfRobotDTO; return selfRobotDTO;
} }
@ParamLog("根据用户微信ID获取用户信息")
public GroupUserDTO getWxUserInfoByWxUserId(String wxUserId) { @ParamLog(value = "根据群id集合最近7天群活跃度")
GroupUserDTO dto = new GroupUserDTO(); public Map<Long,Integer> get7DayActiveCountByQrcode(List<Long> qrcodeIds) {
Map<Long, Integer> map = new HashMap<>();
try { try {
dto = ResponseHandleUtil.parseResponse(groupMemberService.getWxUserInfoByWxId(wxUserId), GroupUserDTO.class); map = ResponseHandleUtil.parseMapResponse(messageService.get7DayActiveCountByQrcode(qrcodeIds), Long.class, Integer.class);
} catch (Exception e) { } catch (Exception e) {
log.error("根据用户微信ID获取用户信息.[getWxUserInfoByWxId]:" + e.getMessage(), e); log.error("根据群id集合最近7天群活跃度.[get7DayActiveCountByQrcode]:" + e.getMessage(), e);
} }
return dto; if (map == null) {
return new HashMap<>();
}
return map;
} }
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/GroupQrcodeDao.java
package com.pcloud.book.group.dao; package com.pcloud.book.group.dao;
import com.pcloud.book.advertising.dto.GroupMasterDTO;
import com.pcloud.book.advertising.dto.WeixinClassifyInfoDTO; import com.pcloud.book.advertising.dto.WeixinClassifyInfoDTO;
import com.pcloud.book.group.dto.*; import com.pcloud.book.group.dto.*;
import com.pcloud.book.group.entity.GroupQrcode; import com.pcloud.book.group.entity.GroupQrcode;
...@@ -208,6 +209,36 @@ public interface GroupQrcodeDao extends BaseDao<GroupQrcode> { ...@@ -208,6 +209,36 @@ public interface GroupQrcodeDao extends BaseDao<GroupQrcode> {
/** /**
* 根据分类id获取分类下的群---不分页 * 根据分类id获取分类下的群---不分页
*/ */
/**
* 书下所有群
* @param bookId
* @return
*/
public List<Long> getIdsByBookId(Long bookId);
/**
* 群所属书id
* @param qrcodeId
* @return
*/
public Long getBookIdByGroupQrcodeId(Long qrcodeId);
/**
* 查书下群数量群人数
* @param bookId
* @return
*/
public Map<String, Object> getGroupCountUserCountByBookId(Long bookId);
/**
* 查询微信群广告标记列表
* @param map
* @return
*/
public List<GroupMasterDTO> listPageGroupMaster(Map<String, Object> map);
List<ClassifyQrcodeVO> getQrcodeByClassify(Long classifyId); List<ClassifyQrcodeVO> getQrcodeByClassify(Long classifyId);
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/GroupQrcodeDaoImpl.java
...@@ -2,6 +2,7 @@ package com.pcloud.book.group.dao.impl; ...@@ -2,6 +2,7 @@ package com.pcloud.book.group.dao.impl;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.pcloud.book.advertising.dto.GroupMasterDTO;
import com.pcloud.book.advertising.dto.WeixinClassifyInfoDTO; import com.pcloud.book.advertising.dto.WeixinClassifyInfoDTO;
import com.pcloud.book.group.dao.GroupQrcodeDao; import com.pcloud.book.group.dao.GroupQrcodeDao;
import com.pcloud.book.group.dto.*; import com.pcloud.book.group.dto.*;
...@@ -203,4 +204,24 @@ public class GroupQrcodeDaoImpl extends BaseDaoImpl<GroupQrcode> implements Grou ...@@ -203,4 +204,24 @@ public class GroupQrcodeDaoImpl extends BaseDaoImpl<GroupQrcode> implements Grou
return this.getSqlSession().selectList(this.getStatement("getQrcodeByClassify"), classifyId); return this.getSqlSession().selectList(this.getStatement("getQrcodeByClassify"), classifyId);
} }
@Override
public List<Long> getIdsByBookId(Long bookId) {
return getSessionTemplate().selectList(getStatement("getIdsByBookId"), bookId);
}
@Override
public Long getBookIdByGroupQrcodeId(Long qrcodeId) {
return getSessionTemplate().selectOne(getStatement("getBookIdByGroupQrcodeId"), qrcodeId);
}
@Override
public Map<String, Object> getGroupCountUserCountByBookId(Long bookId) {
return getSessionTemplate().selectOne(getStatement("getGroupCountUserCountByBookId"), bookId);
}
@Override
public List<GroupMasterDTO> listPageGroupMaster(Map<String, Object> map) {
return getSessionTemplate().selectList(getStatement("listPageGroupMaster"), map);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/push/biz/impl/PushBizImpl.java
...@@ -265,8 +265,8 @@ public class PushBizImpl implements PushBiz { ...@@ -265,8 +265,8 @@ public class PushBizImpl implements PushBiz {
pushRecord.setPushStatus(PushStatusEnum.PUSHING.value); pushRecord.setPushStatus(PushStatusEnum.PUSHING.value);
//新增群发记录 //新增群发记录
pushRecordDao.insert(pushRecord); pushRecordDao.insert(pushRecord);
//新增细化到群的记录并发送消息 //新增细化到群的记录并发送消息，异步
addPushGroupRecordsAndSend(pushGroupList, pushRecord, pushItemList); ThreadPoolUtils.SEND_MESSAGE_THREAD_POOL.execute(() -> addPushGroupRecordsAndSend(pushGroupList, pushRecord, pushItemList));
} catch (Exception e) { } catch (Exception e) {
LOGGER.error(e.getMessage(), "群发消息失败！"+e); LOGGER.error(e.getMessage(), "群发消息失败！"+e);
pushRecordDao.updateStateById(pushRecord.getId(), PushStatusEnum.FAIL.value); pushRecordDao.updateStateById(pushRecord.getId(), PushStatusEnum.FAIL.value);
...@@ -299,7 +299,15 @@ public class PushBizImpl implements PushBiz { ...@@ -299,7 +299,15 @@ public class PushBizImpl implements PushBiz {
String altId = wechatGroupConsr.getRobotIdByGroupId(groupQrcode.getWeixinGroupId()); String altId = wechatGroupConsr.getRobotIdByGroupId(groupQrcode.getWeixinGroupId());
//遍历发送消息 //遍历发送消息
for (PushItem pushItem : pushItemList) { for (PushItem pushItem : pushItemList) {
sendWechatMessage(pushGroup, pushItem, pushGroupRecord.getId(), altId); try {
LOGGER.info("发送一个群里的一个消息开始pushGroup=" + pushGroup.toString() + "pushItem=" + pushItem.toString() + "altId=" + altId);
sendWechatMessage(pushGroup, pushItem, pushGroupRecord.getId(), altId);
LOGGER.info("发送一个群里的一个消息结束，休眠1秒pushGroup=" + pushGroup.toString() + "pushItem=" + pushItem.toString() + "altId=" + altId);
Thread.sleep(1000);
} catch (InterruptedException e) {
LOGGER.error("发消息休眠1秒出错", e);
}
} }
} }
} }
......
pcloud-service-book/src/main/resources/mapper/adnews/AdNewsGroupRecordMapper.xml
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
<result column="update_user" property="updateUser" jdbcType="BIGINT"/> <result column="update_user" property="updateUser" jdbcType="BIGINT"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="custom_content" property="customContent" jdbcType="VARCHAR"/> <result column="custom_content" property="customContent" jdbcType="VARCHAR"/>
<result column="content_type" property="contentType" jdbcType="BIGINT"/> <result column="content_type" property="contentType" jdbcType="INTEGER"/>
<result column="content_from" property="contentFrom" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
ad_news_group_record a ad_news_group_record a
INNER JOIN ad_news_message_statistic b ON a.message_statistic_id=b.id INNER JOIN ad_news_message_statistic b ON a.message_statistic_id=b.id
LEFT JOIN ad_news c ON a.ad_news_id=c.id LEFT JOIN ad_news c ON a.ad_news_id=c.id
LEFT JOIN ad_news_wechat d ON d.news_from=c.news_from AND ((b.content_from=2 AND d.adviser_id=#{partyId,jdbcType=BIGINT}) OR b.content_from <![CDATA[<>]]> 2) LEFT JOIN ad_news_wechat d ON d.news_from=c.news_from AND ((a.content_from=2 AND d.adviser_id=#{partyId,jdbcType=BIGINT}) OR a.content_from <![CDATA[<>]]> 2)
WHERE a.message_statistic_id=#{messageStatisticId,jdbcType=BIGINT} WHERE a.message_statistic_id=#{messageStatisticId,jdbcType=BIGINT}
AND a.create_user=#{partyId,jdbcType=BIGINT} AND a.create_user=#{partyId,jdbcType=BIGINT}
</select> </select>
...@@ -60,7 +61,8 @@ ...@@ -60,7 +61,8 @@
update_user, update_user,
update_time, update_time,
custom_content, custom_content,
content_type content_type,
content_from
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
#{messageStatisticId,jdbcType=BIGINT}, #{messageStatisticId,jdbcType=BIGINT},
...@@ -74,7 +76,8 @@ ...@@ -74,7 +76,8 @@
#{updateUser,jdbcType=BIGINT}, #{updateUser,jdbcType=BIGINT},
NOW(), NOW(),
#{customContent,jdbcType=VARCHAR}, #{customContent,jdbcType=VARCHAR},
#{contentType,jdbcType=INTEGER} #{contentType,jdbcType=INTEGER},
#{contentFrom,jdbcType=INTEGER}
</trim> </trim>
</insert> </insert>
...@@ -127,7 +130,8 @@ ...@@ -127,7 +130,8 @@
update_user, update_user,
update_time, update_time,
custom_content, custom_content,
content_type content_type,
content_from
) )
values values
<foreach collection="list" item="item" index="index" separator="," > <foreach collection="list" item="item" index="index" separator="," >
...@@ -143,7 +147,8 @@ ...@@ -143,7 +147,8 @@
#{item.updateUser,jdbcType=BIGINT}, #{item.updateUser,jdbcType=BIGINT},
NOW(), NOW(),
#{item.customContent,jdbcType=VARCHAR}, #{item.customContent,jdbcType=VARCHAR},
#{item.contentType,jdbcType=INTEGER} #{item.contentType,jdbcType=INTEGER},
#{item.contentFrom,jdbcType=INTEGER}
) )
</foreach> </foreach>
</insert> </insert>
......
pcloud-service-book/src/main/resources/mapper/adnews/AdNewsMapper.xml
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<result column="short_url" property="shortUrl" jdbcType="VARCHAR"/> <result column="short_url" property="shortUrl" jdbcType="VARCHAR"/>
<result column="news_date" property="newsDate" jdbcType="VARCHAR"/> <result column="news_date" property="newsDate" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="content_from" property="contentFrom" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
--> -->
<select id="getNewsToSendBySetIdAndAdviser" parameterType="map" resultMap="BaseResultMap"> <select id="getNewsToSendBySetIdAndAdviser" parameterType="map" resultMap="BaseResultMap">
SELECT SELECT
a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time,0 content_from
FROM FROM
ad_news a ad_news a
INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0 INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0
...@@ -130,7 +131,7 @@ ...@@ -130,7 +131,7 @@
--> -->
<select id="getNewsToSendBySetIdAndAdviser4Own" parameterType="map" resultMap="BaseResultMap"> <select id="getNewsToSendBySetIdAndAdviser4Own" parameterType="map" resultMap="BaseResultMap">
SELECT SELECT
a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time a.id, a.type, a.news_from, a.title, a.publisher, a.url, a.short_url, a.news_date, a.create_time,2 content_from
FROM FROM
ad_news a ad_news a
INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0 AND b.adviser_id=#{adviserId} INNER JOIN ad_news_wechat b ON a.news_from = b.news_from AND b.is_delete = 0 AND b.adviser_id=#{adviserId}
......
pcloud-service-book/src/main/resources/mapper/adnews/AdNewsMessageStatisticMapper.xml
...@@ -7,14 +7,13 @@ ...@@ -7,14 +7,13 @@
<result column="classify_id" property="classifyId" jdbcType="BIGINT"/> <result column="classify_id" property="classifyId" jdbcType="BIGINT"/>
<result column="book_group_id" property="bookGroupId" jdbcType="BIGINT"/> <result column="book_group_id" property="bookGroupId" jdbcType="BIGINT"/>
<result column="ad_news_set_id" property="adNewsSetId" jdbcType="BIGINT"/> <result column="ad_news_set_id" property="adNewsSetId" jdbcType="BIGINT"/>
<result column="content_from" property="contentFrom" jdbcType="INTEGER"/>
<result column="message_count" property="messageCount" jdbcType="INTEGER"/> <result column="message_count" property="messageCount" jdbcType="INTEGER"/>
<result column="create_user" property="createUser" jdbcType="BIGINT"/> <result column="create_user" property="createUser" jdbcType="BIGINT"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, qrcode_id, classify_id, book_group_id, ad_news_set_id, content_from, message_count, create_user, create_time id, qrcode_id, classify_id, book_group_id, ad_news_set_id, message_count, create_user, create_time
</sql> </sql>
<select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long"> <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
b.pur_label_id purLabelId, b.pur_label_id purLabelId,
a.message_count messageCount, a.message_count messageCount,
a.create_time createTime, a.create_time createTime,
a.content_from contentFrom, (select GROUP_CONCAT(distinct content_from SEPARATOR ',') FROM ad_news_group_record WHERE message_statistic_id=a.id) contentFroms,
(SELECT COUNT(1) FROM ad_news_click_record x WHERE x.message_statistic_id=a.id) clickCount, (SELECT COUNT(1) FROM ad_news_click_record x WHERE x.message_statistic_id=a.id) clickCount,
(SELECT COUNT(DISTINCT wechat_user_id) FROM ad_news_click_record x WHERE x.message_statistic_id=a.id) userCount (SELECT COUNT(DISTINCT wechat_user_id) FROM ad_news_click_record x WHERE x.message_statistic_id=a.id) userCount
FROM FROM
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
classify_id, classify_id,
book_group_id, book_group_id,
ad_news_set_id, ad_news_set_id,
content_from,
message_count, message_count,
create_user, create_user,
create_time create_time
...@@ -92,7 +90,6 @@ ...@@ -92,7 +90,6 @@
#{classifyId,jdbcType=BIGINT}, #{classifyId,jdbcType=BIGINT},
#{bookGroupId,jdbcType=BIGINT}, #{bookGroupId,jdbcType=BIGINT},
#{adNewsSetId,jdbcType=BIGINT}, #{adNewsSetId,jdbcType=BIGINT},
#{contentFrom,jdbcType=INTEGER},
#{messageCount,jdbcType=INTEGER}, #{messageCount,jdbcType=INTEGER},
#{createUser,jdbcType=BIGINT}, #{createUser,jdbcType=BIGINT},
NOW() NOW()
...@@ -106,7 +103,6 @@ ...@@ -106,7 +103,6 @@
classify_id, classify_id,
book_group_id, book_group_id,
ad_news_set_id, ad_news_set_id,
content_from,
message_count, message_count,
create_user, create_user,
create_time create_time
...@@ -118,7 +114,6 @@ ...@@ -118,7 +114,6 @@
#{item.classifyId,jdbcType=BIGINT}, #{item.classifyId,jdbcType=BIGINT},
#{item.bookGroupId,jdbcType=BIGINT}, #{item.bookGroupId,jdbcType=BIGINT},
#{item.adNewsSetId,jdbcType=BIGINT}, #{item.adNewsSetId,jdbcType=BIGINT},
#{item.contentFrom,jdbcType=INTEGER},
#{item.messageCount,jdbcType=INTEGER}, #{item.messageCount,jdbcType=INTEGER},
#{item.createUser,jdbcType=BIGINT}, #{item.createUser,jdbcType=BIGINT},
NOW() NOW()
......
pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingGroupTagMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.pcloud.book.advertising.dao.impl.AdvertisingGroupTagDaoImpl" >
<resultMap id="BaseResultMap" type="com.pcloud.book.advertising.entity.AdvertisingGroupTag" >
<id column="id" property="id" jdbcType="BIGINT" />
<result column="tag_book_id" property="tagBookId" jdbcType="BIGINT" />
<result column="group_qrcode_id" property="groupQrcodeId" jdbcType="BIGINT" />
<result column="master_id" property="masterId" jdbcType="BIGINT" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
</resultMap>
<sql id="Base_Column_List" >
id, tag_book_id, group_qrcode_id, master_id, create_time
</sql>
<insert id="insert" parameterType="com.pcloud.book.advertising.entity.AdvertisingGroupTag" useGeneratedKeys="true" keyProperty="id">
insert into advertising_group_tag (tag_book_id, group_qrcode_id,
master_id, create_time)
values (#{tagBookId,jdbcType=BIGINT}, #{groupQrcodeId,jdbcType=BIGINT},
#{masterId,jdbcType=BIGINT},NOW())
</insert>
<delete id="deleteByMasterId" parameterType="long">
DELETE
FROM
advertising_group_tag
WHERE
master_id = #{masterId}
</delete>
<insert id="batchInsert" parameterType="com.pcloud.book.advertising.entity.AdvertisingGroupTag" useGeneratedKeys="true" keyProperty="id">
insert into advertising_group_tag (
tag_book_id,
group_qrcode_id,
master_id,
create_time
) values
<foreach collection="list" item="item" index="index"
separator=",">
(#{item.tagBookId,jdbcType=BIGINT},
#{item.groupQrcodeId,jdbcType=BIGINT},
#{item.masterId,jdbcType=BIGINT},
NOW())
</foreach>
</insert>
<select id="getBookIdsByMasterId" parameterType="long" resultType="long">
SELECT DISTINCT
tag_book_id
FROM
advertising_group_tag
WHERE
master_id = #{masterId}
AND tag_book_id IS NOT NULL
AND group_qrcode_id = 0
</select>
<delete id="deleteByGroupQrcodeId" parameterType="long">
DELETE
FROM
advertising_group_tag
WHERE group_qrcode_id = #{groupQrcodeId}
</delete>
<select id="getGroupQrcodeIdsByMasterId" parameterType="long" resultType="long">
SELECT DISTINCT
group_qrcode_id
FROM
advertising_group_tag
WHERE
master_id = #{masterId}
AND group_qrcode_id != 0
</select>
<delete id="deleteByBook" parameterType="map" >
DELETE
FROM
advertising_group_tag
WHERE
master_id = #{masterId}
AND tag_book_id in
<foreach collection="bookIds" index="index" item="item" open="(" separator="," close=")">
${item}
</foreach>
</delete>
<select id="getTagWxGroupIdsByMasterId" parameterType="long" resultType="string">
SELECT DISTINCT
q.weixin_group_id
FROM
book_group_qrcode q
LEFT JOIN advertising_group_tag t ON q.id = t.group_qrcode_id
WHERE
t.master_id = #{masterId}
AND q.weixin_group_id IS NOT NULL
</select>
</mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingMasterMapper.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<result column="master_name" property="masterName" jdbcType="VARCHAR"/> <result column="master_name" property="masterName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="login_id" property="loginId" jdbcType="BIGINT"/>
</resultMap> </resultMap>
<resultMap id="AdvertisingMasterDTO" type="com.pcloud.book.advertising.dto.AdvertisingMasterDTO"> <resultMap id="AdvertisingMasterDTO" type="com.pcloud.book.advertising.dto.AdvertisingMasterDTO">
...@@ -13,10 +14,11 @@ ...@@ -13,10 +14,11 @@
<result column="master_name" property="masterName" jdbcType="VARCHAR"/> <result column="master_name" property="masterName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/> <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/> <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="login_id" property="loginId" jdbcType="BIGINT"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, master_name, create_time, update_time id, master_name, create_time, update_time, login_id
</sql> </sql>
<select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long"> <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
...@@ -84,11 +86,13 @@ ...@@ -84,11 +86,13 @@
master_name, master_name,
create_time, create_time,
update_time, update_time,
login_id,
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
#{masterName,jdbcType=VARCHAR}, #{masterName,jdbcType=VARCHAR},
NOW(), NOW(),
NOW(), NOW(),
#{loginId},
</trim> </trim>
</insert> </insert>
...@@ -98,8 +102,49 @@ ...@@ -98,8 +102,49 @@
<if test="masterName != null"> <if test="masterName != null">
master_name = #{masterName,jdbcType=VARCHAR}, master_name = #{masterName,jdbcType=VARCHAR},
</if> </if>
update_time = NOW(), update_time = NOW(),
login_id = #{loginId},
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<select id="getByGroup" parameterType="long" resultType="com.pcloud.book.advertising.entity.AdvertisingMaster">
SELECT
m.id id,
m.master_name masterName
FROM
advertising_master m
LEFT JOIN advertising_group_tag t ON m.id = t.master_id
WHERE
t.group_qrcode_id = #{groupQrcodeId}
</select>
<select id="getBrandMaster" resultType="com.pcloud.book.advertising.dto.AdvertisingMasterDTO">
SELECT
m.id id,
m.master_name masterName
FROM
advertising_master m
LEFT JOIN advertising_settlement_method s ON m.id = s.master_id
WHERE
s.settlement_method = 'Brand'
GROUP BY
m.id
</select>
<select id="getIdByUserLoginId" resultType="long" parameterType="long">
SELECT
id
FROM
advertising_master
WHERE
login_id = #{loginId}
</select>
<update id="updateMasterLoginId" parameterType="map">
UPDATE advertising_master
SET login_id = #{loginId}
WHERE
id = #{masterId}
</update>
</mapper> </mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
...@@ -514,6 +514,13 @@ ...@@ -514,6 +514,13 @@
AND AND
I.book_status = #{bookStatus} I.book_status = #{bookStatus}
</if> </if>
<if test="bookIds != null">
<foreach collection="bookIds" index="index" item="item" open="and (" separator="or" close=")">
<if test="item.bookId != null and item.channelId != null">
A.BOOK_ID = ${item.bookId} AND A.CHANNEL_ID = ${item.channelId}
</if>
</foreach>
</if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY ORDER BY
LAST_MODIFIED_DATE DESC LAST_MODIFIED_DATE DESC
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml
...@@ -343,4 +343,29 @@ ...@@ -343,4 +343,29 @@
update_time=now() update_time=now()
where id = #{bookGroupId} and is_delete = 0 where id = #{bookGroupId} and is_delete = 0
</update> </update>
<select id="listPageBook4AdMaster" parameterType="map" resultType="com.pcloud.book.advertising.dto.Book4AdvertisingMasterDTO">
SELECT
b.BOOK_ID bookId,
b.ISBN isbn,
b.BOOK_NAME bookName,
g.create_time createTime
FROM
book_group g
LEFT JOIN book b ON g.book_id = b.BOOK_ID
WHERE
g.is_delete = 0
AND b.IS_DELETE = 0
AND g.book_id != 0
<if test="name != null">
AND (
b.BOOK_NAME LIKE CONCAT('%', #{name},'%')
OR b.ISBN LIKE CONCAT('%', #{name},'%')
)
</if>
GROUP BY
g.book_id
ORDER BY
g.create_time DESC, g.id DESC
</select>
</mapper> </mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml
...@@ -543,6 +543,99 @@ ...@@ -543,6 +543,99 @@
id = #{qrcodeId} id = #{qrcodeId}
</update> </update>
<select id="listPageGroupMaster" parameterType="map" resultType="com.pcloud.book.advertising.dto.GroupMasterDTO">
SELECT
q.weixin_group_id wxGroupId,
q.id groupQrcodeId,
q.group_name groupName,
c.create_user adviserId,
b.BOOK_NAME bookName,
c.classify classify,
q.user_number userNumber,
q.qrcode_url qrcodeUrl,
bg.dep_label_id depLabelId,
bg.pro_label_id proLabelId,
bg.pur_label_id purLabelId,
q.create_time createTime,
t.create_time tagTime,
b.ISBN isbn
FROM
book_group_qrcode q
LEFT JOIN book_group_classify c ON c.id = q.classify_id
LEFT JOIN book b ON c.book_id = b.book_id
LEFT JOIN book_group bg ON c.book_group_id = bg.id
LEFT JOIN advertising_group_tag t ON q.id = t.group_qrcode_id
WHERE
c.create_user IS NOT NULL
AND c.is_delete = 0
AND q.is_delete = 0
AND b.IS_DELETE = 0
AND bg.is_delete = 0
<if test="name != null">
AND (
b.BOOK_NAME LIKE CONCAT('%', #{name},'%')
OR q.group_name LIKE CONCAT('%', #{name},'%')
OR c.classify LIKE CONCAT('%', #{name},'%')
)
</if>
<if test="query != null">
AND (
b.BOOK_NAME LIKE CONCAT('%', #{query},'%')
OR q.group_name LIKE CONCAT('%', #{query},'%')
OR b.ISBN LIKE CONCAT('%', #{query},'%')
)
</if>
<if test="depLabelId != null">
AND bg.dep_label_id = #{depLabelId}
</if>
<if test="proLabelId != null">
AND bg.pro_label_id = #{proLabelId}
</if>
<if test="purLabelId != null">
AND bg.pur_label_id = #{purLabelId}
</if>
<if test="masterId != null">
AND t.master_id = #{masterId}
</if>
<if test="startTime != null and endTime!= null">
AND t.create_time BETWEEN #{startTime} AND #{endTime}
</if>
GROUP BY q.id
ORDER BY
q.create_time DESC, q.id DESC
</select>
<select id="getIdsByBookId" resultType="long" parameterType="long">
SELECT
q.id
FROM
book_group_qrcode q
LEFT JOIN book_group_classify c ON q.classify_id = c.id
WHERE
c.book_id = #{bookId}
</select>
<select id="getBookIdByGroupQrcodeId" resultType="long" parameterType="long">
SELECT
c.book_id
FROM
book_group_qrcode q
LEFT JOIN book_group_classify c ON q.classify_id = c.id
WHERE
q.id = #{qrcodeId}
</select>
<select id="getGroupCountUserCountByBookId" resultType="map" parameterType="long">
SELECT
COUNT(q.id) groupCount,
IFNULL(SUM(q.user_number), 0) userNum
FROM
book_group_qrcode q
LEFT JOIN book_group_classify c ON q.classify_id = c.id
WHERE
c.book_id = #{bookId}
</select>
<select id="getQrcodeByClassify" parameterType="long" resultType="com.pcloud.book.group.vo.ClassifyQrcodeVO"> <select id="getQrcodeByClassify" parameterType="long" resultType="com.pcloud.book.group.vo.ClassifyQrcodeVO">
select id, classify_id classifyId, group_name groupName, user_number userNumber, weixin_group_id weixinGroupId, create_time createdTime select id, classify_id classifyId, group_name groupName, user_number userNumber, weixin_group_id weixinGroupId, create_time createdTime
......
pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClockMember.Mapper.xml
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
#{weixinClockId, jdbcType=BIGINT}, #{wxUserId, jdbcType=VARCHAR}, #{bookGroupClassifyId, jdbcType=BIGINT}, #{wxGroupId, jdbcType=VARCHAR}, #{weixinClockId, jdbcType=BIGINT}, #{wxUserId, jdbcType=VARCHAR}, #{bookGroupClassifyId, jdbcType=BIGINT}, #{wxGroupId, jdbcType=VARCHAR},
#{nickname, jdbcType=VARCHAR}, #{headPic, jdbcType=VARCHAR}, #{allClockDay, jdbcType=INTEGER}, NOW(), NOW(),#{wechatUserId, jdbcType=BIGINT} #{nickname, jdbcType=VARCHAR}, #{headPic, jdbcType=VARCHAR}, #{allClockDay, jdbcType=INTEGER}, NOW(), NOW(),#{wechatUserId, jdbcType=BIGINT}
) )
ON DUPLICATE KEY
UPDATE
update_time = NOW()
</insert> </insert>
<select id="listWeixinClockRank" parameterType="map" resultType="com.pcloud.book.weixinclock.dto.RankDto"> <select id="listWeixinClockRank" parameterType="map" resultType="com.pcloud.book.weixinclock.dto.RankDto">
...@@ -73,6 +76,7 @@ ...@@ -73,6 +76,7 @@
order by all_clock_day desc, update_time asc order by all_clock_day desc, update_time asc
) a ) a
) cm where cm.wx_user_id = #{userWxId} ) cm where cm.wx_user_id = #{userWxId}
LIMIT 1
</select> </select>
<select id="getClockWechatUserRank" parameterType="map" resultType="com.pcloud.book.weixinclock.dto.RankDto"> <select id="getClockWechatUserRank" parameterType="map" resultType="com.pcloud.book.weixinclock.dto.RankDto">
......
pcloud-service-book/src/main/resources/mapper/weixinclock/WeixinClockTopic.Mapper.xml
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
#{weixinClockId, jdbcType=BIGINT}, #{weixinClockMemberId, jdbcType=BIGINT}, #{wxUserId, jdbcType=VARCHAR}, #{bookGroupClassifyId, jdbcType=BIGINT}, #{weixinClockId, jdbcType=BIGINT}, #{weixinClockMemberId, jdbcType=BIGINT}, #{wxUserId, jdbcType=VARCHAR}, #{bookGroupClassifyId, jdbcType=BIGINT},
#{wxGroupId, jdbcType=VARCHAR}, #{createdDay, jdbcType=DATE}, NOW() #{wxGroupId, jdbcType=VARCHAR}, #{createdDay, jdbcType=DATE}, NOW()
) )
ON DUPLICATE KEY
UPDATE
weixin_clock_member_id = weixin_clock_member_id
</insert> </insert>
<!-- 获取用户今天打卡情况 --> <!-- 获取用户今天打卡情况 -->
......
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