From 7e4c721cfbcaa076d3a8a2291fa6cd86a402e3a7 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Mon, 18 May 2020 02:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PoiCustomerContactDataStatMapper.java | 3 ++- .../StorePromotionDataController.java | 27 +++++++++++++++++++ .../service/StorePromotionDataService.java | 25 +++++++++++++++-- 3 files changed, 52 insertions(+), 3 deletions(-) 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 9dc0691..2bc83e7 100644 --- a/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java +++ b/src/main/java/com/kiisoo/ic/generalize/mapper/PoiCustomerContactDataStatMapper.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Repository; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Set; @Repository public interface PoiCustomerContactDataStatMapper extends BaseMapper { @@ -32,5 +33,5 @@ public interface PoiCustomerContactDataStatMapper extends BaseMapper storeIds); - List selectSumDataByShopIds(@Param("storeIds")List storeIds, @Param("startDate")Date startDate, @Param("endDate")Date endDate); + List selectSumDataByShopIds(@Param("storeIds") Set storeIds, @Param("startDate")Date startDate, @Param("endDate")Date endDate); } diff --git a/src/main/java/com/kiisoo/ic/store/controller/StorePromotionDataController.java b/src/main/java/com/kiisoo/ic/store/controller/StorePromotionDataController.java index 778ba47..bdd9aa6 100644 --- a/src/main/java/com/kiisoo/ic/store/controller/StorePromotionDataController.java +++ b/src/main/java/com/kiisoo/ic/store/controller/StorePromotionDataController.java @@ -2,6 +2,7 @@ package com.kiisoo.ic.store.controller; import com.github.pagehelper.PageInfo; import com.kiisoo.ic.common.BaseController; +import com.kiisoo.ic.generalize.entity.PoiCustomerContactDataStat; import com.kiisoo.ic.store.entity.StorePromotionDataDO; import com.kiisoo.ic.store.service.StorePromotionDataService; import com.kiisoo.ic.utils.DateUtils; @@ -95,6 +96,32 @@ public class StorePromotionDataController extends BaseController { } } + /** + * 查询门店推广数据列表 手机端 + * @param userId + * @param roleCode + * @param startDate + * @param endDate + * @return + */ + @RequestMapping(value = "/behavior",method = RequestMethod.POST) + @ResponseBody + public Map listUserBehaviorData(@RequestParam("userId") Long userId, + @RequestParam(value = "startDate") Date startDate, + @RequestParam(value = "endDate") Date endDate, + @RequestParam(value = "companyId") Long companyId, + @RequestParam(value = "shopId") Long shopId, + @RequestParam(value = "pageNum") Integer pageNum, + @RequestParam(value = "pageSize") Integer pageSize){ + try { + PageInfo poiCustomerContactDataStatPageInfo = storePromotionDataService.listUserBehaviorData(userId,companyId, shopId,startDate, endDate,pageNum,pageSize); + return data(poiCustomerContactDataStatPageInfo); + }catch (Exception e){ + log.error("查询门店推广数据列表",e); + return fail(); + } + } + /** * 同步客户统计数据 * @param startDate 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 503fa5d..94146b3 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java @@ -10,6 +10,8 @@ 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.customer.bean.OpCustomerDTO; +import com.kiisoo.ic.customer.service.CustomerViewService; import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper; import com.kiisoo.ic.domain.service.PrivilageDomainService; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; @@ -91,6 +93,12 @@ public class StorePromotionDataService { @Autowired private PrivilageDomainService privilageDomainService; + /** + * 权限业务 + */ + @Autowired + private CustomerViewService customerViewService; + /** * 权限业务 */ @@ -457,9 +465,22 @@ public class StorePromotionDataService { }); } - public PageInfo listUserBehaviorData(List storeIds,Date startDate, Date endDate,Integer pageNum,Integer pageSize){ + public PageInfo listUserBehaviorData(Long userId,Long companyId,Long shopId,Date startDate, Date endDate,Integer pageNum,Integer pageSize){ + Set shopIds = new HashSet<>(); + + if (shopId != null) { + //如果有店铺则查店铺 + shopIds.add(shopId); + } else if (companyId != null) { + //如果有公司则查公司店铺 + Set sp = customerViewService.getCompanyShop(companyId, userId); + shopIds.addAll(sp); + } else { + //查询用户权限店铺 + shopIds = new HashSet<>(privilageDomainService.listUserDatePermission(userId)); + } PageHelper.startPage(pageNum, pageSize); - List results = poiCustomerContactDataStatMapper.selectSumDataByShopIds(storeIds,startDate,endDate); + List results = poiCustomerContactDataStatMapper.selectSumDataByShopIds(shopIds,startDate,endDate); if (CollectionUtils.isNotEmpty(results)){ results.forEach(result -> { Long storeId = result.getStoreId();