导购门店参数修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthDataAdaptor.java

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.commons.util.DateUtil;
 import com.gic.content.api.dto.material.ContentMaterialBaseDTO;
@@ -71,6 +73,8 @@ public class WeekMonthDataAdaptor {
 
     @Autowired
     private ContentMaterialApiService contentMaterialApiService;
+    @Autowired
+    private ClerkService clerkService;
 
     @Data
     @AllArgsConstructor
@@ -97,19 +101,22 @@ public class WeekMonthDataAdaptor {
         String clerkId = context.getClerkId();
         Integer reportType = context.getReportType();
         List<String> rightMenuCodeList = context.getRightMenuCodeList();
+        MaterialDataResult emptyResult = MaterialDataResult.buildEmpty();
         if (CollectionUtils.isEmpty(rightMenuCodeList)) {
-            return MaterialDataResult.buildEmpty();
+            return emptyResult;
         }
         if (rightMenuCodeList.size() > 1) {
             MaterialDataResult contentResult = queryClerkReportDataContent(enterpriseId, clerkId, storeId, reportType, bizDate);
             MaterialDataResult potentialResult = queryReportDataPotential(enterpriseId, clerkId, Lists.newArrayList(storeId), reportType, bizDate);
-            return new MaterialDataResult(potentialResult.getFirstValue(),contentResult.getSecondValue());
+            return new MaterialDataResult(
+                    Optional.ofNullable(potentialResult).orElse(emptyResult).getFirstValue()
+                    ,Optional.ofNullable(contentResult).orElse(emptyResult).getSecondValue());
         } else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())) {
-            return queryReportDataPotential(enterpriseId, clerkId, Lists.newArrayList(storeId), reportType, bizDate);
+            return Optional.ofNullable(queryReportDataPotential(enterpriseId, clerkId, Lists.newArrayList(storeId), reportType, bizDate)).orElse(emptyResult);
         } else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())) {
-            return queryClerkReportDataContent(enterpriseId, clerkId, storeId, reportType, bizDate);
+            return Optional.ofNullable(queryClerkReportDataContent(enterpriseId, clerkId, storeId, reportType, bizDate)).orElse(emptyResult);
         }
-        return MaterialDataResult.buildEmpty();
+        return emptyResult;
     }
 
     public MaterialDataResult queryAreaReportData(MaterialReportContext context,List<String> storeIds,String bizDate) {
@@ -231,7 +238,12 @@ public class WeekMonthDataAdaptor {
             endDate = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.endOfWeek(date), "yyyy-MM-dd");
         }
         Map<String, Object> inlineParams = new HashMap<>();
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(clerkId)) {
+        ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+        if (clerkDTO == null) {
+            return null;
+        }
+        Integer clerkType = clerkDTO.getClerkType();
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(clerkId) && clerkType < 2) {
             inlineParams.put("clerkId", clerkId);
         }
         if (CollectionUtils.isNotEmpty(storeIds)) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -60,17 +60,28 @@ public class PotentialDataController {
         String clerkId = contactOrderPageQO.getClerkId();
         String storeId = contactOrderPageQO.getStoreId();
         List<String> storeIds = new ArrayList<>();
-        if (StringUtils.isBlank(storeId)) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(storeId, contactOrderPageQO.getEnterpriseId(),
-                    StoreStatusFilterUtils.getStoreStatusList(contactOrderPageQO.getStoreStatusFilter()));
-        } else {
+        if (StringUtils.isNotBlank(clerkId)) {
+            ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+            if (clerkDTO == null) {
+                return RestResponse.failure("-1", "导购不存在");
+            }
+            Integer clerkType = clerkDTO.getClerkType();
+            if (clerkType > 2) {
+                storeIds = clerkStoreAdaptor.queryClerkStoreIds(clerkId, contactOrderPageQO.getEnterpriseId(),
+                        StoreStatusFilterUtils.getStoreStatusList(contactOrderPageQO.getStoreStatusFilter()));
+                clerkId = "";
+            }
+        }
+        if (StringUtils.isNotBlank(storeId)) {
             storeIds.add(storeId);
         }
         ContactOrderSearchQDTO searchQDTO = new ContactOrderSearchQDTO();
         if (CollectionUtils.isNotEmpty(storeIds)) {
             searchQDTO.setStoreIdList(storeIds);
         }
-        searchQDTO.setClerkId(clerkId);
+        if (StringUtils.isNotBlank(clerkId)) {
+            searchQDTO.setClerkId(clerkId);
+        }
         searchQDTO.setBeginTime(contactOrderPageQO.getBeginTime());
         searchQDTO.setEndTime(contactOrderPageQO.getEndTime());
         searchQDTO.setChannelType(contactOrderPageQO.getChannelType());
@@ -328,14 +339,26 @@ public class PotentialDataController {
     }
 
     private List<String> getStoreIds(PotentialStatisticsBaseQO potentialStatisticsBaseQO) {
+        String clerkId = potentialStatisticsBaseQO.getClerkId();
         String wxEnterpriseId = potentialStatisticsBaseQO.getWxEnterpriseId();
         String storeId = potentialStatisticsBaseQO.getStoreId();
         Integer storeStatusFilter = potentialStatisticsBaseQO.getStoreStatusFilter();
         List<String> storeIds = new ArrayList<>();
-        if (StringUtils.isBlank(storeId)) {
-            storeIds = clerkStoreAdaptor.queryClerkStoreIds(storeId, wxEnterpriseId,
-                    StoreStatusFilterUtils.getStoreStatusList(storeStatusFilter));
-        } else {
+        if (StringUtils.isNotBlank(clerkId)) {
+            ClerkDTO clerkDTO = clerkService.getclerkById(clerkId);
+            if (clerkDTO == null) {
+                return Lists.newArrayList("-1");
+            }
+            Integer clerkType = clerkDTO.getClerkType();
+            if (clerkType > 2) {
+                potentialStatisticsBaseQO.setClerkId("");
+                if (StringUtils.isBlank(storeId)) {
+                    storeIds = clerkStoreAdaptor.queryClerkStoreIds(clerkId, wxEnterpriseId,
+                            StoreStatusFilterUtils.getStoreStatusList(storeStatusFilter));
+                }
+            }
+        }
+        if (StringUtils.isNotBlank(storeId)) {
             storeIds.add(storeId);
         }
         return storeIds;