Skip to content

M
midjourney-proxy
Commit fa122900 by 李传峰
Options

Merge branch 'release' into 'master' 

Release

See merge request rays/pcloud-book!1571
parents d7a3d848 ba587f8d
Showing with 379 additions and 35 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
......@@ -859,6 +859,37 @@ public class BookDto extends BaseDto {
*/
private Integer appointBook;
private Integer openRaysCode;
/**
* 冻结时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date freezetime;
/**
* 解冻时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date thawTime;
public Date getFreezetime() {
return freezetime;
}
public void setFreezetime(Date freezetime) {
this.freezetime = freezetime;
}
public Date getThawTime() {
return thawTime;
}
public void setThawTime(Date thawTime) {
this.thawTime = thawTime;
}
public Integer getAppointBook() {
return appointBook;
}
......@@ -2427,6 +2458,14 @@ public class BookDto extends BaseDto {
this.erpNumbers = erpNumbers;
}
public Integer getOpenRaysCode() {
return openRaysCode;
}
public void setOpenRaysCode(Integer openRaysCode) {
this.openRaysCode = openRaysCode;
}
@Override
public String toString() {
return "BookDto{" +
......
pcloud-facade-book/src/main/java/com/pcloud/book/book/entity/BookAdviser.java
......@@ -118,4 +118,6 @@ public class BookAdviser extends BaseEntity {
* 上下册标签id
*/
private Long volLabelId;
private Integer openRaysCode;
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java
......@@ -507,4 +507,6 @@ public interface BookAdviserBiz {
Map<Long, AdviserBookStatisDto> getAdviserBookStatis(AdviserBookStatisRequestDto requestDto);
Integer getBookIsOpenCatalog(Long bookId, Long channelId, Long adviserId);
void updateOpenRaysCode(BookAdviser bookAdviser);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookFreezeBiz.java
package com.pcloud.book.book.biz;
import java.util.List;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
import com.pcloud.book.book.entity.ThawEarning;
import com.pcloud.book.book.vo.BookFreezeFilterVO;
import com.pcloud.book.book.vo.BookFreezeInfoDto;
import java.util.List;
/**
* 图书冻结业务层接口
......@@ -70,4 +72,10 @@ public interface BookFreezeBiz {
BookFreezeDto getById(Long bookId);
Boolean setBookFreeze(Long bookId);
List<Long> filterFreezeBook(List<Long> bookIds);
List<Long> filterBook4Erp(BookFreezeFilterVO bookFreezeFilterVO);
List<BookFreezeInfoDto> listBookFreezeInfo(List<Long> bookIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
......@@ -3564,4 +3564,16 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
Integer isOpenCatalog = bookAdviserDao.getBookIsOpenCatalog(bookId,channelId,adviserId);
return null == isOpenCatalog?0:isOpenCatalog;
}
@Override
public void updateOpenRaysCode(BookAdviser bookAdviser) {
if (bookAdviser == null || bookAdviser.getBookAdviserId() == null) {
throw BizException.PARAM_DELETION;
}
BookAdviser model = new BookAdviser();
model.setBookAdviserId(bookAdviser.getBookAdviserId());
model.setOpenRaysCode(bookAdviser.getOpenRaysCode());
bookAdviserDao.update(model);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -936,11 +936,20 @@ public class BookBizImpl implements BookBiz {
paramMap.put("channelIds", bookDetailDTO.getChannelIds());
paramMap.put("adviserIds", bookDetailDTO.getAdviserIds());
List<BookDto> bookDtos = bookDao.listBookGroupByBookIds(bookDetailDTO.getBookIds(), bookDetailDTO.getChannelIds(),bookDetailDTO.getAdviserIds());
Map<Long, BookFreezeDto> freezeDtoMap = Optional.ofNullable(bookFreezeBiz.listFreezeInfo(bookDetailDTO.getBookIds()))
.filter(org.apache.commons.collections4.CollectionUtils::isNotEmpty)
.map(this::convertToMap).orElse(Collections.emptyMap());
List<Long> xiaoRuiEducation = channelConsr.isXiaoRuiEducation(bookDetailDTO.getBookIds());
Map<Long, BigDecimal> booksGmv = tradeConsr.getBooksGmv(bookDetailDTO.getBookIds());
if (!ListUtils.isEmpty(bookDtos)) {
for (BookDto bookDto : bookDtos) {
bookDto.setXiaoRuiEducation(false);
BookFreezeDto bookFreezeDto = freezeDtoMap.get(bookDto.getBookId());
if (bookFreezeDto != null) {
bookDto.setFreezeStatus(bookFreezeDto.getFreezeStatus());
bookDto.setFreezetime(bookFreezeDto.getFreezetime());
bookDto.setThawTime(bookFreezeDto.getThawTime());
}
bookMap.put(bookDto.getBookId() + "_" + bookDto.getChannelId() + "_" + bookDto.getAdviserId(), bookDto);
if(CollUtil.isNotEmpty(xiaoRuiEducation) && xiaoRuiEducation.contains(bookDto.getBookId())){
bookDto.setXiaoRuiEducation(true);
......@@ -954,6 +963,10 @@ public class BookBizImpl implements BookBiz {
return bookMap;
}
private Map<Long, BookFreezeDto> convertToMap(List<BookFreezeDto> bookFreezeDtos) {
return bookFreezeDtos.stream().filter(Objects::nonNull).collect(Collectors.toMap(BookFreezeDto::getBookId, Function.identity(), (k1, k2) -> k1));
}
@Override
public Map<String, BookDto> listDetailByIds(BookDetialDTO bookDetialDTO) throws BizException {
Map<String, BookDto> bookMap = null;
......@@ -1975,6 +1988,7 @@ public class BookBizImpl implements BookBiz {
bookAdviser.setPurLabelId(book.getPurLabelId());
bookAdviser.setVolLabelId(book.getVolLabelId());
bookAdviser.setIpAddress(book.getIpAddress());
bookAdviser.setOpenRaysCode(qrcodeSceneConsr.getByAgentId(book.getAgentId()));
if(book.getIsBookGroup()!=null&&book.getIsBookGroup()){
bookAdviser.setIsOpenRobotProcess(1);
}else{
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookFreezeBizImpl.java
......@@ -9,10 +9,14 @@ import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
import com.pcloud.book.book.entity.BookFund;
import com.pcloud.book.book.entity.ThawEarning;
import com.pcloud.book.book.vo.BookFreezeFilterVO;
import com.pcloud.book.book.vo.BookFreezeInfoDto;
import com.pcloud.common.core.constant.MQTopicProducer;
import com.pcloud.common.utils.DateUtils;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.string.StringUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
......@@ -21,6 +25,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
......@@ -262,4 +267,28 @@ public class BookFreezeBizImpl implements BookFreezeBiz {
}
return true;
}
@Override
public List<Long> filterFreezeBook(List<Long> bookIds) {
if (CollectionUtils.isEmpty(bookIds)) {
return Collections.emptyList();
}
return bookFreezeDao.filterFreezeBook(bookIds);
}
@Override
public List<Long> filterBook4Erp(BookFreezeFilterVO bookFreezeFilterVO) {
Integer bookFreeze = bookFreezeFilterVO.getBookFreeze();
String bookFreezeTimeBegin = bookFreezeFilterVO.getBookFreezeTimeBegin();
String bookFreezeTimeEnd = bookFreezeFilterVO.getBookFreezeTimeEnd();
if (bookFreeze == null && StringUtils.isAllBlank(bookFreezeTimeBegin, bookFreezeTimeEnd)) {
return Collections.emptyList();
}
return bookFreezeDao.filterBook4Erp(bookFreeze, bookFreezeTimeBegin, bookFreezeTimeEnd);
}
@Override
public List<BookFreezeInfoDto> listBookFreezeInfo(List<Long> bookIds) {
return bookFreezeDao.listBookFreezeInfo(bookIds);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookFreezeDao.java
......@@ -2,6 +2,7 @@ package com.pcloud.book.book.dao;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
import com.pcloud.book.book.vo.BookFreezeInfoDto;
import com.pcloud.common.core.dao.BaseDao;
import java.util.List;
......@@ -80,4 +81,10 @@ public interface BookFreezeDao extends BaseDao<BookFreeze> {
List<BookFreezeDto> listFreezeInfo(List<Long> bookIds);
BookFreezeDto getInfoById(Long bookId);
List<Long> filterFreezeBook(List<Long> bookIds);
List<Long> filterBook4Erp(Integer bookFreeze, String bookFreezeTimeBegin, String bookFreezeTimeEnd);
List<BookFreezeInfoDto> listBookFreezeInfo(List<Long> bookIds);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookFreezeDaoImpl.java
package com.pcloud.book.book.dao.impl;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.pcloud.book.book.dao.BookFreezeDao;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
import com.pcloud.book.book.vo.BookFreezeInfoDto;
import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -81,4 +83,23 @@ public class BookFreezeDaoImpl extends BaseDaoImpl<BookFreeze> implements BookFr
public BookFreezeDto getInfoById(Long bookId) {
return this.getSqlSession().selectOne(this.getStatement("getInfoById"),bookId);
}
@Override
public List<Long> filterFreezeBook(List<Long> bookIds) {
return this.getSqlSession().selectList(getStatement("filterFreezeBook"), ImmutableMap.of("bookIds", bookIds));
}
@Override
public List<Long> filterBook4Erp(Integer bookFreeze, String bookFreezeTimeBegin, String bookFreezeTimeEnd) {
Map<String,Object> paramMap = new HashMap();
paramMap.put("bookFreeze", bookFreeze);
paramMap.put("bookFreezeTimeBegin", bookFreezeTimeBegin);
paramMap.put("bookFreezeTimeEnd", bookFreezeTimeEnd);
return getSqlSession().selectList(getStatement("filterBook4Erp"), paramMap);
}
@Override
public List<BookFreezeInfoDto> listBookFreezeInfo(List<Long> bookIds) {
return getSqlSession().selectList(getStatement("listBookFreezeInfo"), ImmutableMap.of("bookIds", bookIds));
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java
......@@ -180,7 +180,8 @@ public interface BookFacade {
@RequestParam(value = "graLabelId", required = false) Integer graLabelId,
@RequestParam(value = "subLabelId", required = false) Integer subLabelId,
@RequestParam(value = "verLabelId", required = false) Integer verLabelId,
@RequestParam(value = "appointBook", required = false) Integer appointBook)
@RequestParam(value = "appointBook", required = false) Integer appointBook,
@RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
throws BizException, PermissionException;
@ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET")
......@@ -670,6 +671,8 @@ public interface BookFacade {
@RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
@RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
throws BizException, PermissionException, JsonParseException;
......@@ -690,6 +693,8 @@ public interface BookFacade {
@RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
@RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId)
throws PermissionException, BizException;
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java
......@@ -597,4 +597,13 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
return new ResponseDto<>(bookAdviserBiz.multiGetBookScanCount(param));
}
/**
* 更新
*/
@PostMapping("updateOpenRaysCode")
public ResponseDto<?> updateOpenRaysCode(@RequestHeader("token") String token, @RequestBody BookAdviser bookAdviser) throws PermissionException {
Long adviserId = (Long)SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
bookAdviserBiz.updateOpenRaysCode(bookAdviser);
return new ResponseDto<>();
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
......@@ -288,7 +288,8 @@ public class BookFacadeImpl implements BookFacade {
@RequestParam(value = "graLabelId", required = false) Integer graLabelId,
@RequestParam(value = "subLabelId", required = false) Integer subLabelId,
@RequestParam(value = "verLabelId", required = false) Integer verLabelId,
@RequestParam(value = "appointBook", required = false) Integer appointBook)
@RequestParam(value = "appointBook", required = false) Integer appointBook,
@RequestParam(value = "openRaysCode", required = false) Integer openRaysCode)
throws BizException, PermissionException {
Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
......@@ -332,6 +333,7 @@ public class BookFacadeImpl implements BookFacade {
paramMap.put("graLabelId", graLabelId);
paramMap.put("subLabelId", subLabelId);
paramMap.put("verLabelId", verLabelId);
paramMap.put("openRaysCode", openRaysCode);
PageBean pageBean = bookBiz.getListPage4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId, hasQrcode,appointBook);
return new ResponseDto<>(pageBean);
}
......@@ -1049,6 +1051,8 @@ public class BookFacadeImpl implements BookFacade {
@RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
@RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
throws BizException, PermissionException {
Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
......@@ -1066,6 +1070,8 @@ public class BookFacadeImpl implements BookFacade {
paramMap.put("thirdTempletId", thirdTempletId);
paramMap.put("thirdTempletIds", Optional.ofNullable(paramMap.get("thirdTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
paramMap.put("minimumSupport", minimumSupport);
paramMap.put("startTime",StringUtil.trimToNull(startTime));
paramMap.put("endTime",StringUtil.trimToNull(endTime));
return new ResponseDto<>(bookBiz.listPageIncomeDetail(new PageParam(currentPage, numPerPage), paramMap, agentId));
}
......@@ -1080,6 +1086,8 @@ public class BookFacadeImpl implements BookFacade {
@RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
@RequestParam(value = "templetId", required = false) Long templetId,
@RequestParam(value = "secondTempletId", required = false) Long secondTempletId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId) throws PermissionException {
Long agentId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
String systemCode = (String) SessionUtil.getVlaue(token, SessionUtil.SYSTEM_CODE);
......@@ -1102,6 +1110,8 @@ public class BookFacadeImpl implements BookFacade {
paramMap.put("secondTempletIds", Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
paramMap.put("thirdTempletId", thirdTempletId);
paramMap.put("thirdTempletIds", Optional.ofNullable(paramMap.get("thirdTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
paramMap.put("startTime",StringUtil.trimToNull(startTime));
paramMap.put("endTime",StringUtil.trimToNull(endTime));
bookBiz.exportBookIncomeDetail(paramMap, agentId, partyId, systemCode);
return new ResponseDto<>();
}
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFreezeFacadeImpl.java
......@@ -5,22 +5,27 @@ import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.entity.BookFreeze;
import com.pcloud.book.book.entity.ThawEarning;
import com.pcloud.book.book.facade.BookFreezeFacade;
import com.pcloud.book.book.vo.BookFreezeFilterVO;
import com.pcloud.book.book.vo.BookFreezeInfoDto;
import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie;
import io.swagger.annotations.ApiOperation;
import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CookieValue;
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.RequestHeader;
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 io.swagger.annotations.ApiOperation;
import java.util.List;
/**
* 图书冻结接口实现类
......@@ -98,4 +103,15 @@ public class BookFreezeFacadeImpl implements BookFreezeFacade {
throws BizException, PermissionException, JsonParseException {
return new ResponseDto<>(bookFreezeBiz.setBookFreeze(bookId));
}
@ApiOperation("filterBook4Erp")
@PostMapping("filterBook4Erp")
public ResponseDto<List<Long>> filterBook4Erp(@RequestBody BookFreezeFilterVO bookFreezeFilterVO){
return new ResponseDto<>(bookFreezeBiz.filterBook4Erp(bookFreezeFilterVO));
}
@PostMapping("listBookFreezeInfo")
public ResponseDto<List<BookFreezeInfoDto>> listBookFreezeInfo(@RequestBody List<Long> bookIds){
return new ResponseDto<>(bookFreezeBiz.listBookFreezeInfo(bookIds));
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/vo/BookFreezeFilterVO.java 0 → 100644
package com.pcloud.book.book.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class BookFreezeFilterVO {
@ApiModelProperty("收益冻结开始时间")
private String bookFreezeTimeBegin;
@ApiModelProperty("收益冻结结束时间")
private String bookFreezeTimeEnd;
@ApiModelProperty("收益冻结状态")
private Integer bookFreeze;
}
pcloud-service-book/src/main/java/com/pcloud/book/book/vo/BookFreezeInfoDto.java 0 → 100644
package com.pcloud.book.book.vo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
public class BookFreezeInfoDto {
private Long bookId;
private String freezeTime;
private Integer freezeStatus;
private String thawTime;
}
pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java
......@@ -19,6 +19,7 @@ import com.pcloud.channelcenter.qrcode.entity.QrcodeTemp;
import com.pcloud.channelcenter.qrcode.service.QrcodeLocationAssocService;
import com.pcloud.channelcenter.qrcode.service.QrcodeSceneService;
import com.pcloud.channelcenter.qrcode.service.QrcodeTempService;
import com.pcloud.channelcenter.qrcode.service.RaysCodePermissionService;
import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrVO;
import com.pcloud.channelcenter.qrcode.vo.BookAssocQRcountRequestVO;
......@@ -43,6 +44,7 @@ import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.ResponseHandleUtil;
import com.pcloud.channelcenter.wechat.entity.SpecialUser;
import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
import org.apache.regexp.RE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -81,6 +83,8 @@ public class QrcodeSceneConsr {
private QrcodeTempService qrcodeTempService;
@Autowired
private BookQrCatalogService bookQrCatalogService;
@Autowired
private RaysCodePermissionService raysCodePermissionService;
/**
......@@ -734,4 +738,16 @@ public class QrcodeSceneConsr {
}
return null;
}
@ParamLog(description = "获取是否有权限创建")
public Integer getByAgentId(Long agentId) throws BizException {
if(agentId == null) return YesOrNoNumEnum.YES.getValue();
try {
return ResponseHandleUtil.parseResponse(raysCodePermissionService.getByAgentId(agentId), Integer.class);
} catch (BizException e) {
LOGGER.error("【二维码-渠道(消)】 获取是否有权限创建失败,<ERROR>.[getByAgentId]:" + e.getMessage(),
e);
}
return null;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
......@@ -2,6 +2,7 @@ package com.pcloud.book.group.biz.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO;
......@@ -170,6 +171,7 @@ import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -3701,13 +3703,10 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
ResourcePageWxwork resourcePageWxwork = new ResourcePageWxwork();
BeanUtils.copyProperties(wxworkPageCreateVO,resourcePageWxwork);
//自定义存下高度
// 新版直接存储自定义配置到 fixed_set 字段
if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(templateType)) {
WxworkPageFixedDTO fixedDTO = new WxworkPageFixedDTO();
fixedDTO.setHeight(wxworkPageCreateVO.getHeight());
wxworkPageCreateVO.setFixedDTO(fixedDTO);
}
//资源模板参数json存放
if (null != wxworkPageCreateVO.getFixedDTO()) {
resourcePageWxwork.setFixedSet(JSON.toJSONString(wxworkPageCreateVO.getConfig()));
} else if (null != wxworkPageCreateVO.getFixedDTO()) { //资源模板参数json存放
resourcePageWxwork.setFixedSet(JSONUtils.toJsonString(wxworkPageCreateVO.getFixedDTO()));
}
ResourcePageWxwork pageWxwork = resourcePageWxworkDao.getByPageId(resourcePageId);
......@@ -3717,13 +3716,13 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
} else {
resourcePageWxworkDao.insert(resourcePageWxwork);
}
if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(templateType)) {
/*if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(templateType)) {
//生成图片更新到数据库
HtmlDto htmlDto = new HtmlDto();
htmlDto.setHeight(wxworkPageCreateVO.getHeight());
htmlDto.setWidth(750);
htmlDto.setHtmlCode(wxworkPageCreateVO.getHtml());
htmlDto.setSnapshot(new Long(System.currentTimeMillis()).toString());
htmlDto.setSnapshot(Long.toString(System.currentTimeMillis()));
ThreadPoolUtils.RESOURCE_POOL.execute(()->{
String url = shareImageConsr.toJPGByChrome(htmlDto);
if (!StringUtil.isEmpty(url)) {
......@@ -3731,7 +3730,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageWxworkDao.update(resourcePageWxwork);
}
});
}
}*/
}
......@@ -3742,18 +3741,17 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (null == wxworkPageCreateVO.getTemplateType()) {
throw new BookBizException(BookBizException.PARAM_IS_NULL,"缺少模板类型");
}
if (null == wxworkPageCreateVO.getQrcodeType() || null == wxworkPageCreateVO.getQrcodeId()) {
throw new BookBizException(BookBizException.PARAM_IS_NULL,"请选择二维码");
}
Integer templateType = wxworkPageCreateVO.getTemplateType();
if (!Objects.equals(ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode(), templateType)
&& (null == wxworkPageCreateVO.getQrcodeType() || null == wxworkPageCreateVO.getQrcodeId())) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "请选择二维码");
}
if (ResourcePageConstants.WxworkPageTemplateTypeEnum.FIXED_NORMAL.getCode().equals(templateType)) {
if (null == wxworkPageCreateVO.getGuide()|| null == wxworkPageCreateVO.getDisplayBook()) {
throw new BookBizException(BookBizException.PARAM_IS_NULL,"缺少参数");
}
} else if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(templateType)) {
if (StringUtil.isEmpty(wxworkPageCreateVO.getBasePic()) || StringUtil.isEmpty(wxworkPageCreateVO.getHtml())
|| null == wxworkPageCreateVO.getTopSpace() || null == wxworkPageCreateVO.getLeftSpace()
|| null == wxworkPageCreateVO.getHeight()) {
if (CollectionUtil.isEmpty(wxworkPageCreateVO.getConfig())) {
throw new BookBizException(BookBizException.PARAM_IS_NULL,"缺少参数");
}
} else if (null == wxworkPageCreateVO.getFixedDTO()) {
......@@ -3770,12 +3768,19 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
return wxworkPageVO;
}
BeanUtils.copyProperties(pageWxwork, wxworkPageVO);
if(!StringUtil.isEmpty(pageWxwork.getFixedSet())) {
wxworkPageVO.setFixedDTO(JSONUtils.jsonToBean(pageWxwork.getFixedSet(), WxworkPageFixedDTO.class));
}
if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(pageWxwork.getTemplateType())) {
wxworkPageVO.setHeight(wxworkPageVO.getFixedDTO().getHeight());
if (!StringUtil.isEmpty(pageWxwork.getFixedSet())) {
if (ResourcePageConstants.WxworkPageTemplateTypeEnum.CUSTOM.getCode().equals(pageWxwork.getTemplateType())) {
if (BooleanUtils.isTrue(pageWxwork.getOldTemplate())) {
wxworkPageVO.setFixedDTO(JSONUtils.jsonToBean(pageWxwork.getFixedSet(), WxworkPageFixedDTO.class));
wxworkPageVO.setHeight(wxworkPageVO.getFixedDTO().getHeight());
} else {
wxworkPageVO.setConfig(JSON.parseObject(pageWxwork.getFixedSet()));
}
} else {
wxworkPageVO.setFixedDTO(JSONUtils.jsonToBean(pageWxwork.getFixedSet(), WxworkPageFixedDTO.class));
}
}
Integer qrcodeType = pageWxwork.getQrcodeType();
Long qrcodeId = pageWxwork.getQrcodeId();
if (!isWechat && null != qrcodeId) {
......
pcloud-service-book/src/main/java/com/pcloud/book/group/entity/ResourcePageWxwork.java
......@@ -80,7 +80,10 @@ public class ResourcePageWxwork extends BaseEntity {
*/
private Date updateTime;
/**
* 是否旧模板 - 旧数据标识
*/
private Boolean oldTemplate;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/WxworkPageCreateVO.java
......@@ -4,6 +4,8 @@ import com.pcloud.book.group.dto.WxworkPageFixedDTO;
import lombok.Data;
import java.util.Map;
/**
* @ClassName com.pcloud.book.group.vo.WxworkPageCreateVO
* @Author zhuyajie
......@@ -68,4 +70,9 @@ public class WxworkPageCreateVO {
* 图片高度
*/
private Integer height;
/**
* 存储落地页 - 自定义类型的前端配置
*/
private Map<String,Object> config;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/WxworkPageVO.java
......@@ -5,6 +5,8 @@ import com.pcloud.common.dto.BaseDto;
import lombok.Data;
import java.util.Map;
/**
* @ClassName com.pcloud.book.group.vo.WxworkPageVO
* @Author zhuyajie
......@@ -73,4 +75,14 @@ public class WxworkPageVO extends BaseDto {
* 图片高度
*/
private Integer height;
/**
* 存储落地页 - 自定义类型的前端配置
*/
private Map<String,Object> config;
/**
* 是否旧模板 - 旧数据标识
*/
private Boolean oldTemplate;
}
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.pcloud.book.book.dao.impl.BookDaoImpl">
<!-- 书籍实体DTO -->
<resultMap id="bookMap" type="bookDto">
<resultMap id="bookMap" type="com.pcloud.book.book.dto.BookDto">
<id column="BOOK_ID" property="bookId" jdbcType="BIGINT" />
<result column="TYPE_CODE" property="typeCode" jdbcType="VARCHAR" />
<result column="TYPE_NAME" property="typeName" jdbcType="VARCHAR" />
......@@ -78,6 +78,7 @@
<result column="book_phone_auth" property="bookPhoneAuth" jdbcType="BIT" />
<result column="is_wechat_auth" property="isWechatAuth" jdbcType="BIT" />
<result column="is_jump_book" property="isJumpBook" jdbcType="TINYINT" />
<result column="open_rays_code" property="openRaysCode" jdbcType="INTEGER" />
</resultMap>
<resultMap id="bookListPageMap" type="bookDto" extends ="bookMap">
......@@ -322,7 +323,7 @@
BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint, BA.is_relate,
BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.vol_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
BA.is_open_robot_process,BA.vol_label_id,b.unique_number,BA.CREATED_DATE,b.edition,BA.is_send_mini_url,
BA.is_open_catalog ,BA.is_approval, BA.book_phone_auth,BA.is_wechat_auth,BA.is_jump_book
BA.is_open_catalog ,BA.is_approval, BA.book_phone_auth,BA.is_wechat_auth,BA.is_jump_book,BA.open_rays_code
FROM
BOOK_ADVISER BA
INNER JOIN
......@@ -660,6 +661,9 @@
<if test="verLabelId != null">
AND A.ver_label_id = #{verLabelId}
</if>
<if test="openRaysCode != null and openRaysCode == 1">
AND A.open_rays_code = 1
</if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY
LAST_MODIFIED_DATE DESC
......@@ -1517,9 +1521,10 @@
<!-- 书刊列表-出版端 -->
<select id="listPage4Agent" parameterType="map" resultMap="bookMap">
SELECT
A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
A.BOOK_ADVISER_ID, A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT, A.TEMPLET_ID, A.IS_PRINT isPrint, IF(ISNULL(s.id),0,1) minimumSupport,B.CREATED_DATE
,A.open_rays_code
FROM
BOOK_ADVISER A
INNER JOIN
......@@ -2493,6 +2498,12 @@
book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW() AND s.start_time <![CDATA[ < ]]> NOW()
WHERE
1=1
<if test="startTime !=null">
AND A.CREATED_DATE <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime !=null">
AND A.CREATED_DATE <![CDATA[ <= ]]> #{endTime}
</if>
<if test="typeCode!=null">
AND
B.TYPE_CODE = #{typeCode}
......@@ -2569,6 +2580,12 @@
BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
WHERE
1=1
<if test="startTime !=null">
AND A.CREATED_DATE <![CDATA[ >= ]]> #{startTime}
</if>
<if test="endTime !=null">
AND A.CREATED_DATE <![CDATA[ <= ]]> #{endTime}
</if>
<if test="typeCode!=null">
AND
B.TYPE_CODE = #{typeCode}
......
pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml
......@@ -48,7 +48,7 @@
INSERT INTO BOOK_ADVISER (
BOOK_ID, ADVISER_ID, CHANNEL_ID, CREATED_USER, CREATED_DATE,IS_MAIN_EDITOR, TEMPLET_ID, SECOND_TEMPLET_ID,third_templet_id,
GRA_LABEL_ID,SUB_LABEL_ID,VER_LABEL_ID,AREA_LABEL_ID,pro_label_id, dep_label_id,pur_label_id,is_open_robot_process,
vol_label_id,LAST_MODIFIED_DATE,ip_address
vol_label_id,LAST_MODIFIED_DATE,ip_address,open_rays_code
)
VALUES (
#{bookId, jdbcType=VARCHAR}, #{adviserId, jdbcType=VARCHAR}, #{channelId, jdbcType=VARCHAR},
......@@ -56,7 +56,7 @@
#{secondTempletId, jdbcType=BIGINT},#{thirdTempletId},#{graLabelId, jdbcType=BIGINT},#{subLabelId, jdbcType=BIGINT},
#{verLabelId, jdbcType=BIGINT},#{areaLabelId, jdbcType=BIGINT},#{proLabelId,jdbcType=BIGINT},
#{depLabelId,jdbcType=BIGINT},#{purLabelId,jdbcType=BIGINT},#{isOpenRobotProcess,jdbcType=BIT},
#{volLabelId},now(),#{ipAddress}
#{volLabelId},now(),#{ipAddress},IFNULL(#{openRaysCode},1)
)
ON
DUPLICATE KEY UPDATE IS_DELETE = 0,LAST_MODIFIED_DATE=now(), IS_MAIN_EDITOR = #{isMainEditor, jdbcType=BIT}
......@@ -1420,4 +1420,16 @@
ADVISER_ID = #{adviserId}
</select>
<!-- 更新 -->
<update id="update" parameterType="bookAdviser">
UPDATE book_adviser
SET
<if test="openRaysCode != null">
open_rays_code = #{openRaysCode},
</if>
LAST_MODIFIED_DATE = NOW()
WHERE
book_adviser_id = #{bookAdviserId}
</update>
</mapper>
pcloud-service-book/src/main/resources/mapper/book/BookFreeze.Mapper.xml
......@@ -145,7 +145,7 @@
<!-- 批量获取书刊当前和以后基金冻结信息 -->
<select id="listFreezeInfo" resultMap="BaseResultMap" parameterType="list">
SELECT
ID, BOOK_ID, IS_FREEZE, BOOK_FUND_ID,PROXY_MODE,TRANSFEROR
ID, BOOK_ID, IS_FREEZE, BOOK_FUND_ID,PROXY_MODE,TRANSFEROR,THAW_TIME,FREEZETIME
FROM
`book_freeze`
WHERE
......@@ -156,4 +156,49 @@
AND
IS_FREEZE = 1
</select>
<select id="filterFreezeBook" resultType="java.lang.Long">
SELECT
distinct BOOK_ID
FROM
`book_freeze`
WHERE
BOOK_ID IN
<foreach collection="bookIds" index="i" item="item" open="(" separator="," close=")">
${item}
</foreach>
AND
IS_FREEZE = 1
</select>
<select id="filterBook4Erp" parameterType="map" resultType="long">
SELECT BOOK_ID
FROM book_freeze
<where>
<if test="bookFreeze != null">
IS_FREEZE = #{bookFreeze}
</if>
<if test="bookFreezeTimeBegin!=null and bookFreezeTimeBegin!= ''">
AND FREEZETIME >= #{bookFreezeTimeBegin}
</if>
<if test="bookFreezeTimeEnd!=null and bookFreezeTimeEnd!=''">
AND FREEZETIME <![CDATA[<=]]> #{bookFreezeTimeEnd}
</if>
</where>
</select>
<select id="listBookFreezeInfo" parameterType="map" resultType="com.pcloud.book.book.vo.BookFreezeInfoDto">
SELECT
BOOK_ID bookId,
DATE_FORMAT( FREEZETIME, '%Y-%m-%d' ) freezeTime,
IS_FREEZE freezeStatus,
DATE_FORMAT( THAW_TIME, '%Y-%m-%d' ) thawTime
FROM
book_freeze
where BOOK_ID IN
<foreach collection="bookIds" open="(" item="it" separator="," close=")">
#{it}
</foreach>
</select>
</mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/group/ResourcePageWxworkDao.xml
......@@ -16,13 +16,14 @@
<result property="leftSpace" column="left_space" jdbcType="INTEGER"/>
<result property="htmlPic" column="html_pic" jdbcType="VARCHAR"/>
<result property="fixedSet" column="fixed_set" jdbcType="VARCHAR"/>
<result property="oldTemplate" column="is_old_template" jdbcType="VARCHAR"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_columns">
id, resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, create_user, create_time, update_time
id, resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time
</sql>
<!--查询单个-->
......@@ -35,8 +36,8 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into resource_page_wxwork(resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, create_user, create_time, update_time)
values (#{resourcePageId}, #{templateType}, #{displayBook}, #{guide}, #{qrcodeType}, #{qrcodeId}, #{qrcodeUrl}, #{basePic}, #{topSpace}, #{leftSpace}, #{htmlPic}, #{fixedSet}, #{createUser}, now(), now())
insert into resource_page_wxwork(resource_page_id, template_type, display_book, guide, qrcode_type, qrcode_id, qrcode_url, base_pic, top_space, left_space, html_pic, fixed_set, is_old_template, create_user, create_time, update_time)
values (#{resourcePageId}, #{templateType}, #{displayBook}, #{guide}, #{qrcodeType}, #{qrcodeId}, #{qrcodeUrl}, #{basePic}, #{topSpace}, #{leftSpace}, #{htmlPic}, #{fixedSet}, 0, #{createUser}, now(), now())
</insert>
<!--通过主键修改数据-->
......@@ -59,6 +60,7 @@
<if test="qrcodeUrl != null and qrcodeUrl != ''">
qrcode_url = #{qrcodeUrl},
</if>
is_old_template = 0,
base_pic = #{basePic},
top_space = #{topSpace},
left_space = #{leftSpace},
......
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