用户行为优化1.0.5

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

@@ -357,8 +357,12 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         cmBehaviorInfo.setPage(page);
         List<CmBehaviorInfo> behaviorInfo = newCmClubDao.getBehaviorInfo(cmBehaviorInfo);
         behaviorInfo.forEach(behavior -> {
-            behavior.setDateTime(dateFormat.format(behavior.getAddTime()));
-            if (behavior.getShopOrderId().contains(",")) {
+            try {
+                behavior.setDateTime(dateFormat.format(dateFormat.parse(behavior.getAddTime())));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            if (StringUtils.isNotBlank(behavior.getShopOrderId()) && behavior.getShopOrderId().contains(",")) {
                 String[] split = behavior.getShopOrderId().split(",");
                 List<String> shopOrderIdList = Arrays.asList(split);
                 behavior.setShopOrderIdList(shopOrderIdList);

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

@@ -1592,7 +1592,7 @@
             (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,
+            (SELECT COUNT(recordId) FROM cm_behavior_record WHERE userId = c.userId AND accessDate = cbi.dateTime) AS number,
             p.name AS productName
         FROM cm_behavior_info cbi
                  LEFT JOIN club c ON c.clubId = cbi.clubId

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

@@ -331,7 +331,7 @@
             <td>
                 <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>
+                    <a href="${ctx}/new/user/agency/getClubBehaviorInfo?clubId=${clubList.clubID}&clubName=${clubList.name}&operateObject=1">行为记录</a>
                 </c:if>
                 <c:if test="${2 == activeClub.activeStatus}">
                     <a href="javaScript: void(0)" class="tab_remark" onclick="getNewAdmin('${clubList.questionMan}', '${clubList.spId}')">咨询记录</a>

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

@@ -21,6 +21,7 @@
     <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}"/>
     <div class="flex-wrap">
@@ -74,7 +75,7 @@
                             onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             </div>
             <div class="item">
-                <input id="btnSubmit" class="btn btn-primary" type="button" value="查询"/>
+                <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
             </div>
         </div>
     </div>

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