Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !369

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -891,7 +891,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             return storeRoleDTO;
         }
         if (storeIds.contains("-1")) {
-            logger.info("该导购为超管");
+            logger.info("该导购为超管,clerkId={}",clerkId);
             int gicStoreCount = storeWidgetService.getClerkWidgetStore(clerkId);
             storeRoleDTO.setStoreCount(gicStoreCount);
             return storeRoleDTO;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/ClerkUtils.java

+package com.gic.haoban.manage.service.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+
+public class ClerkUtils {
+
+    private static ClerkService clerkService;
+
+    @Autowired
+    public void setClerkService(ClerkService clerkService) {
+        ClerkUtils.clerkService = clerkService;
+    }
+
+    public String getClerkStore(ClerkDTO clerk, String clerkId) {
+        if (null == clerk) {
+            clerk = clerkService.getclerkById(clerkId);
+        }
+        if (null == clerk) {
+            return null;
+        }
+        if (clerk.getClerkType() != 0 && clerk.getClerkType() != 1) {
+            return null;
+        }
+        return clerk.getStoreId();
+    }
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -258,7 +258,7 @@ public class MemberMarketingController extends WebBaseController {
 
     @RequestMapping("/member/marketing-count")
     @ResponseBody
-    public RestResponse<Object> marketingCount(String memberId, String enterpriseId) {
+    public RestResponse<Map<String,Integer>> marketingCount(String memberId, String enterpriseId) {
         // 时间默认一个月
         Calendar start = Calendar.getInstance();
         Date endTime = start.getTime();
@@ -282,13 +282,13 @@ public class MemberMarketingController extends WebBaseController {
         // AI营销
         ServiceResponse<Page<AiMemberLogListDTO>> aiMemberLogRes = aiMemberLogApiService.pageAiMemberMarketingLog(
                 memberId, null, Lists.newArrayList(0, 1, 6, 8), null, null, new BasePageInfo());
-
-        logger.info("ecmPage {} cardPage {} smsPage {} wechatPage {} aiMemberLogPage：{}", ecmPage.getTotalCount(),
-                cardPage.getTotalCount(), smsPage.getTotalCount(), wechatPage.getTotalCount(),
-                aiMemberLogRes.getResult().getTotalCount());
-        int total = ecmPage.getTotalCount() + cardPage.getTotalCount() + smsPage.getTotalCount()
-                + wechatPage.getTotalCount() + aiMemberLogRes.getResult().getTotalCount();
-        return RestResponse.successResult(total);
+        Map<String,Integer> map = new HashMap<>();
+        map.put("ecm", ecmPage.getTotalCount()) ;
+        map.put("sms", smsPage.getTotalCount()) ;
+        map.put("coupon", cardPage.getTotalCount()) ;
+        map.put("wechat", wechatPage.getTotalCount()) ;
+        map.put("ai", aiMemberLogRes.getResult().getTotalCount()) ;
+        return RestResponse.successResult(map);
     }
 
     @RequestMapping("page-ai-member-log")