Skip to content

M
midjourney-proxy
Commit 89f3d60c by 田超
Options

Merge branch 'feature/1003768' into 'master' 

feat: [1003768] ERP质检小睿新增登录手机号

See merge request rays/pcloud-book!1003
parents c8132c53 43c1adcb
Showing with 75 additions and 39 deletions
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -136,6 +136,7 @@ import com.pcloud.labelcenter.label.service.LabelService;
import com.pcloud.resourcecenter.product.dto.ProductDto;
import com.pcloud.resourcecenter.product.dto.SpecificationDto;
import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import com.sun.org.apache.xpath.internal.operations.Bool;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
......@@ -3173,7 +3174,7 @@ public class BookBizImpl implements BookBiz {
List<CompletableFuture> futureList = Lists.newArrayList();
// 社群书二维码
getGroupQrcodeInfo(url, futureList);
getGroupQrcodeInfo(url,null, futureList);
// 现代纸书二维码
getBookQrcodeInfo(url, futureList);
......@@ -3196,14 +3197,22 @@ public class BookBizImpl implements BookBiz {
/**
* 查询社群书二维码信息
*/
private void getGroupQrcodeInfo(String url, List<CompletableFuture> futureList) {
// https://qrcode.raysgo.com/2233
String strBookGroupId = url.substring(url.indexOf("/", url.indexOf("https://") + 8) + 1);
if(NumberUtil.isNumber(strBookGroupId)){
private void getGroupQrcodeInfo(String url,Long bookGroupId, List<CompletableFuture> futureList) {
// https://qrcode.raysgo.com/2233 https://qrcode.raysgo.com/t-2/1404/2280
Boolean flag=false;
String strBookGroupId = url.substring(url.lastIndexOf("/")+1);
if(null!=bookGroupId){
flag=true;
}else{
if(NumberUtil.isNumber(strBookGroupId)){
flag=true;
}
}
if(flag){
futureList.add(CompletableFuture.supplyAsync(()->{
BookGroupDTO bookGroupInfo = null;
try {
bookGroupInfo = bookGroupBiz.getBookGroupInfo(Long.valueOf(strBookGroupId));
bookGroupInfo = bookGroupBiz.getBookGroupInfo(null!=bookGroupId ? bookGroupId :Long.valueOf(strBookGroupId));
} catch (Exception ex) {
}
if (bookGroupInfo != null) {
......@@ -3211,11 +3220,16 @@ public class BookBizImpl implements BookBiz {
this.fillLocationName(Lists.newArrayList(bookGroupInfo));
BookDto bookInfo = bookGroupInfo.getBookInfo();
if (bookInfo != null) {
bookInfo.setAdviserName(adviserConsr.getNameById(bookInfo.getCreatedUser()));
Long agentId = adviserConsr.getAgentIdByAdviser(bookInfo.getCreatedUser());
Map<Long, String> agentNameMap = agentConsr.getNames(Collections.singletonList(agentId));
if (!MapUtils.isEmpty(agentNameMap) && agentNameMap.containsKey(agentId)) {
bookInfo.setAgentName(agentNameMap.get(agentId));
Map<Long, AdviserBaseInfoDto> adviserInfoDtoMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Lists.newArrayList(bookInfo.getCreatedUser()));
if(MapUtils.isNotEmpty(adviserInfoDtoMap) && adviserInfoDtoMap.containsKey(bookInfo.getCreatedUser())){
AdviserBaseInfoDto adviserBaseInfoDto = adviserInfoDtoMap.get(bookInfo.getCreatedUser());
if(null!=adviserBaseInfoDto) {
bookInfo.setAdviserName(adviserBaseInfoDto.getPartyName());
bookGroupInfo.setAdviserPhone(adviserBaseInfoDto.getPhoneNum());
bookInfo.setAgentId(adviserBaseInfoDto.getAgentId());
bookInfo.setAgentName(adviserBaseInfoDto.getAgentName());
bookInfo.setTelephone(adviserBaseInfoDto.getPhoneNum());
}
}
}
}
......@@ -3229,35 +3243,45 @@ public class BookBizImpl implements BookBiz {
*/
private void getBookQrcodeInfo(String url, List<CompletableFuture> futureList) {
// http://weixin.qq.com/q/02mGra51v48q_10000M07-
futureList.add(CompletableFuture.supplyAsync(() -> {
BookGroupDTO bookGroupInfo = null;
QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getByUrl(url);
if (qrcodeSceneDto != null && qrcodeSceneDto.getSceneId() > 0) {
bookGroupInfo = new BookGroupDTO();
bookGroupInfo.setGroupQrcodeUrl(qrcodeSceneDto.getQrcodeUrl());
bookGroupInfo.setGroupQrcodeName(qrcodeSceneDto.getSceneName());
bookGroupInfo.setLocationName(qrcodeSceneDto.getQrcodeLocations().get(0).getLocationName());
bookGroupInfo.setProLabelId(qrcodeSceneDto.getQrcodeLabelDto().getProLabelId());
bookGroupInfo.setDepLabelId(qrcodeSceneDto.getQrcodeLabelDto().getDepLabelId());
bookGroupInfo.setPurLabelId(qrcodeSceneDto.getQrcodeLabelDto().getPurLabelId());
bookGroupInfo.setCreateTime(qrcodeSceneDto.getCreatedDate());
bookGroupInfo.setBookId(qrcodeSceneDto.getAdviserBookId());
bookGroupInfo.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
BookDto bookInfo = bookBiz.getBaseById(bookGroupInfo.getBookId());
if (null != bookInfo) {
bookInfo.setBookName(null != bookInfo.getBookName() ? StringUtil.addBracket(bookInfo.getBookName()) : null);
bookInfo.setAdviserName(adviserConsr.getNameById(bookInfo.getCreatedUser()));
Long agentId = adviserConsr.getAgentIdByAdviser(bookInfo.getCreatedUser());
Map<Long, String> agentNameMap = agentConsr.getNames(Collections.singletonList(agentId));
if (!MapUtils.isEmpty(agentNameMap) && agentNameMap.containsKey(agentId)) {
bookInfo.setAgentName(agentNameMap.get(agentId));
QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getByUrl(url);
if (qrcodeSceneDto != null && qrcodeSceneDto.getSceneId() > 0) {
BookGroupDTO bookGroupDTO = bookGroupDao.getBaseInfoBySceneId(qrcodeSceneDto.getSceneId());
if (null != bookGroupDTO) {
getGroupQrcodeInfo(url,bookGroupDTO.getId(), futureList);
} else {
futureList.add(CompletableFuture.supplyAsync(() -> {
BookGroupDTO bookGroupInfo = null;
bookGroupInfo = new BookGroupDTO();
bookGroupInfo.setGroupQrcodeUrl(qrcodeSceneDto.getQrcodeUrl());
bookGroupInfo.setGroupQrcodeName(qrcodeSceneDto.getSceneName());
bookGroupInfo.setLocationName(qrcodeSceneDto.getQrcodeLocations().get(0).getLocationName());
bookGroupInfo.setProLabelId(qrcodeSceneDto.getQrcodeLabelDto().getProLabelId());
bookGroupInfo.setDepLabelId(qrcodeSceneDto.getQrcodeLabelDto().getDepLabelId());
bookGroupInfo.setPurLabelId(qrcodeSceneDto.getQrcodeLabelDto().getPurLabelId());
bookGroupInfo.setCreateTime(qrcodeSceneDto.getCreatedDate());
bookGroupInfo.setBookId(qrcodeSceneDto.getAdviserBookId());
bookGroupInfo.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
BookDto bookInfo = bookBiz.getBaseById(bookGroupInfo.getBookId());
if (null != bookInfo) {
bookInfo.setBookName(null != bookInfo.getBookName() ? StringUtil.addBracket(bookInfo.getBookName()) : null);
Map<Long, AdviserBaseInfoDto> adviserInfoDtoMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Lists.newArrayList(bookInfo.getCreatedUser()));
if (MapUtils.isNotEmpty(adviserInfoDtoMap) && adviserInfoDtoMap.containsKey(bookInfo.getCreatedUser())) {
AdviserBaseInfoDto adviserBaseInfoDto = adviserInfoDtoMap.get(bookInfo.getCreatedUser());
if (null != adviserBaseInfoDto) {
bookInfo.setAdviserName(adviserBaseInfoDto.getPartyName());
bookGroupInfo.setAdviserPhone(adviserBaseInfoDto.getPhoneNum());
bookInfo.setAgentId(adviserBaseInfoDto.getAgentId());
bookInfo.setAgentName(adviserBaseInfoDto.getAgentName());
bookInfo.setTelephone(adviserBaseInfoDto.getPhoneNum());
}
}
bookGroupInfo.setBookInfo(bookInfo);
}
bookGroupInfo.setBookInfo(bookInfo);
}
// 填充标签
this.setBookGroupLabel(Lists.newArrayList(bookGroupInfo));
// 填充标签
this.setBookGroupLabel(Lists.newArrayList(bookGroupInfo));
return bookGroupInfo;
}, ThreadPoolUtils.FILL_APPLET_RECORD));
}
return bookGroupInfo;
}, ThreadPoolUtils.FILL_APPLET_RECORD));
}
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookGroupDTO.java
......@@ -9,6 +9,8 @@ import com.pcloud.book.group.entity.BookGroupFriendGuide;
import com.pcloud.book.group.entity.BookGroupServe;
import com.pcloud.common.dto.BaseDto;
import lombok.Data;
/**
* 社群书群二维码DTO
* @author PENG
......@@ -354,10 +356,20 @@ public class BookGroupDTO extends BaseDto {
private Long adviserId;
private String adviserPhone;
private Long bookAdviserId;
private String appletId;
public String getAdviserPhone() {
return adviserPhone;
}
public void setAdviserPhone(String adviserPhone) {
this.adviserPhone = adviserPhone;
}
public String getAppletId() {
return appletId;
}
......
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