Commit a116b9dc by 郑勇

bug: [1032164] 佣金推广优惠卷,当页面字段内容的金额或者人数显示为0时,导出时也需与页面显示一致为0,不能导出为空

parent 03cdfc52
...@@ -14,6 +14,8 @@ import com.pcloud.book.group.dto.BookServeDTO; ...@@ -14,6 +14,8 @@ import com.pcloud.book.group.dto.BookServeDTO;
import com.pcloud.channelcenter.qrcode.vo.BookQrcodeVO; import com.pcloud.channelcenter.qrcode.vo.BookQrcodeVO;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBeanNew; import com.pcloud.common.page.PageBeanNew;
import com.pcloud.data.domain.dto.BookScanCountParamDTO;
import com.pcloud.data.domain.vo.BookScanCountVO;
import com.pcloud.labelcenter.label.dto.LabelDto; import com.pcloud.labelcenter.label.dto.LabelDto;
import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO; import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
...@@ -491,4 +493,9 @@ public interface BookAdviserBiz { ...@@ -491,4 +493,9 @@ public interface BookAdviserBiz {
* erp同步已关联书刊下印状态 * erp同步已关联书刊下印状态
*/ */
void syncPrintBookRays(List<BookRequestVO> bookRequestVOS); void syncPrintBookRays(List<BookRequestVO> bookRequestVOS);
/**
* 批量获取图书扫码量和扫码用户量
*/
Map<String, BookScanCountVO> multiGetBookScanCount(List<BookScanCountParamDTO> param);
} }
...@@ -31,6 +31,7 @@ import com.pcloud.book.consumer.analysisengine.BrowseRecordConsr; ...@@ -31,6 +31,7 @@ import com.pcloud.book.consumer.analysisengine.BrowseRecordConsr;
import com.pcloud.book.consumer.app.AppConsr; import com.pcloud.book.consumer.app.AppConsr;
import com.pcloud.book.consumer.channel.QrcodeSceneConsr; import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
import com.pcloud.book.consumer.common.ExportConsr; import com.pcloud.book.consumer.common.ExportConsr;
import com.pcloud.book.consumer.data.DataConsr;
import com.pcloud.book.consumer.erp.ErpConsr; import com.pcloud.book.consumer.erp.ErpConsr;
import com.pcloud.book.consumer.label.LabelConsr; import com.pcloud.book.consumer.label.LabelConsr;
import com.pcloud.book.consumer.message.MessageConsr; import com.pcloud.book.consumer.message.MessageConsr;
...@@ -95,6 +96,8 @@ import com.pcloud.common.utils.NumberUtil; ...@@ -95,6 +96,8 @@ import com.pcloud.common.utils.NumberUtil;
import com.pcloud.common.utils.ServeLinkUtils; import com.pcloud.common.utils.ServeLinkUtils;
import com.pcloud.common.utils.cache.redis.JedisClusterUtils; import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
import com.pcloud.common.utils.string.StringUtil; import com.pcloud.common.utils.string.StringUtil;
import com.pcloud.data.domain.dto.BookScanCountParamDTO;
import com.pcloud.data.domain.vo.BookScanCountVO;
import com.pcloud.facade.tradecenter.dto.Amount4BookAdviserDto; import com.pcloud.facade.tradecenter.dto.Amount4BookAdviserDto;
import com.pcloud.labelcenter.label.dto.LabelDto; import com.pcloud.labelcenter.label.dto.LabelDto;
import com.pcloud.raystask.entity.AdviserDefault; import com.pcloud.raystask.entity.AdviserDefault;
...@@ -225,6 +228,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -225,6 +228,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
private ReaderConsr readerConsr; private ReaderConsr readerConsr;
@Autowired @Autowired
private BookMapper bookMapper; private BookMapper bookMapper;
@Autowired
private DataConsr dataConsr;
@Override @Override
public List<BookDto> listByAdviserId(Long adviserId) { public List<BookDto> listByAdviserId(Long adviserId) {
...@@ -3491,4 +3496,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -3491,4 +3496,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
} }
bookAdviserDao.batchUpdateIsPrint(bookRequestVOS); bookAdviserDao.batchUpdateIsPrint(bookRequestVOS);
} }
@Override
public Map<String, BookScanCountVO> multiGetBookScanCount(List<BookScanCountParamDTO> param) {
return dataConsr.multiGetBookScanCount(param);
}
} }
...@@ -35,6 +35,7 @@ import com.pcloud.common.permission.PermissionException; ...@@ -35,6 +35,7 @@ import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.ParamChecker; import com.pcloud.common.utils.ParamChecker;
import com.pcloud.common.utils.SessionUtil; import com.pcloud.common.utils.SessionUtil;
import com.pcloud.common.utils.cookie.Cookie; import com.pcloud.common.utils.cookie.Cookie;
import com.pcloud.data.domain.dto.BookScanCountParamDTO;
import com.pcloud.labelcenter.label.dto.LabelDto; import com.pcloud.labelcenter.label.dto.LabelDto;
import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO; import com.pcloud.readercenter.userlabel.dto.UserGradeLabelIdDTO;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -581,4 +582,12 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade { ...@@ -581,4 +582,12 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
return new ResponseDto<>(); return new ResponseDto<>();
} }
/**
* 批量获取图书扫码量和扫码用户量
*/
@RequestMapping(value = "multiGetBookScanCount", method = RequestMethod.POST)
public ResponseDto<?> multiGetBookScanCount(@RequestBody List<BookScanCountParamDTO> param) throws PermissionException {
return new ResponseDto<>(bookAdviserBiz.multiGetBookScanCount(param));
}
} }
...@@ -3,10 +3,12 @@ package com.pcloud.book.consumer.data; ...@@ -3,10 +3,12 @@ package com.pcloud.book.consumer.data;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.utils.ResponseHandleUtil; import com.pcloud.common.utils.ResponseHandleUtil;
import com.pcloud.data.domain.dto.BookScanCountParamDTO;
import com.pcloud.data.domain.dto.BookStatisParamDTO; import com.pcloud.data.domain.dto.BookStatisParamDTO;
import com.pcloud.data.domain.vo.AllAdviserBookStatisVO; import com.pcloud.data.domain.vo.AllAdviserBookStatisVO;
import com.pcloud.data.domain.vo.AllAdviserWorksStatisVO; import com.pcloud.data.domain.vo.AllAdviserWorksStatisVO;
import com.pcloud.data.domain.vo.AllQrcodeWorksStatisVO; import com.pcloud.data.domain.vo.AllQrcodeWorksStatisVO;
import com.pcloud.data.domain.vo.BookScanCountVO;
import com.pcloud.data.domain.vo.CalDataOverviewVO; import com.pcloud.data.domain.vo.CalDataOverviewVO;
import com.pcloud.data.domain.vo.CalQrcodeTargetVO; import com.pcloud.data.domain.vo.CalQrcodeTargetVO;
import com.pcloud.data.domain.vo.CalScanHourTrendTargetVO; import com.pcloud.data.domain.vo.CalScanHourTrendTargetVO;
...@@ -15,6 +17,7 @@ import com.pcloud.data.domain.vo.CalUserInfoProvinceVO; ...@@ -15,6 +17,7 @@ import com.pcloud.data.domain.vo.CalUserInfoProvinceVO;
import com.pcloud.data.domain.vo.CalUserInfoSexVO; import com.pcloud.data.domain.vo.CalUserInfoSexVO;
import com.pcloud.data.domain.vo.DailyQrcodeSummaryVO; import com.pcloud.data.domain.vo.DailyQrcodeSummaryVO;
import com.pcloud.data.domain.vo.MidUserInfoMergeVO; import com.pcloud.data.domain.vo.MidUserInfoMergeVO;
import com.pcloud.data.provider.BookScanCountService;
import com.pcloud.data.provider.BookStatisService; import com.pcloud.data.provider.BookStatisService;
import com.pcloud.data.provider.CalGroupTrackTargetService; import com.pcloud.data.provider.CalGroupTrackTargetService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -23,6 +26,7 @@ import org.slf4j.LoggerFactory; ...@@ -23,6 +26,7 @@ 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 org.springframework.web.bind.annotation.RequestBody;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -45,6 +49,8 @@ public class DataConsr { ...@@ -45,6 +49,8 @@ public class DataConsr {
private BookStatisService bookStatisService; private BookStatisService bookStatisService;
@Autowired @Autowired
private CalGroupTrackTargetService calGroupTrackTargetService; private CalGroupTrackTargetService calGroupTrackTargetService;
@Autowired
private BookScanCountService bookScanCountService;
/** /**
* 获取书刊统计信息(书刊总收益、二维码数量、扫码量、扫码人、浏览量) * 获取书刊统计信息(书刊总收益、二维码数量、扫码量、扫码人、浏览量)
...@@ -212,4 +218,19 @@ public class DataConsr { ...@@ -212,4 +218,19 @@ public class DataConsr {
} }
return null; return null;
} }
/**
* 批量获取图书扫码量和扫码用户量
*/
public Map<String, BookScanCountVO> multiGetBookScanCount(List<BookScanCountParamDTO> param){
if(CollUtil.isEmpty(param)){
return new HashMap<>();
}
try {
return bookScanCountService.multiGetBookScanCount(param);
} catch (Exception e){
LOGGER.warn("批量获取图书扫码量和扫码用户量 [DataConsr.multiGetBookScanCount] 失败", e);
}
return null;
}
} }
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