用户行为优化1.0.5

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

@@ -55,7 +55,7 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     private String spLinkMan;    //协销联系人名称
     private String questionMan;    //咨询人
     private String mobileOrWeChat;    //手机号/微信号
-    private String visAddTime;    //手机号/微信号
+    private String visAddTime;    //潜在客户添加时间
 
     public Integer getUserID() {
         return userID;

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

@@ -346,6 +346,13 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         if(!"2".equals(activeClub.getActiveStatus())) {
             activeClubInfo = newCmClubDao.getActiveClubInfo(activeClub);
         } else {
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Calendar instance = Calendar.getInstance();
+            instance.setTime(new Date());
+            instance.add(Calendar.MONTH, -6);
+            Date time = instance.getTime();
+            String format = dateFormat.format(time);
+            activeClub.setVisAddTime(format);
             activeClubInfo = newCmClubDao.getTouristClubInfo(activeClub);
         }
         page.setList(activeClubInfo);

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

@@ -1563,7 +1563,7 @@
         FROM cm_visitor_remarks cvr
                  LEFT JOIN serviceprovider s ON s.serviceProviderID = cvr.serviceProviderId
         <where>
-            cvr.clubId IS NULL OR cvr.clubId = ''
+            cvr.clubId IS NULL OR cvr.clubId = '' and cvr.addTime <![CDATA[ >= ]]> #{visAddTime}
             <if test="recentlyStartTime != null and recentlyStartTime != ''">
                 AND cvr.addTime <![CDATA[ >= ]]> #{recentlyStartTime}
             </if>
@@ -1571,7 +1571,12 @@
                 AND cvr.addTime <![CDATA[ <= ]]> #{recentlyEndTime}
             </if>
         </where>
-        order by cvr.addTime
+        <if test="orderByType == null or orderByType == 1">
+            ORDER BY cvr.addTime DESC
+        </if>
+        <if test="orderByType == 2">
+            ORDER BY cvr.addTime asc
+        </if>
     </select>
 
     <select id="getBehaviorInfo" resultType="com.caimei.modules.user.entity.CmBehaviorInfo">
@@ -1603,6 +1608,12 @@
             <if test="operateObject != null">
                 and cbi.operateObject = #{operateObject}
             </if>
+            <if test="clubId != null">
+                and c.clubId = #{clubId}
+            </if>
+            <if test="spId != null">
+                and s.serviceProviderID = #{spId}
+            </if>
             <if test="spName != null and spName != ''">
                 and s.name like concat('%', #{spName}, '%')
             </if>

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

@@ -174,7 +174,7 @@
 <div>
     <ul id="activeClub">
         <li class="icon-activeClub" value="0">活跃机构</li>
-        <li class="icon-ubActiveClub" value="1">不活跃机构</li>
+        <li class="icon-unActiveClub" value="1">不活跃机构</li>
         <li class="icon-tourist" value="2">咨询游客</li>
     </ul>
 </div>
@@ -207,7 +207,13 @@
             <th>咨询人</th>
             <th>手机号/微信号</th>
             <th>协销</th>
-            <th>最近咨询时间</th>
+            <th class="th-sort">
+                最近咨询时间
+                <div class="sort sort-button" id="sort-button2">
+                    <a href="${ctx}/new/user/agency/findActiveClubInfo?activeStatus=2&orderByType=1" class="icon icon-up"></a>
+                    <a href="${ctx}/new/user/agency/findActiveClubInfo?activeStatus=2&orderByType=2" class="icon icon-down"></a>
+                </div>
+            </th>
         </c:if>
         <th>操作</th>
     </tr>
@@ -362,17 +368,17 @@
         if (activeStatus === 0) {
             // 活跃机构
             $('.icon-activeClub').attr("class", "redAddClass");
-            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-unActiveClub").removeClass("redAddClass");
             $(".icon-tourist").removeClass("redAddClass");
         } else if (activeStatus === 1){
             // 不活跃机构
-            $('.icon-ubActiveClub').attr("class", "redAddClass");
+            $('.icon-unActiveClub').attr("class", "redAddClass");
             $(".icon-activeClub").removeClass("redAddClass");
             $(".icon-tourist").removeClass("redAddClass");
         } else {
             // 咨询游客
             $('.icon-tourist').attr("class", "redAddClass");
-            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-unActiveClub").removeClass("redAddClass");
             $(".icon-activeClub").removeClass("redAddClass");
         }
         $('#searchForm').submit();
@@ -446,17 +452,17 @@
         if (activeStatus === 0) {
             // 活跃机构
             $('.icon-activeClub').attr("class", "redAddClass")
-            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-unActiveClub").removeClass("redAddClass");
             $(".icon-tourist").removeClass("redAddClass");
         } else if (activeStatus === 1){
             // 不活跃机构
-            $('.icon-ubActiveClub').attr("class", "redAddClass");
+            $('.icon-unActiveClub').attr("class", "redAddClass");
             $(".icon-activeClub").removeClass("redAddClass");
             $(".icon-tourist").removeClass("redAddClass");
         } else {
             // 咨询游客
             $('.icon-tourist').attr("class", "redAddClass");
-            $(".icon-ubActiveClub").removeClass("redAddClass");
+            $(".icon-unActiveClub").removeClass("redAddClass");
             $(".icon-activeClub").removeClass("redAddClass");
         }
         const typeMap = {
@@ -467,21 +473,33 @@
             2: {
                 val: $("#activeStatus").val() ? $("#activeStatus").val() * 1 : null,
                 dom: $('#activeClub')
+            },
+            3: {
+                val: $("#orderByType").val() ? $("#orderByType").val() * 1 : null,
+                dom: $('#sort-button2')
             }
         }
         const setActiveFn = function (type,num){
-            if( type === 0){
+            if( type === 1 ){
                 typeMap[num].dom.find('.icon-up').addClass('active');
             }else{
                 typeMap[num].dom.find('.icon-down').addClass('active');
             }
         }
         const setActiveClub = function (type,num){
-            if( type === 0){
-                console.log('***************');
-                typeMap[num].dom.find('.icon-activeClub').addClass('active').addClass('redAddClss');
-            }else{
-                typeMap[num].dom.find('.icon-unActiveClub').addClass('active').addClass('redAddClss');
+            if( type === 0 ) {
+                typeMap[num].dom.find('.icon-activeClub').addClass('active').addClass('redAddClass');
+            } else if ( type === 1 ) {
+                typeMap[num].dom.find('.icon-unActiveClub').addClass('active').addClass('redAddClass');
+            } else {
+                typeMap[num].dom.find('.icon-tourist').addClass('active').addClass('redAddClass');
+            }
+        }
+        const setTouristFn = function (type, num) {
+            if ( type === 1 ) {
+                typeMap[num].dom.find('.icon-up').addClass('active');
+            } else {
+                typeMap[num].dom.find('.icon-down').addClass('active');
             }
         }
         // 最近访问时间 1 降序  2 升序
@@ -492,6 +510,10 @@
         if(typeMap[2].val || typeMap[2].val === 0) {
             setActiveClub(typeMap[2].val,2)
         }
+        // 最近咨询时间 1 降序  2 升序
+        if(typeMap[3].val || typeMap[3].val === 0) {
+            setTouristFn(typeMap[3].val,3)
+        }
         $('#btnSubmit').click(function () {
             $('#searchForm').submit();
         })

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

@@ -14,16 +14,17 @@
 <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>
+    <li class="active"><a href="${ctx}/new/user/agency/getClubBehaviorInfo?clubId=${behaviorInfo.clubId}&clubName=${behaviorInfo.clubName}&spId=${behaviorInfo.spId}&spName=${behaviorInfo.spName}&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.clubName}"/>
-    <input id="userID" name="payTotalMonthType" type="hidden" value="${behaviorInfo.spId}"/>
-    <input id="userID" name="payTotalMonthType" type="hidden" value="${behaviorInfo.operateObject}"/>
+    <input id="clubId" name="clubId" type="hidden" value="${behaviorInfo.clubId}"/>
+    <input id="clubName" name="clubName" type="hidden" value="${behaviorInfo.clubName}"/>
+    <input id="spId" name="spId" type="hidden" value="${behaviorInfo.spId}"/>
+    <input id="spName" name="spName" type="hidden" value="${behaviorInfo.spName}"/>
+    <input id="operateObject" name="operateObject" type="hidden" value="${behaviorInfo.operateObject}"/>
     <div class="flex-wrap">
         <div id="items" class="flex-wrap">
             <c:if test="${behaviorInfo.operateObject == 1}">
@@ -82,9 +83,7 @@
 </form:form>
 <sys:message content="${message}"/>
 <div>
-    <ul id="activeClub">
-        <li>${behaviorInfo.operateObject == 1 ? "机构": "协销"} : ${behaviorInfo.operateObject == 1 ? behaviorInfo.clubName : behaviorInfo.spName}</li>
-    </ul>
+    <span style="font-size: 17px">${behaviorInfo.operateObject == 1 ? "机构": "协销"} : ${behaviorInfo.operateObject == 1 ? behaviorInfo.clubName : behaviorInfo.spName}</span>
 </div>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
@@ -174,7 +173,7 @@
                         </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>,
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId}】,</a>
                             </c:forEach>
                         </c:if>
                     </c:if>
@@ -185,7 +184,7 @@
                         </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>,
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId},</a>
                             </c:forEach>
                             】
                         </c:if>
@@ -197,7 +196,7 @@
                         </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>,
+                                <a href="${ctx}/shopOrder/detail?id=${shopOrderId}"> ${shopOrderId},</a>
                             </c:forEach>
                             】
                         </c:if>

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

@@ -125,7 +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}&spName=${newCmSp.linkMan}&operateObject=2">行为记录</a>
+				<a href="${ctx}/new/user/agency/getClubBehaviorInfo?spId=${newCmSp.serviceProviderID}&spName=${newCmSp.linkMan}&operateObject=2">行为记录</a>
 			</td>
 		</tr>
 	</c:forEach>