用户行为优化1.0.5

src/main/java/com/caimei/modules/project/dao/ClubDao.java

@@ -1,6 +1,7 @@
 package com.caimei.modules.project.dao;
 
 import com.caimei.modules.project.model.ClubModel;
+import com.caimei.modules.user.entity.CmBehaviorInfo;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,10 @@ public interface ClubDao extends CrudDao<ClubModel> {
     Integer selFirst(@Param("clubId") Integer clubId);
 
     List<String> selMachineType(@Param("productId") List<Integer> productIds);
+    /**
+     * 保存行为记录
+     *
+     * @param behaviorInfo
+     */
+    void insertBehaviorInfo(CmBehaviorInfo behaviorInfo);
 }

src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -101,4 +101,8 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
     List<String> getClubIds();
 
     List<ActiveClub> getActiveClubInfo(ActiveClub activeClub);
+
+    List<ActiveClub> getTouristClubInfo(ActiveClub activeClub);
+
+    List<CmBehaviorInfo> getBehaviorInfo(CmBehaviorInfo behaviorInfo);
 }

src/main/java/com/caimei/modules/user/entity/ActiveClub.java

@@ -14,7 +14,7 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     private String registerStartTime; // 注册开始时间
     private String registerEndTime; // 注册结束时间
     private String behaviorStartTime; // 最近访问时间开始时间
-    private String behaviorEndTime; // 最近访问时间结束时间
+    private String behaviorEndTime; // 最近访问时间结束时间m
     private String recentlyStartTime; // 最近咨询时间开始时间
     private String recentlyEndTime; // 最近咨询时间结束时间
     private String orderStartTime; // 最近下单时间开始时间
@@ -51,6 +51,11 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     private String behaviorTime;    // 最近访问时间
     private String lastOrderTime;  // 最近下单时间
     private String recentlyTime;    //最近咨询时间
+    private Integer spId;    //协销Id
+    private String spLinkMan;    //协销联系人名称
+    private String questionMan;    //咨询人
+    private String mobileOrWeChat;    //手机号/微信号
+    private String visAddTime;    //手机号/微信号
 
     public Integer getUserID() {
         return userID;
@@ -363,4 +368,44 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     public void setRecentlyTime(String recentlyTime) {
         this.recentlyTime = recentlyTime;
     }
+
+    public Integer getSpId() {
+        return spId;
+    }
+
+    public void setSpId(Integer spId) {
+        this.spId = spId;
+    }
+
+    public String getSpLinkMan() {
+        return spLinkMan;
+    }
+
+    public void setSpLinkMan(String spLinkMan) {
+        this.spLinkMan = spLinkMan;
+    }
+
+    public String getQuestionMan() {
+        return questionMan;
+    }
+
+    public void setQuestionMan(String questionMan) {
+        this.questionMan = questionMan;
+    }
+
+    public String getMobileOrWeChat() {
+        return mobileOrWeChat;
+    }
+
+    public void setMobileOrWeChat(String mobileOrWeChat) {
+        this.mobileOrWeChat = mobileOrWeChat;
+    }
+
+    public String getVisAddTime() {
+        return visAddTime;
+    }
+
+    public void setVisAddTime(String visAddTime) {
+        this.visAddTime = visAddTime;
+    }
 }

src/main/java/com/caimei/modules/user/entity/CmBehaviorInfo.java

