diff --git a/src/main/java/com/kiisoo/ic/generalize/entity/PoiCustomerContactDataStat.java b/src/main/java/com/kiisoo/ic/generalize/entity/PoiCustomerContactDataStat.java index a14bf2c..bc5b5a9 100644 --- a/src/main/java/com/kiisoo/ic/generalize/entity/PoiCustomerContactDataStat.java +++ b/src/main/java/com/kiisoo/ic/generalize/entity/PoiCustomerContactDataStat.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.generalize.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -25,6 +26,21 @@ public class PoiCustomerContactDataStat { * 门店id */ private Long storeId; + /** + * 门店号 + */ + @TableField(exist = false) + private String storeName; + /** + * 零售公司 + */ + @TableField(exist = false) + private String companyName; + /** + * 店铺地址 + */ + @TableField(exist = false) + private String address; /** * 发起申请数 diff --git a/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java b/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java index cc09175..9dc0691 100644 --- a/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java +++ b/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java @@ -3,6 +3,7 @@ package com.kiisoo.ic.generalize.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kiisoo.ic.analysis.bean.TableAnalysisDTO; import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat; +import com.kiisoo.ic.store.entity.StorePromotionDataDO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -30,4 +31,6 @@ public interface PoiCustomerContactDataStatMapper extends BaseMapper storeIds); + + List selectSumDataByShopIds(@Param("storeIds")List storeIds, @Param("startDate")Date startDate, @Param("endDate")Date endDate); } diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java index 182df1e..503fa5d 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java @@ -10,14 +10,18 @@ import com.kiisoo.ic.common.utils.MD5FileUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpClientUtil; import com.kiisoo.ic.common.utils.httpClientUtil.HttpResult; import com.kiisoo.ic.config.WxCpConfiguration; +import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.generalize.mapper.PoiCustomerContactDataStatMapper; +import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper; import com.kiisoo.ic.store.bean.BsdShareCodeResponse; import com.kiisoo.ic.store.constant.Constants; import com.kiisoo.ic.store.entity.*; +import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.mapper.StorePromotionDataDOMapper; import com.kiisoo.ic.utils.DateUtils; @@ -63,6 +67,24 @@ public class StorePromotionDataService { @Autowired private PoiCustomerContactDataStatMapper poiCustomerContactDataStatMapper; + /** + * 门店数据mapper + */ + @Autowired + private PrivilageDomainEntityDOMapper privilageDomainEntityDOMapper; + + /** + * 门店数据mapper + */ + @Autowired + private RetailCompanyMapper retailCompanyMapper; + + /** + * 门店数据mapper + */ + @Autowired + private PoiStoreDOMapper poiStoreDOMapper; + /** * 权限业务 */ @@ -435,6 +457,32 @@ public class StorePromotionDataService { }); } + public PageInfo listUserBehaviorData(List storeIds,Date startDate, Date endDate,Integer pageNum,Integer pageSize){ + PageHelper.startPage(pageNum, pageSize); + List results = poiCustomerContactDataStatMapper.selectSumDataByShopIds(storeIds,startDate,endDate); + if (CollectionUtils.isNotEmpty(results)){ + results.forEach(result -> { + Long storeId = result.getStoreId(); + PoiStore poiStore = poiStoreDOMapper.selectById(storeId); + if (poiStore == null){ + return; + } + result.setStoreName(poiStore.getName()); + result.setAddress(poiStore.getAddress()); + + //客户orgId + Long customerId = privilageDomainEntityDOMapper.selectDomainIdByShopEntity(storeId); + + if (customerId != null){ + PrivilageOrganizational customer = retailCompanyMapper.selectById(customerId); + PrivilageOrganizational company = retailCompanyMapper.selectById(customer.getParentId()); + result.setCompanyName(company.getName()); + } + }); + } + return new PageInfo<>(results); + } + /** * 获取联系客户统计数据 diff --git a/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml b/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml index 361123b..8758d74 100644 --- a/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml +++ b/src/main/resources/mapper/PoiCustomerContactDataStatDOMapper.xml @@ -44,4 +44,24 @@ #{item} +