Commit 0aebf8b0 by 徐高华

Merge branch 'feature/xgh/202506迭代' into 'developer'

朋友圈数据

See merge request !3013
parents 4f38bfbd f5a2cb7a
package com.gic.haoban.manage.web.controller.moment;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.web.vo.moment.MomentDataClickVO;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.gic.web.common.utils.DataApiUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class MomentDataClickExcelHandler extends DownloadHandlerAbstract<MomentDataClickVO> {
@Autowired
private QwMomentController qwMomentController ;
@Autowired
private QwMomentDataController qwMomentDataController ;
@Override
public List<MomentDataClickVO> getData(Context context, String json, Integer currentPage) {
Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_mbr_click_detail");
Page page = DataApiUtils.getPageData(res);
List<MomentDataClickVO> voList = EntityUtil.changeEntityListByJSON(MomentDataClickVO.class, page.getResult());
if(CollectionUtils.isNotEmpty(voList)) {
List<String> memberIdList = voList.stream().map(o->o.getMbrId()).collect(Collectors.toList());
Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(),memberIdList) ;
for (MomentDataClickVO vo : voList) {
String memberId = vo.getMbrId();
vo.setMemberId(memberId);
if(null != map.get(memberId)) {
vo.setMemberScene(2);
}else {
MemberDataDTO data = map.get(memberId) ;
vo.setMemberName(data.getName());
vo.setMemberNick(data.getNickName());
vo.setMemberCardNo(data.getCardNo());
vo.setMemberPhone(data.getPhoneNumber());
vo.setMemberImage(data.getDefineHeadImg());
vo.setClerkId(data.getMainClerkId());
vo.setStoreId(data.getMainStoreId());
vo.setMemberScene(3);
}
}
Set<String> storeSet = voList.stream().filter(o->StringUtils.isNotBlank(o.getStoreId()) && !"-1".equals(o.getStoreId())).map(o->o.getStoreId()).collect(Collectors.toSet()) ;
Set<String> clerkSet = voList.stream().filter(o->StringUtils.isNotBlank(o.getClerkId()) && !"-1".equals(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toSet());
Map<String,StoreDTO> storeMap = this.qwMomentDataController.storeMap(storeSet) ;
Map<String, ClerkDTO> clerkMap = this.qwMomentDataController.clerkMap(clerkSet) ;
for (MomentDataClickVO vo : voList) {
if(null != storeMap.get(vo.getStoreId())) {
vo.setStoreCode(storeMap.get(vo.getStoreId()).getStoreCode());
vo.setStoreName(storeMap.get(vo.getStoreId()).getStoreName());
}
if(null != clerkMap.get(vo.getClerkId())) {
vo.setClerkCode(clerkMap.get(vo.getClerkId()).getClerkCode());
vo.setClerkName(clerkMap.get(vo.getClerkId()).getClerkName());
}
}
}
return voList ;
}
@Override
public List<String> getColumnNames() {
return Arrays.asList();
}
@Override
public List<String> getColumnNames(Context context) {
return Arrays.asList("会员姓名", "会员昵称", "手机号", "会员卡号", "专属导购姓名", "专属导购code", "所属门店名称", "所属门店code", "点击时间", "停留时长");
}
@Override
public List<String> getColumns(Context context) {
return Arrays.asList("memberName", "memberNick", "memberPhone", "memberCardNo", "clerkName", "clerkCode", "storeName", "storeCode", "clickTime", "dur");
}
@Override
public LinkedHashMap<String, List<String>> doubleColumnNames() {
return null;
}
@Override
public List<String> getColumns() {
return Arrays.asList();
}
}
package com.gic.haoban.manage.web.controller.moment;
import com.gic.api.base.commons.Page;
import com.gic.clerk.api.dto.ClerkDTO;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.web.vo.moment.MomentDataMemberVO;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.gic.web.common.utils.DataApiUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class MomentDataMemberExcelHandler extends DownloadHandlerAbstract<MomentDataMemberVO> {
@Autowired
private QwMomentController qwMomentController ;
@Autowired
private QwMomentDataController qwMomentDataController ;
@Override
public List<MomentDataMemberVO> getData(Context context, String json, Integer currentPage) {
Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_mbr_detail");
Page page = DataApiUtils.getPageData(res);
List<MomentDataMemberVO> voList = EntityUtil.changeEntityListByJSON(MomentDataMemberVO.class, page.getResult());
if(CollectionUtils.isNotEmpty(voList)) {
List<String> memberIdList = voList.stream().map(o->o.getMbrId()).collect(Collectors.toList());
Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(),memberIdList) ;
for (MomentDataMemberVO vo : voList) {
String memberId = vo.getMbrId();
vo.setMemberId(memberId);
if(null != map.get(memberId)) {
vo.setMemberScene(2);
}else {
MemberDataDTO data = map.get(memberId) ;
vo.setMemberName(data.getName());
vo.setMemberNick(data.getNickName());
vo.setMemberCardNo(data.getCardNo());
vo.setMemberPhone(data.getPhoneNumber());
vo.setMemberImage(data.getDefineHeadImg());
vo.setClerkId(data.getMainClerkId());
vo.setStoreId(data.getMainStoreId());
vo.setMemberScene(3);
}
}
Set<String> storeSet = voList.stream().filter(o-> StringUtils.isNotBlank(o.getStoreId()) && !"-1".equals(o.getStoreId())).map(o->o.getStoreId()).collect(Collectors.toSet()) ;
Set<String> clerkSet = voList.stream().filter(o->StringUtils.isNotBlank(o.getClerkId()) && !"-1".equals(o.getClerkId())).map(o->o.getClerkId()).collect(Collectors.toSet());
Map<String, StoreDTO> storeMap = this.qwMomentDataController.storeMap(storeSet) ;
Map<String, ClerkDTO> clerkMap = this.qwMomentDataController.clerkMap(clerkSet) ;
for (MomentDataMemberVO vo : voList) {
if(null != storeMap.get(vo.getStoreId())) {
vo.setStoreCode(storeMap.get(vo.getStoreId()).getStoreCode());
vo.setStoreName(storeMap.get(vo.getStoreId()).getStoreName());
}
if(null != clerkMap.get(vo.getClerkId())) {
vo.setClerkCode(clerkMap.get(vo.getClerkId()).getClerkCode());
vo.setClerkName(clerkMap.get(vo.getClerkId()).getClerkName());
}
}
}
return voList ;
}
@Override
public List<String> getColumnNames() {
return Arrays.asList();
}
@Override
public List<String> getColumnNames(Context context) {
return Arrays.asList("会员姓名", "会员昵称", "手机号", "会员卡号", "专属导购姓名", "专属导购code", "所属门店名称", "所属门店code", "转化金额");
}
@Override
public List<String> getColumns(Context context) {
return Arrays.asList("memberName", "memberNick", "memberPhone", "memberCardNo", "clerkName", "clerkCode", "storeName", "storeCode", "matlConvsAmt");
}
@Override
public LinkedHashMap<String, List<String>> doubleColumnNames() {
return null;
}
@Override
public List<String> getColumns() {
return Arrays.asList();
}
}
package com.gic.haoban.manage.web.controller.moment;
import com.gic.api.base.commons.Page;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.enums.PlatformChannelEnum;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.web.vo.moment.MomentDataOrderVO;
import com.gic.member.api.dto.es.MemberDataDTO;
import com.gic.web.common.download.DownloadHandlerAbstract;
import com.gic.web.common.download.context.Context;
import com.gic.web.common.utils.DataApiUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class MomentDataOrderExcelHandler extends DownloadHandlerAbstract<MomentDataOrderVO> {
@Autowired
private QwMomentController qwMomentController ;
@Autowired
private QwMomentDataController qwMomentDataController ;
@Override
public List<MomentDataOrderVO> getData(Context context, String json, Integer currentPage) {
Map<String, Object> res = DataApiUtils.http(json, "data_qw_moment_order_detail");
Page page = DataApiUtils.getPageData(res);
List<MomentDataOrderVO> voList = EntityUtil.changeEntityListByJSON(MomentDataOrderVO.class, page.getResult());
if(CollectionUtils.isNotEmpty(voList)) {
List<String> memberIdList = voList.stream().map(o -> o.getMbrId()).collect(Collectors.toList());
Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(AuthWebRequestUtil.getLoginUser().getEnterpriseId(), memberIdList);
for (MomentDataOrderVO vo : voList) {
String memberId = vo.getMbrId();
vo.setMemberId(memberId);
if (null != map.get(memberId)) {
vo.setMemberScene(2);
} else {
MemberDataDTO data = map.get(memberId);
vo.setMemberName(data.getName());
vo.setMemberNick(data.getNickName());
vo.setMemberCardNo(data.getCardNo());
vo.setMemberPhone(data.getPhoneNumber());
vo.setMemberImage(data.getDefineHeadImg());
vo.setMemberScene(3);
}
PlatformChannelEnum channel = PlatformChannelEnum.getEnumByChannelCode(vo.getChannelCode()) ;
if(null != channel) {
vo.setChannelName(channel.getChannelName());
}
}
Set<String> storeSet = voList.stream().filter(o -> StringUtils.isNotBlank(o.getOrderStoreId()) && !"-1".equals(o.getOrderStoreId())).map(o -> o.getOrderStoreId()).collect(Collectors.toSet());
Map<String, StoreDTO> storeMap = this.qwMomentDataController.storeMap(storeSet);
for (MomentDataOrderVO vo : voList) {
if (null != storeMap.get(vo.getOrderStoreId())) {
vo.setOrderStoreCode(storeMap.get(vo.getOrderStoreId()).getStoreCode());
vo.setOrderStoreName(storeMap.get(vo.getOrderStoreId()).getStoreName());
}
}
}
return voList ;
}
@Override
public List<String> getColumnNames() {
return Arrays.asList();
}
@Override
public List<String> getColumnNames(Context context) {
return Arrays.asList("会员姓名", "会员昵称", "手机号", "会员卡号", "订单渠道", "订单编号", "订单实付金额", "消费门店名称", "消费门店 code", "下单时间");
}
@Override
public List<String> getColumns(Context context) {
return Arrays.asList("memberName", "memberNick", "memberPhone", "memberCardNo", "channelName", "orderCode", "matlConvsAmt", "orderStoreName", "orderStoreCode", "orderTime");
}
@Override
public LinkedHashMap<String, List<String>> doubleColumnNames() {
return null;
}
@Override
public List<String> getColumns() {
return Arrays.asList();
}
}
......@@ -20,6 +20,16 @@ public class MomentDataQO extends BasePageInfo implements Serializable {
*/
private String orderNumber ;
private Integer dataType ;
public Integer getDataType() {
return dataType;
}
public void setDataType(Integer dataType) {
this.dataType = dataType;
}
public Long getPlanId() {
return planId;
}
......
......@@ -8,6 +8,7 @@ import java.io.Serializable;
public class MomentDataClickVO implements Serializable {
private String mbrId ;
private String memberId ;
/**
* 会员名称
......@@ -30,6 +31,8 @@ public class MomentDataClickVO implements Serializable {
@JsonSerialize(using = PhoneNumberJsonSeralizer.class)
private String memberPhone;
private String storeId ;
private String clerkId ;
private String clerkCode;
private String clerkName;
private String storeName;
......@@ -43,6 +46,42 @@ public class MomentDataClickVO implements Serializable {
*/
private String clickTime ;
/**
* 1:非会员 2:会员已注销 3:正常
*/
private Integer memberScene;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public Integer getMemberScene() {
return memberScene;
}
public void setMemberScene(Integer memberScene) {
this.memberScene = memberScene;
}
public String getMbrId() {
return mbrId;
}
public void setMbrId(String mbrId) {
this.mbrId = mbrId;
}
public String getMemberId() {
return memberId;
}
......
......@@ -8,6 +8,7 @@ import java.io.Serializable;
public class MomentDataMemberVO implements Serializable {
private String mbrId ;
private String memberId ;
/**
* 会员名称
......@@ -30,6 +31,8 @@ public class MomentDataMemberVO implements Serializable {
@JsonSerialize(using = PhoneNumberJsonSeralizer.class)
private String memberPhone;
private String storeId ;
private String clerkId ;
private String clerkCode;
private String clerkName;
private String storeName;
......@@ -39,6 +42,43 @@ public class MomentDataMemberVO implements Serializable {
*/
private Double matlConvsAmt ;
/**
* 1:非会员 2:会员已注销 3:正常
*/
private Integer memberScene;
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public Integer getMemberScene() {
return memberScene;
}
public void setMemberScene(Integer memberScene) {
this.memberScene = memberScene;
}
public String getMbrId() {
return mbrId;
}
public void setMbrId(String mbrId) {
this.mbrId = mbrId;
}
public String getMemberId() {
return memberId;
}
......
......@@ -8,6 +8,7 @@ import java.io.Serializable;
public class MomentDataOrderVO implements Serializable {
private String mbrId ;
private String memberId ;
/**
* 会员名称
......@@ -30,11 +31,6 @@ public class MomentDataOrderVO implements Serializable {
@JsonSerialize(using = PhoneNumberJsonSeralizer.class)
private String memberPhone;
private String clerkCode;
private String clerkName;
private String storeName;
private String storeCode;
/**
* 订单渠道
*/
......@@ -64,6 +60,26 @@ public class MomentDataOrderVO implements Serializable {
*/
private String orderTime ;
/**
* 1:非会员 2:会员已注销 3:正常
*/
private Integer memberScene;
public Integer getMemberScene() {
return memberScene;
}
public void setMemberScene(Integer memberScene) {
this.memberScene = memberScene;
}
public String getMbrId() {
return mbrId;
}
public void setMbrId(String mbrId) {
this.mbrId = mbrId;
}
public String getMemberId() {
return memberId;
}
......@@ -112,38 +128,6 @@ public class MomentDataOrderVO implements Serializable {
this.memberPhone = memberPhone;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getChannelCode() {
return channelCode;
}
......
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