@@ -0,0 +1,266 @@
+package com.caimei.modules.user.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : hzg
+ * @date : 2024/1/19
+ */
+public class CmBehaviorInfo extends DataEntity<CmBehaviorInfo> {
+    private Integer id;
+    /**
+     * 操作对象 1 机构 2 协销 3 客服 4 系统
+     */
+    private Integer operateObject;
+    /**
+     * 机构Id
+     */
+    private Integer clubId;
+    /**
+     * 机构名称
+     */
+    private String clubName;
+    /**
+     * 协销Id
+     */
+    private Integer spId;
+    /**
+     * 协销名称
+     */
+    private String spName;
+    /**
+     * 1:日常访问; 2:推送访问（站内信）; 3: 推送访问（短信）; 4: 推送访问（微信模板消息）:
+     * 5: 下单; 6: 收藏商品; 7: 加购物车; 8: 内容库访问; 9: 咨询记录，10: 分配协销
+     */
+    private Integer type;
+    /**
+     * 页面类型
+     */
+    private String pageType;
+    /**
+     * 标签
+     */
+    private String label;
+    /**
+     * 页面路径
+     */
+    private String pagePath;
+    /**
+     * 商品Id
+     */
+    private Integer productId;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 子订单Id, 多个使用逗号隔开
+     */
+    private String shopOrderId;
+    /**
+     * 子订单Id集合
+     */
+    private List<String> shopOrderIdList;
+    /**
+     * 分配人
+     */
+    private String allocation;
+    /**
+     * 添加时间
+     */
+    private String addTime;
+    /**
+     * 添加日期
+     */
+    private String dateTime;
+    /**
+     * 删除标记 0未删除 1已删除
+     */
+    private Integer delFlag;
+    /**
+     * 行为开始时间
+     */
+    private String behaviorStartTime;
+    /**
+     * 行为结束时间
+     */
+    private String behaviorEndTime;
+    /**
+     * 订单类型 0 协销订单 1 自主订单 2 呵呵订单
+     */
+    private Integer orderType;
+    /**
+     * 访问页面数量
+     */
+    private Integer number;
+
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOperateObject() {
+        return operateObject;
+    }
+
+    public void setOperateObject(Integer operateObject) {
+        this.operateObject = operateObject;
+    }
+
+    public Integer getClubId() {
+        return clubId;
+    }
+
+    public void setClubId(Integer clubId) {
+        this.clubId = clubId;
+    }
+
+    public String getClubName() {
+        return clubName;
+    }
+
+    public void setClubName(String clubName) {
+        this.clubName = clubName;
+    }
+
+    public Integer getSpId() {
+        return spId;
+    }
+
+    public void setSpId(Integer spId) {
+        this.spId = spId;
+    }
+
+    public String getSpName() {
+        return spName;
+    }
+
+    public void setSpName(String spName) {
+        this.spName = spName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPageType() {
+        return pageType;
+    }
+
+    public void setPageType(String pageType) {
+        this.pageType = pageType;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getPagePath() {
+        return pagePath;
+    }
+
+    public void setPagePath(String pagePath) {
+        this.pagePath = pagePath;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getShopOrderId() {
+        return shopOrderId;
+    }
+
+    public void setShopOrderId(String shopOrderId) {
+        this.shopOrderId = shopOrderId;
+    }
+
+    public List<String> getShopOrderIdList() {
+        return shopOrderIdList;
+    }
+
+    public void setShopOrderIdList(List<String> shopOrderIdList) {
+        this.shopOrderIdList = shopOrderIdList;
+    }
+
+    public String getAllocation() {
+        return allocation;
+    }
+
+    public void setAllocation(String allocation) {
+        this.allocation = allocation;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getDateTime() {
+        return dateTime;
+    }
+
+    public void setDateTime(String dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getBehaviorStartTime() {
+        return behaviorStartTime;
+    }
+
+    public void setBehaviorStartTime(String behaviorStartTime) {
+        this.behaviorStartTime = behaviorStartTime;
+    }
+
+    public String getBehaviorEndTime() {
+        return behaviorEndTime;
+    }
+
+    public void setBehaviorEndTime(String behaviorEndTime) {
+        this.behaviorEndTime = behaviorEndTime;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+}

src/main/java/com/caimei/modules/user/service/NewCmClubService.java

@@ -342,11 +342,32 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
     public Page<ActiveClub> findActiveClubInfo(Page<ActiveClub> page, ActiveClub activeClub) {
         activeClub.setPage(page);
-        List<ActiveClub> activeClubInfo = newCmClubDao.getActiveClubInfo(activeClub);
+        List<ActiveClub> activeClubInfo = new ArrayList<>();
+        if(!"2".equals(activeClub.getActiveStatus())) {
+            activeClubInfo = newCmClubDao.getActiveClubInfo(activeClub);
+        } else {
+            activeClubInfo = newCmClubDao.getTouristClubInfo(activeClub);
+        }
         page.setList(activeClubInfo);
         return page;
     }
 
+    public Page<CmBehaviorInfo> getClubBehaviorInfo(Page<CmBehaviorInfo> page, CmBehaviorInfo cmBehaviorInfo) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        cmBehaviorInfo.setPage(page);
+        List<CmBehaviorInfo> behaviorInfo = newCmClubDao.getBehaviorInfo(cmBehaviorInfo);
+        behaviorInfo.forEach(behavior -> {
+            behavior.setDateTime(dateFormat.format(behavior.getAddTime()));
+            if (behavior.getShopOrderId().contains(",")) {
+                String[] split = behavior.getShopOrderId().split(",");
+                List<String> shopOrderIdList = Arrays.asList(split);
+                behavior.setShopOrderIdList(shopOrderIdList);
+            }
+        });
+        page.setList(behaviorInfo);
+        return page;
+    }
+
     public List<easyExcel> exportExcel(ClubStatistics statistics) {
         List<easyExcel> statisticsList = newCmClubDao.findExcelList(statistics);
         List<easyExcel> easyExcels = setExData(statisticsList, statistics);

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -2039,4 +2039,23 @@ public class AgencyController extends BaseController {
         model.addAttribute("spNameList", spNameList);
         return "modules/userNew/activeClubInfoList";
     }
+
+    /**
+     * 行为记录
+     * @param behaviorInfo
+     * @param request
+     * @param response
+     * @param model
+     * @return
+     */
+    @RequestMapping("/getClubBehaviorInfo")
+    public String getClubBehaviorInfo(CmBehaviorInfo behaviorInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<CmBehaviorInfo> page = newCmClubService.getClubBehaviorInfo(new Page<>(request, response), behaviorInfo);
+        // 协销下拉
+        List<ServiceProviderModel> spNameList = newCmClubDao.spNameList();
+        model.addAttribute("behaviorInfo", behaviorInfo);
+        model.addAttribute("page", page);
+        model.addAttribute("spNameList", spNameList);
+        return "modules/userNew/cmClubBehaviorInfo";
+    }
 }

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -233,6 +233,18 @@ public class SpController extends BaseController {
                                 }
                             }
                         }
+                        // 行为记录
+                        try {
+                            CmBehaviorInfo behaviorInfo = new CmBehaviorInfo();
+                            behaviorInfo.setOperateObject(4);
+                            behaviorInfo.setClubId(clubId);
+                            behaviorInfo.setSpId(newspId);
+                            behaviorInfo.setAllocation("客服");
+                            behaviorInfo.setType(10);
+                            clubDao.insertBehaviorInfo(behaviorInfo);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     } else {
                         map.put("success", false);
                         map.put("msg", "操作失败");

src/main/resources/mappings/modules/project/ClubMapper.xml

@@ -50,4 +50,38 @@
 			#{productId}
 		</foreach>
 	</select>
+
+	<insert id="insertBehaviorInfo">
+		insert into cm_behavior_info(
+		operateObject,
+		clubId,
+		<if test="spId != null">
+			spId,
+		</if>
+		type,
+		<if test="pageType != null and pageType != ''">
+			pageType,
+		</if>
+		<if test="allocation != null and allocation != ''">
+			allocation,
+		</if>
+		addTime,
+		delFlag)
+		values(
+		#{operateObject},
+		#{clubId},
+		<if test="spId != null">
+			#{spId},
+		</if>
+		#{type},
+		<if test="pageType != null and pageType != ''">
+			#{pagetType},
+		</if>
+		<if test="allocation != null and allocation != ''">
+			#{allocation},
+		</if>
+		now(),
+		0
+		)
+	</insert>
 </mapper>

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -1553,4 +1553,68 @@
             ORDER BY cb.accessTime asc
         </if>
     </select>
+    <select id="getTouristClubInfo" resultType="com.caimei.modules.user.entity.ActiveClub">
+        SELECT
+            cvr.id,
+            cvr.serviceProviderId as spId,
+            s.linkMan as spLinkMan,
+            cvr.questionMan,
+            cvr.addTime as visAddTime
+        FROM cm_visitor_remarks cvr
+                 LEFT JOIN serviceprovider s ON s.serviceProviderID = cvr.serviceProviderId
+        <where>
+            cvr.clubId IS NULL OR cvr.clubId = ''
+            <if test="recentlyStartTime != null and recentlyStartTime != ''">
+                AND cvr.addTime <![CDATA[ >= ]]> #{recentlyStartTime}
+            </if>
+            <if test="recentlyEndTime != null and recentlyEndTime != ''">
+                AND cvr.addTime <![CDATA[ <= ]]> #{recentlyEndTime}
+            </if>
+        </where>
+        order by cvr.addTime
+    </select>
+
+    <select id="getBehaviorInfo" resultType="com.caimei.modules.user.entity.CmBehaviorInfo">
+        SELECT
+            cbi.id,
+            cbi.operateObject,
+            cbi.clubId,
+            cbi.spId,
+            cbi.type,
+            cbi.pageType,
+            cbi.label,
+            cbi.pagePath,
+            cbi.productId,
+            cbi.shopOrderId,
+            cbi.allocation,
+            cbi.addTime,
+            cbi.delFlag,
+            (CASE WHEN c.name IS NOT NULL THEN c.name
+                  WHEN c.name IS NULL OR c.name = '' THEN c.linkMan END) AS clubName,
+            s.linkMan AS spName,
+            (SELECT COUNT(recordId) FROM cm_behavior_record WHERE userId = c.userId AND accessDate = cbi.addTime) AS number,
+            p.name AS productName
+        FROM cm_behavior_info cbi
+                 LEFT JOIN club c ON c.clubId = cbi.clubId
+                 LEFT JOIN serviceprovider s ON s.serviceProviderID = cbi.spId
+                 LEFT JOIN product p ON p.productId = cbi.productId
+        <where>
+            cbi.delFlag = 0
+            <if test="operateObject != null">
+                and cbi.operateObject = #{operateObject}
+            </if>
+            <if test="spName != null and spName != ''">
+                and s.name like concat('%', #{spName}, '%')
+            </if>
+            <if test="type != null">
+                and cbi.type = #{type}
+            </if>
+            <if test="behaviorStartTime != null and behaviorStartTime != ''">
+                AND cbi.addTime <![CDATA[ >= ]]> #{behaviorStartTime}
+            </if>
+            <if test="behaviorEndTime != null and behaviorEndTime != ''">
+                AND cbi.addTime <![CDATA[ <= ]]> #{behaviorEndTime}
+            </if>
+        </where>
+    </select>
 </mapper>

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleForm.jsp

@@ -84,9 +84,10 @@
     <shiro:hasPermission name="user:newCmClub:edit">
         <li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li>
     </shiro:hasPermission>
+    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
     <li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
     <li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
-<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
+
 
     <li class="active"><a
             href="${ctx}/serviceteam/cmServiceteamRole/form?teamId=${cmServiceteamRole.teamId}">协销小组${not empty cmServiceteamRole.teamId?'编辑':'添加'}</a>

src/main/webapp/WEB-INF/views/modules/user/clubTemporaryList.jsp

@@ -24,7 +24,6 @@
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
 	<li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-<%--	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li class="active"><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

src/main/webapp/WEB-INF/views/modules/user/cmDistributionClubList.jsp

@@ -104,7 +104,6 @@
 	<li ><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
 	<li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
 	<li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-<%--	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 	<li class="active"><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>

src/main/webapp/WEB-INF/views/modules/user/cmOperationalLogs.jsp

@@ -30,7 +30,6 @@
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li class="active"><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

src/main/webapp/WEB-INF/views/modules/userNew/activeClubInfoList.jsp

@@ -58,7 +58,7 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
-    <li class="active"><a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1&activeStatus=0">机构分析统计列表</a></li>
+    <li class="active"><a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1&activeStatus=0">机构活跃详情</a></li>
 </ul>
 <form:form id="searchForm" modelAttribute="activeClub" action="${ctx}/new/user/agency/findActiveClubInfo" method="post"
            class="breadcrumb form-search">
@@ -175,134 +175,171 @@
     <ul id="activeClub">
         <li class="icon-activeClub" value="0">活跃机构</li>
         <li class="icon-ubActiveClub" value="1">不活跃机构</li>
+        <li class="icon-tourist" value="2">咨询游客</li>
     </ul>
 </div>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
     <tr>
-        <th>机构ID</th>
-        <th>机构名称</th>
-        <th>联系人</th>
-        <th>联系人身份</th>
-        <th>手机号</th>
-        <th>协销人员</th>
-        <th>地址</th>
-        <th>状态</th>
-        <th>机构类型</th>
-        <th>机构级别</th>
-        <th>注册时间</th>
-        <th class="th-sort">
-            最近访问时间
-            <div class="sort sort-button" id="sort-button1">
-                <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1" class="icon icon-up"></a>
-                <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=2" class="icon icon-down"></a>
-            </div>
-        </th>
-        <th>最近咨询时间</th>
-        <th>最近下单时间</th>
+        <c:if test="${2 != activeClub.activeStatus}">
+            <th>机构ID</th>
+            <th>机构名称</th>
+            <th>联系人</th>
+            <th>联系人身份</th>
+            <th>手机号</th>
+            <th>协销人员</th>
+            <th>地址</th>
+            <th>状态</th>
+            <th>机构类型</th>
+            <th>机构级别</th>
+            <th>注册时间</th>
+            <th class="th-sort">
+                最近访问时间
+                <div class="sort sort-button" id="sort-button1">
+                    <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1" class="icon icon-up"></a>
+                    <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=2" class="icon icon-down"></a>
+                </div>
+            </th>
+            <th>最近咨询时间</th>
+            <th>最近下单时间</th>
+        </c:if>
+        <c:if test="${2 == activeClub.activeStatus}">
+            <th>咨询人</th>
+            <th>手机号/微信号</th>
+            <th>协销</th>
+            <th>最近咨询时间</th>
+        </c:if>
         <th>操作</th>
     </tr>
     </thead>
     <tbody>
     <c:forEach items="${page.list}" var="clubList">
         <tr>
-            <td>${clubList.clubID}</td>
-            <td>
-                    ${clubList.name}
-            </td>
-            <td>
-                    ${clubList.linkMan}
-            </td>
-            <td>
-                <c:if test="${clubList.linkManStatus ne null}">
-                    ${clubList.linkManStatus}
-                </c:if>
-                <c:if test="${clubList.linkManStatus eq null}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                    ${clubList.contractMobile}
-            </td>
-            <td>
-                    ${clubList.spName}
-            </td>
+            <c:if test="${2 != activeClub.activeStatus}">
+                <td>${clubList.clubID}</td>
+                <td>
+                        ${clubList.name}
+                </td>
+                <td>
+                        ${clubList.linkMan}
+                </td>
+                <td>
+                    <c:if test="${clubList.linkManStatus ne null}">
+                        ${clubList.linkManStatus}
+                    </c:if>
+                    <c:if test="${clubList.linkManStatus eq null}">
+                        ---
+                    </c:if>
+                </td>
+                <td>
+                        ${clubList.contractMobile}
+                </td>
+                <td>
+                        ${clubList.spName}
+                </td>
+                <td>
+                    <c:if test="${not empty clubList.province}">
+                        ${clubList.province}
+                    </c:if>
+                    <c:if test="${not empty clubList.city}">
+                        ${clubList.city}
+                    </c:if>
+                    <c:if test="${empty clubList.province and empty clubList.city}">
+                        ---
+                    </c:if>
+                </td>
+                <td>${clubList.clubStatus}</td>
+                <td>
+                    <c:if test="${clubList.firstClubType != null || clubList.firstClubType != ''}">
+                        ${clubList.firstClubType}
+                    </c:if>
+                    <c:if test="${clubList.classify ne null}">
+                        - ${clubList.classify}
+                    </c:if>
+                    <c:if test="${clubList.firstClubType == null and clubList.firstClubType == '' and clubList.classify == null and clubList.classify == ''}">
+                        ---
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${clubList.userIdentity eq 4}">
+                        个人机构
+                    </c:if>
+                    <c:if test="${clubList.userIdentity eq 2}">
+                        资质机构
+                    </c:if>
+                    <c:if test="${clubList.svipUserFlag eq 1}">
+                        <font color="red">(超级会员)</font>
+                    </c:if>
+                    <c:if test="${clubList.userIdentity eq 2 and clubList.svipUserFlag eq 0}">
+                        <font color="red">(普通会员)</font>
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${clubList.registerTime ne null}">
+                        ${clubList.registerTime}
+                        <%--<fmt:formatDate value="${clubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
+                    </c:if>
+                    <c:if test="${clubList.registerTime eq null}">
+                        ---
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${clubList.behaviorTime ne null}">
+                        ${clubList.behaviorTime}
+                    </c:if>
+                    <c:if test="${clubList.behaviorTime eq null}">
+                        ---
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${clubList.recentlyTime ne null}">
+                        ${clubList.recentlyTime}
+                    </c:if>
+                    <c:if test="${clubList.recentlyTime eq null}">
+                        ---
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${clubList.lastOrderTime ne null}">
+                        ${clubList.lastOrderTime}
+                    </c:if>
+                    <c:if test="${clubList.lastOrderTime eq null}">
+                        ---
+                    </c:if>
+                </td>
+            </c:if>
+            <c:if test="${2 == activeClub.activeStatus}">
+                <td>${clubList.questionMan}</td>
+                <td>
+                    <c:if test="${empty clubList.mobileOrWeChat}">
+                        ---
+                    </c:if>
+                    <c:if test="${ not empty clubList.mobileOrWeChat}">
+                        ${clubList.mobileOrWeChat}
+                    </c:if>
+                </td>
+                <td>
+                    <c:if test="${empty clubList.spLinkMan}">
+                        ---
+                    </c:if>
+                    <c:if test="${ not empty clubList.spLinkMan}">
+                        ${clubList.spLinkMan}
+                    </c:if>
+                </td>
+                <td>${clubList.visAddTime}</td>
+            </c:if>
             <td>
-                <c:if test="${not empty clubList.province}">
-                    ${clubList.province}
+                <c:if test="${2 != activeClub.activeStatus}">
+                    <a href="${ctx}/new/user/agency/clubPortrait?clubID=${clubList.clubID}&clubName=${clubList.name}&dateType=0&type=4">机构画像</a>
+                    <a href="${ctx}/new/user/agency/getClubBehaviorInfo?clubId=${clubList.clubID}&operateObject=1">行为记录</a>
                 </c:if>
-                <c:if test="${not empty clubList.city}">
-                    ${clubList.city}
+                <c:if test="${2 == activeClub.activeStatus}">
+                    <a href="javaScript: void(0)" class="tab_remark" onclick="getNewAdmin('${clubList.questionMan}', '${clubList.spId}')">咨询记录</a>
                 </c:if>
-                <c:if test="${empty clubList.province and empty clubList.city}">
-                    ---
-                </c:if>
-            </td>
-            <td>${clubList.clubStatus}</td>
-            <td>
-                <c:if test="${clubList.firstClubType != null || clubList.firstClubType != ''}">
-                    ${clubList.firstClubType}
-                </c:if>
-                <c:if test="${clubList.classify ne null}">
-                    - ${clubList.classify}
-                </c:if>
-                <c:if test="${clubList.firstClubType == null and clubList.firstClubType == '' and clubList.classify == null and clubList.classify == ''}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                <c:if test="${clubList.userIdentity eq 4}">
-                    个人机构
-                </c:if>
-                <c:if test="${clubList.userIdentity eq 2}">
-                    资质机构
-                </c:if>
-                <c:if test="${clubList.svipUserFlag eq 1}">
-                    <font color="red">(超级会员)</font>
-                </c:if>
-                <c:if test="${clubList.userIdentity eq 2 and clubList.svipUserFlag eq 0}">
-                    <font color="red">(普通会员)</font>
-                </c:if>
-            </td>
-            <td>
-                <c:if test="${clubList.registerTime ne null}">
-                    ${clubList.registerTime}
-                    <%--<fmt:formatDate value="${clubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
-                </c:if>
-                <c:if test="${clubList.registerTime eq null}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                <c:if test="${clubList.behaviorTime ne null}">
-                    ${clubList.behaviorTime}
-                </c:if>
-                <c:if test="${clubList.behaviorTime eq null}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                <c:if test="${clubList.recentlyTime ne null}">
-                    ${clubList.recentlyTime}
-                </c:if>
-                <c:if test="${clubList.recentlyTime eq null}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                <c:if test="${clubList.lastOrderTime ne null}">
-                    ${clubList.lastOrderTime}
-                </c:if>
-                <c:if test="${clubList.lastOrderTime eq null}">
-                    ---
-                </c:if>
-            </td>
-            <td>
-                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${clubList.clubID}&clubName=${clubList.name}&dateType=0&type=4">机构画像</a>
-                <a href="javascript: void(0);"
+                <%--<a href="javascript: void(0);"
                    onclick="goNewBack(1, '${clubList.addTime}', ${clubList.userIdentity}, '${clubList.name}', '${clubList.linkMan}','${clubList.clubID}')">访问记录</a>
                 <a href="javascript: void(0);"
-                   onclick="goNewBack(2, '${clubList.addTime}', ${clubList.userIdentity}, '${clubList.name}', '${clubList.linkMan}','${clubList.clubID}')">咨询记录</a>
+                   onclick="goNewBack(2, '${clubList.addTime}', ${clubList.userIdentity}, '${clubList.name}', '${clubList.linkMan}','${clubList.clubID}')">咨询记录</a>--%>
             </td>
         </tr>
     </c:forEach>
@@ -324,10 +361,19 @@
         console.log('---------', $('#activeStatus').val());
         if (activeStatus === 0) {
             // 活跃机构
-            $('.icon-activeClub').attr("class", "redAddClass")
-        } else {
+            $('.icon-activeClub').attr("class", "redAddClass");
+            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-tourist").removeClass("redAddClass");
+        } else if (activeStatus === 1){
             // 不活跃机构
-            $('.icon-ubActiveClub').attr("class", "redAddClass")
+            $('.icon-ubActiveClub').attr("class", "redAddClass");
+            $(".icon-activeClub").removeClass("redAddClass");
+            $(".icon-tourist").removeClass("redAddClass");
+        } else {
+            // 咨询游客
+            $('.icon-tourist').attr("class", "redAddClass");
+            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-activeClub").removeClass("redAddClass");
         }
         $('#searchForm').submit();
     })
@@ -388,14 +434,30 @@
         }
     }
 
+    function getNewAdmin(questionMan, spId) {
+        $.get("${ctx}/jump/link", function (data) {
+            link = "https://manager-b.caimei365.com/#/user/consult/unreg-list?questionMan=" + questionMan + "&serviceProviderId=" + spId + "&token=" + data;
+            window.open(link, "_blank");
+        });
+    }
+
     $(function () {
         const activeStatus = $('#activeStatus').val() * 1;
         if (activeStatus === 0) {
             // 活跃机构
             $('.icon-activeClub').attr("class", "redAddClass")
-        } else {
+            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-tourist").removeClass("redAddClass");
+        } else if (activeStatus === 1){
             // 不活跃机构
-            $('.icon-ubActiveClub').attr("class", "redAddClass")
+            $('.icon-ubActiveClub').attr("class", "redAddClass");
+            $(".icon-activeClub").removeClass("redAddClass");
+            $(".icon-tourist").removeClass("redAddClass");
+        } else {
+            // 咨询游客
+            $('.icon-tourist').attr("class", "redAddClass");
+            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-activeClub").removeClass("redAddClass");
         }
         const typeMap = {
             1: {

src/main/webapp/WEB-INF/views/modules/userNew/cmClubBehaviorInfo.jsp

@@ -0,0 +1,249 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>机构基本资料列表</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        #activeClub { width: 100%; height: 50px; display: flex;  align-items: center; }
+        #activeClub > li {float: left; text-align: center; margin-left: 15px; font-size: 15px; list-style-type: none;}
+    </style>
+    <link href="${ctxStatic}/modules/cmAgencyStatisticsList/cmAgencyStatisticsList.css" rel="stylesheet">
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
+    <li><a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1&activeStatus=0">机构活跃详情</a></li>
+    <li class="active"><a href="${ctx}/new/user/agency/getClubBehaviorInfo?clubId=${behaviorInfo.clubId}&spId=${behaviorInfo.spId}&operateObject=${behaviorInfo.operateObject}">行为记录</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="behaviorInfo" action="${ctx}/new/user/agency/getClubBehaviorInfo" method="post"
+           class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+    <input id="userID" name="payTotalMonthType" type="hidden" value="${behaviorInfo.clubId}"/>
+    <input id="userID" name="payTotalMonthType" type="hidden" value="${behaviorInfo.spId}"/>
+    <input id="userID" name="payTotalMonthType" type="hidden" value="${behaviorInfo.operateObject}"/>
+    <div class="flex-wrap">
+        <div id="items" class="flex-wrap">
+            <c:if test="${behaviorInfo.operateObject == 1}">
+            <div class="item">
+                <label>协销：</label>
+                <form:input path="spName"  htmlEscape="false" maxlength="50" class="input-medium" />
+                <%--<form:select path="spId" class="input-medium">
+                    <form:option value="" label="全部"/>
+                    <form:options items="${spNameList}" itemLabel="name" itemValue="serviceProviderID" htmlEscape="false"/>
+                </form:select>--%>
+            </div>
+            </c:if>
+            <c:if test="${behaviorInfo.operateObject == 1}">
+                <div class="item">
+                    <label>操作对象：</label>
+                    <form:select path="operateObject" class="input-medium">
+                        <form:option value="" label="请选择"/>
+                        <form:option value="1" label="机构"/>
+                        <form:option value="2" label="协销"/>
+                    </form:select>
+                </div>
+            </c:if>
+            <div class="item">
+                <label class="control-label">行为类型：</label>
+                <form:select path="type" class="input-medium">
+                    <form:option value="" label="请选择"/>
+                    <c:if test="${behaviorInfo.operateObject == 1}">
+                        <form:option value="1" label="日常访问"/>
+                        <form:option value="2" label="推送访问（站内信）"/>
+                        <form:option value="3" label="推送访问（短信）"/>
+                        <form:option value="4" label="推送访问（微信模板消息）"/>
+                    </c:if>
+                    <form:option value="5" label="下单"/>
+                    <c:if test="${behaviorInfo.operateObject == 1}">
+                        <form:option value="6" label="收藏商品"/>
+                        <form:option value="7" label="加购物车"/>
+                        <form:option value="8" label="内容库访问"/>
+                    </c:if>
+                    <form:option value="9" label="咨询记录"/>
+                    <form:option value="10" label="分配协销"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>行为时间：</label>
+                <form:input path="behaviorStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${behaviorStartTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                -
+                <form:input path="behaviorEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${behaviorEndTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <input id="btnSubmit" class="btn btn-primary" type="button" value="查询"/>
+            </div>
+        </div>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<div>
+    <ul id="activeClub">
+        <li>${behaviorInfo.operateObject == 1 ? "机构": "协销"} : ${behaviorInfo.operateObject == 1 ? behaviorInfo.clubName : behaviorInfo.spName}</li>
+    </ul>
+</div>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>行为时间</th>
+        <th>操作对象</th>
+        <c:if test="${behaviorInfo.operateObject == 2}">
+            <th>对象名称</th>
+        </c:if>
+        <th>行为类型</th>
+        <c:if test="${behaviorInfo.operateObject != 2}">
+            <th>当前协销</th>
+            <th>页面类型</th>
+            <th>标签</th>
+        </c:if>
+        <th>行为详情</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="behavior">
+        <tr>
+            <td>${behavior.addTime}</td>
+            <td>
+                <c:if test="${behavior.operateObject == 1}">
+                    机构
+                </c:if>
+                <c:if test="${behavior.operateObject == 2}">
+                    协销
+                </c:if>
+                <c:if test="${behavior.operateObject == 3}">
+                    客服
+                </c:if>
+                <c:if test="${behavior.operateObject == 4}">
+                    系统
+                </c:if>
+            </td>
+            <c:if test="${behaviorInfo.operateObject == 2}">
+                <td>${behavior.clubName}</td>
+            </c:if>
+            <td>
+                <c:if test="${behavior.type == 1}">
+                    日常访问
+                </c:if>
+                <c:if test="${behavior.type == 2}">
+                    推送访问（站内信）
+                </c:if>
+                <c:if test="${behavior.type == 3}">
+                    推送访问（短信）
+                </c:if>
+                <c:if test="${behavior.operateObject == 4}">
+                    推送访问（微信模板消息）
+                </c:if>
+                <c:if test="${behavior.operateObject == 5}">
+                    下单
+                </c:if>
+                <c:if test="${behavior.operateObject == 6}">
+                    收藏商品
+                </c:if>
+                <c:if test="${behavior.operateObject == 7}">
+                    加购物车
+                </c:if>
+                <c:if test="${behavior.operateObject == 8}">
+                    内容库访问
+                </c:if>
+                <c:if test="${behavior.operateObject == 9}">
+                    咨询记录
+                </c:if>
+                <c:if test="${behavior.operateObject == 10}">
+                    分配协销
+                </c:if>
+            </td>
+            <td>${behavior.spName}</td>
+            <td>${behavior.pageType}</td>
+            <td>${behavior.label}</td>
+            <td>
+                <c:if test="${behavior.type == 1}">
+                    共访问了${behavior.number}个页面，<a href="javaScript: void(0)" class="tab_record" onclick="getNewRecord('${behaviorInfo.clubId}', '${behavior.dateTime}')">点击查看详情</a>
+                </c:if>
+                <c:if test="${behavior.type == 2 || behavior.type == 3 || behavior.type == 4}">
+                    <a href="${behavior.pagePath}">${behavior.pagePath}</a>
+                </c:if>
+                <c:if test="${behavior.operateObject == 5}">
+                    <c:if test="${behavior.orderType == 0}">
+                        协销帮下单【子订单Id:
+                        <c:if test="${empty behavior.shopOrderList}">
+                            <a href="${ctx}/shopOrder/detail?id=${behavior.shopOrderId}"> ${behavior.shopOrderId}】</a>
+                        </c:if>
+                        <c:if test="${not empty behavior.shopOrderList}">
+                            <c:forEach var="shopOrderId" items="${behavior.shopOrderList}">
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId}】</a>,
+                            </c:forEach>
+                        </c:if>
+                    </c:if>
+                    <c:if test="${behavior.orderType == 1}">
+                        自主下单【子订单Id:
+                        <c:if test="${empty behavior.shopOrderList}">
+                            <a href="${ctx}/shopOrder/detail?id=${behavior.shopOrderId}"> ${behavior.shopOrderId}】</a>
+                        </c:if>
+                        <c:if test="${not empty behavior.shopOrderList}">
+                            <c:forEach var="shopOrderId" items="${behavior.shopOrderList}">
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId}</a>,
+                            </c:forEach>
+                            】
+                        </c:if>
+                    </c:if>
+                    <c:if test="${behavior.orderType != 0 and behavior.orderType != 1}">
+                        【子订单Id:
+                        <c:if test="${empty behavior.shopOrderList}">
+                            <a href="${ctx}/shopOrder/detail?id=${behavior.shopOrderId}"> ${behavior.shopOrderId}】</a>
+                        </c:if>
+                        <c:if test="${not empty behavior.shopOrderList}">
+                            <c:forEach var="shopOrderId" items="${behavior.shopOrderList}">
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId}</a>,
+                            </c:forEach>
+                            】
+                        </c:if>
+                    </c:if>
+                </c:if>
+                <c:if test="${behavior.operateObject == 6}">
+                    收藏商品【商品: <a href="${fns:getConfig('wwwServer')}product-${behavior.productId}.html">${behavior.productId}-${behavior.productName}</a>】
+                </c:if>
+                <c:if test="${behavior.operateObject == 7}">
+                    加购物车 【商品: <a href="${fns:getConfig('wwwServer')}product-${behavior.productId}.html">${behavior.productId}-${behavior.productName}</a>】
+                </c:if>
+                <c:if test="${behavior.operateObject == 8}">
+                    内容库访问
+                </c:if>
+                <c:if test="${behavior.operateObject == 9}">
+                    协销填写咨询记录，<a href="javaScript: void(0)" class="tab_remark">点击查看详情</a>
+                </c:if>
+                <c:if test="${behavior.operateObject == 10}">
+                    ${behavior.allocation}分配协销【 ${behavior.spName}】
+                </c:if>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+<script type="text/javascript">
+    function page(n,s) {
+        $('#pageNo').val(n);
+        $('#pageSize').val(s);
+        $('#searchForm').submit();
+        return false;
+    }
+    // 日常行为
+    function getNewRecord (clubId, dateTime) {
+        $.get("${ctx}/jump/link", function (data) {
+            link = "https://manager.caimei365.com/#/user/record-list?type=second&clubId=" + clubId + "&startTime="+ dateTime + "&endTime=" + dateTime + "&token=" + data;
+            window.open(link, "_blank");
+        });
+    }
+    // 咨询记录跳转
+    function getNewAdmin(questionMan, spId) {
+        $.get("${ctx}/jump/link", function (data) {
+            link = "https://manager-b.caimei365.com/#/user/consult/unreg-list?questionMan=" + questionMan + "&serviceProviderId=" + spId + "&token=" + data;
+            window.open(link, "_blank");
+        });
+    }
+</script>
+</body>
+</html>

src/main/webapp/WEB-INF/views/modules/userNew/cmSpList.jsp

@@ -32,6 +32,7 @@
 <ul class="nav nav-tabs">
 	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
 	<shiro:hasPermission name="user:newCmClub:edit"><li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li></shiro:hasPermission>
+	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
 	<li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
 	<li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
 </ul>
@@ -72,10 +73,6 @@
 				<th>类型</th>
 				<%--<th>身份</th>--%>
 				<th>创建时间</th>
-				<th>活跃机构</th>
-				<th>不活跃机构</th>
-				<th>活跃机构占比</th>
-				<th>不活跃机构占比</th>
 				<shiro:hasPermission name="user:newCmClub:edit"><th>操作</th></shiro:hasPermission>
 			</tr>
 		</thead>
@@ -104,10 +101,6 @@
 				</td>
 				<%--<td>${newCmSp.spIdentity}</td>--%>
 				<td>${newCmSp.addTime}</td>
-				<td>${newCmSp.livelyClub}</td>
-				<td>${newCmSp.nolivelyClub}</td>
-				<td>${newCmSp.livelyClubProportion}%</td>
-				<td>${newCmSp.nolivelyClubProportion}%</td>
 				<shiro:hasPermission name="user:newCmClub:edit">
 					<td>
 					<c:if test="${newCmSp.status eq 90 || newCmSp.status eq 91}">
@@ -123,9 +116,6 @@
 						<%--<shiro:hasPermission name="user:newCmClub:delete">
 						<a href="${ctx}/new/user/cmSp/cmSpDelete?id=${newCmSp.serviceProviderID}" onclick="return confirmx('确认要删除该协销人员吗？', this.href)">删除</a>
 						</shiro:hasPermission>--%>
-						<c:if test="${newCmSp.status eq 90}">
-						<a href="${ctx}/new/user/cmSp/cmSpLivelyClubFrom?spID=${newCmSp.serviceProviderID}">机构详情</a>
-						</c:if>
 					</c:if>
 					<c:if test="${newCmSp.status eq 1 || newCmSp.status eq 92}">
 						<a href="javascript:void(0);" onclick="audit('${newCmSp.serviceProviderID}','${newCmSp.name}', '${newCmSp.contractMobile}', '${hasManager}')">审核</a>

src/main/webapp/WEB-INF/views/modules/userNew/cmSpLivelyClubFrom.jsp

@@ -98,7 +98,7 @@
 	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubFrom?spID=${spId}">查看详情</a></li>
 </ul>
 
-<ul class="breadcrumb livelyProportion">
+<%--<ul class="breadcrumb livelyProportion">
 	<li>
 		<h4>活跃机构</h4>
 		<br>
@@ -121,7 +121,7 @@
 		<br>
 		<h2>${nolivelyClubProportion}%</h2>
 	</li>
-</ul>
+</ul>--%>
 <form:form id="searchForm" modelAttribute="newCmClub" action="${ctx}/new/user/cmSp/cmSpLivelyClubFrom/" method="post"
 		   class="breadcrumb form-search">
 	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

src/main/webapp/WEB-INF/views/modules/userNew/cmSpLivelyClubList.jsp

@@ -49,17 +49,16 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-	<li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
-	<li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-	<li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
-	<li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-<%--	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
-	<li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
-	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
-	<li><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>
+	<li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
+	<shiro:hasPermission name="user:newCmClub:edit">
+		<li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li>
+	</shiro:hasPermission>
+	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+	<li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
+	<li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
 </ul>
 
-<ul class="breadcrumb livelyProportion" >
+<%--<ul class="breadcrumb livelyProportion" >
 	<li>
 		<h4>活跃机构</h4>
 		<br>
@@ -82,7 +81,7 @@
 		<br>
 		<h2>${nolivelyClubProportion}%</h2>
 	</li>
-</ul>
+</ul>--%>
 <form:form id="searchForm" modelAttribute="newCmSp" action="${ctx}/new/user/cmSp/cmSpLivelyClubList/" method="post"
 		   class="breadcrumb form-search">
 	<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -126,6 +125,7 @@
 			<td>${newCmSp.nolivelyClubProportion}%</td>
 			<td>
 				<a href="${ctx}/new/user/cmSp/cmSpLivelyClubFrom?spID=${newCmSp.serviceProviderID}">查看详情</a>
+				<a href="${ctx}/new/user/agency/getClubBehaviorInfo?spID=${newCmSp.serviceProviderID}&operateObject=2">行为记录</a>
 			</td>
 		</tr>
 	</c:forEach>