大屏接口

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<PoiCustomerContactDataStat> {
@@ -32,5 +33,5 @@ public interface PoiCustomerContactDataStatMapper extends BaseMapper<PoiCustomer
      */
     Integer sumNegativeFeedbackCntByStoreIds(@Param("storeIds") List<Long> storeIds);
 
-    List<PoiCustomerContactDataStat> selectSumDataByShopIds(@Param("storeIds")List<Long> storeIds, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<PoiCustomerContactDataStat> selectSumDataByShopIds(@Param("storeIds") Set<Long> storeIds, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 }

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<String,Object> 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<PoiCustomerContactDataStat>  poiCustomerContactDataStatPageInfo = storePromotionDataService.listUserBehaviorData(userId,companyId, shopId,startDate, endDate,pageNum,pageSize);
+            return data(poiCustomerContactDataStatPageInfo);
+        }catch (Exception e){
+            log.error("查询门店推广数据列表",e);
+            return fail();
+        }
+    }
+
     /**
      * 同步客户统计数据
      * @param startDate

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<PoiCustomerContactDataStat> listUserBehaviorData(List<Long> storeIds,Date startDate, Date endDate,Integer pageNum,Integer pageSize){
+    public PageInfo<PoiCustomerContactDataStat> listUserBehaviorData(Long userId,Long companyId,Long shopId,Date startDate, Date endDate,Integer pageNum,Integer pageSize){
+        Set<Long> shopIds = new HashSet<>();
+
+        if (shopId != null) {
+            //如果有店铺则查店铺
+            shopIds.add(shopId);
+        } else if (companyId != null) {
+            //如果有公司则查公司店铺
+            Set<Long> sp = customerViewService.getCompanyShop(companyId, userId);
+            shopIds.addAll(sp);
+        } else {
+            //查询用户权限店铺
+            shopIds = new HashSet<>(privilageDomainService.listUserDatePermission(userId));
+        }
         PageHelper.startPage(pageNum, pageSize);
-        List<PoiCustomerContactDataStat> results = poiCustomerContactDataStatMapper.selectSumDataByShopIds(storeIds,startDate,endDate);
+        List<PoiCustomerContactDataStat> results = poiCustomerContactDataStatMapper.selectSumDataByShopIds(shopIds,startDate,endDate);
         if (CollectionUtils.isNotEmpty(results)){
             results.forEach(result -> {
                 Long storeId = result.getStoreId();