用户行为优化1.0.2

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

@@ -533,8 +533,8 @@ public class ClubPortraitService {
             time2 = clubSales.getEndTime();
         }
         try {
-            clubSales.setStartTime(clubSales.getStartTime() + "00:00:00");
-            clubSales.setEndTime(clubSales.getEndTime() + "23:59:59");
+            clubSales.setStartTime(clubSales.getStartTime() + " 00:00:00");
+            clubSales.setEndTime(clubSales.getEndTime() + " 23:59:59");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -710,11 +710,8 @@ public class ClubPortraitService {
             clubSales.setValues(active);
             clubSales.setValues1(unActive);
         }
-        if (!expty) {
+        if (!expty && 2 != clubSales.getType()) {
             clubSales.setStartTime(time1);
-            if ((0 == clubSales.getDateType() || 1 == clubSales.getDateType()) && ObjectUtils.isEmpty(clubSales.getStartTime())) {
-                clubSales.setStartTime(time1);
-            }
             clubSales.setEndTime(time2);
         }
         return clubSales;

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

@@ -1875,8 +1875,8 @@ public class AgencyController extends BaseController {
             active.setName(clubSales.getNames());
             active.setValue(clubSales.getValues());
             active.setValue1(clubSales.getValues1());
-            remarks.setStartTime(clubSales.getStartTime());
-            remarks.setEndTime(clubSales.getEndTime());
+            active.setStartTime(clubSales.getStartTime());
+            active.setEndTime(clubSales.getEndTime());
             if (null == active.getName()) {
                 map.put("active", null);
             } else {

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

@@ -930,22 +930,25 @@
     }
     function goNewBack (type, addTime, userIdentity, name, linkMan) {
         // 跳转到新后台查询数据 type: 1 访问记录 2：咨询记录
-        var date = new Date();
+        const date = getZeroTimeToday();
+        console.log(date)
+        const addDateTime = stringToDate(addTime.toString());
+        console.log('addDateTime----', addDateTime);
         if (type === 1) {
             // 若是今天以前注册的机构，点击访问记录，跳转到新后台【用户行为记录】-【过往数据】页面，
             // 页面展示以公司名称（个人机构以联系人当公司名称）筛选后的结果；
             // 若是今天注册的机构，点击访问记录，跳转到新后台【用户行为记录】-【今日数据】页面，
             // 页面展示以公司名称（个人机构以联系人当公司名称）筛选后的结果。
-            if (addTime < date) {
+            if (addDateTime < date) {
                 // 过往数据
                 if (userIdentity === 4) {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager-b.caimei365.com/#/user/record-list?type=second&corporateName="+linkMan+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+linkMan+"&token=" + data;
                         window.open(link, "_blank");
                     });
                 } else {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager-b.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&token=" + data;
                         window.open(link, "_blank");
                     });
                 }
@@ -953,12 +956,12 @@
                 // 今日数据
                 if (userIdentity === 4) {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager-b.caimei365.com/#/user/record-list?type=first&corporateName="+linkMan+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName="+linkMan+"&token=" + data;
                         window.open(link, "_blank");
                     });
                 } else {
                     $.get("${ctx}/jump/link", function (data) {
-                        link = "https://manager-b.caimei365.com/#/user/record-list?type=first&corporateName="+name+"&token=" + data;
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName="+name+"&token=" + data;
                         window.open(link, "_blank");
                     });
                 }
@@ -968,18 +971,27 @@
             // 点击咨询记录，跳转到新后台【用户咨询记录汇总】页面，页面展示以机构名称筛选后的结果
             if (userIdentity === 4) {
                 $.get("${ctx}/jump/link", function (data) {
-                    link = "https://manager-b.caimei365.com/#/user/consult/list?clubName="+linkMan+"&token=" + data;
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName="+linkMan+"&token=" + data;
                     window.open(link, "_blank");
                 });
             } else {
                 $.get("${ctx}/jump/link", function (data) {
-                    link = "https://manager-b.caimei365.com/#/user/consult/list?clubName="+name+"&token=" + data;
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName="+name+"&token=" + data;
                     window.open(link, "_blank");
                 });
             }
 
         }
     }
+    function stringToDate(dateString) {
+        const parts = dateString.split(/[- :]/);
+        return new Date(parts[0], parts[1] - 1, parts[2], parts[3], parts[4], parts[5]);
+    }
+    // 当天0点0分时间
+    function getZeroTimeToday() {
+        const today = new Date();
+        return new Date(today.getFullYear(), today.getMonth(), today.getDate());
+    }
 </script>
 </body>
 </html>

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

@@ -368,7 +368,7 @@
         var endTime = $('#visitTimeEnd').val()
         var name = "${statistics.name}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager-b.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime="+startTime+"&endTime="+endTime+"&token=" + data;
+            link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime="+startTime+"&endTime="+endTime+"&token=" + data;
             window.open(link, "_blank");
         });
     })
@@ -377,7 +377,7 @@
         var link = "";
         var name = "${statistics.name}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager-b.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime=&endTime="+"&token=" + data;
+            link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName="+name+"&startTime=&endTime="+"&token=" + data;
             window.open(link, "_blank");
         });
     })