Merge remote-tracking branch 'origin/developer' into developer

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

@@ -373,14 +373,14 @@ public class ClubPortraitService {
                     integers.add(record.getNumber());
                     if (StringUtils.isNotBlank(record.getPageLabel())) {
                         labelList = new ArrayList<>();
-                        integers.add(record.getNumbers());
-                        if (record.getPageLabel().contains(",")) {
-                            String[] split = record.getPageLabel().split(",");
-                            labelList.addAll(Arrays.asList(split));
-                            strings.add(StringUtils.strip(labelList.toString(), "[]"));
-                        } else {
-                            strings.add(record.getPageLabel());
+                        String label = record.getPageLabel();
+                        if (label.endsWith(",")) {
+                            label = record.getPageLabel().substring(0, record.getPageLabel().lastIndexOf(","));
+                        }
+                        if (label.startsWith(",")) {
+                            label = record.getPageLabel().substring(record.getPageLabel().indexOf(","));
                         }
+                        strings.add(label);
                     } else {
                         strings.add("未知");
                     }
@@ -464,23 +464,26 @@ public class ClubPortraitService {
             List<CmBehaviorRecord> pageTypeList = cmPortraitDao.selBehaviorPageTypeList(cmPortrait);
             ArrayList<Integer> integers = new ArrayList<>();
             ArrayList<String> strings = new ArrayList<>();
+            Integer number = 0;
             if (pageTypeList.size() != 0) {
                 for (CmBehaviorRecord record : pageTypeList) {
+                    number+=record.getNumbers();
                     if (StringUtils.isNotBlank(record.getPageLabel())) {
                         labelList = new ArrayList<>();
+                        String label = record.getPageLabel();
                         integers.add(record.getNumbers());
-                        if (record.getPageLabel().contains(",")) {
-                            String[] split = record.getPageLabel().split(",");
-                            labelList.addAll(Arrays.asList(split));
-                            strings.add(StringUtils.strip(labelList.toString(), "[]"));
-                        } else {
-                            strings.add(record.getPageLabel());
+                        if (label.endsWith(",")) {
+                            label = record.getPageLabel().substring(0, record.getPageLabel().lastIndexOf(","));
                         }
+                        if (label.startsWith(",")) {
+                            label = record.getPageLabel().substring(record.getPageLabel().indexOf(","));
+                        }
+                        strings.add(label);
                     }
                 }
                 cmPortrait.setPageTypeValue(integers);
                 cmPortrait.setPageType(strings);
-                cmPortrait.setVisitNum(pageTypeList.size());
+                cmPortrait.setVisitNum(number);
             }
         }
         if (!expty) {
@@ -558,12 +561,7 @@ public class ClubPortraitService {
         }
         // 新注册机构
         if (0 == clubSales.getType() || 3 == clubSales.getType()) {
-            if ((0 == clubSales.getDateType() || 1 == clubSales.getDateType()) && expty) {
-                clubSales.setEndTime(dateFormat.format(date));
-            }
-            if (clubSales.getEndTime().equals(endTime)) {
-                clubSales.setEndTime(dateFormat.format(date));
-            }
+
             int spClub = 0, unSpClub = 0;
             ArrayList<OrderPortrait> orderPortraits = new ArrayList<>();
             OrderPortrait orderPortrait = new OrderPortrait();
@@ -728,9 +726,11 @@ public class ClubPortraitService {
             clubSales.setValues(active);
             clubSales.setValues1(unActive);
         }
-        if (!expty && 2 != clubSales.getType()) {
-            clubSales.setStartTime(time1);
-            clubSales.setEndTime(time2);
+        try {
+            clubSales.setStartTime(dateFormat.format(dateFormat.parse(clubSales.getStartTime())));;
+            clubSales.setEndTime(dateFormat.format(dateFormat.parse(clubSales.getEndTime())));;
+        } catch ( Exception e) {
+                e.printStackTrace();
         }
         return clubSales;
     }

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

@@ -1882,6 +1882,7 @@ public class AgencyController extends BaseController {
             } else {
                 map.put("active", active);
             }
+            map.put("clubSales", clubSales);
             map.put("code", 0);
         } catch (Exception e) {
             map.put("code", -1);

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -2563,6 +2563,7 @@
             LEFT JOIN product p ON cop.productID = p.productID
         </if>
         LEFT JOIN user u ON u.userID = cso.userID
+        left join club c on c.clubId = cso.clubId
         <where>
             cso.delFlag = 0
             and co.delflag = 0
@@ -2577,6 +2578,9 @@
             <if test="shopOrderID != null and shopOrderID != ''">
                 AND cso.shopOrderID = #{shopOrderID}
             </if>
+            <if test="clubID != null">
+                and c.clubId = #{clubID}
+            </if>
             <if test="orderNo != null and orderNo != ''">
                 AND cso.orderNo = #{orderNo}
             </if>

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

@@ -170,7 +170,7 @@
                 AND cbr.accessDate <![CDATA[ >= ]]> #{startTime} AND cbr.accessDate <![CDATA[ <= ]]> #{endTime}
             </if>
         </where>
-        GROUP BY cbr.pageType  ORDER BY COUNT(cbr.pageType) LIMIT 10
+        GROUP BY cbr.pageType  ORDER BY COUNT(cbr.pageType)
     </select>
 
     <select id="getServiceInfo" resultType="com.caimei.modules.user.entity.Server">
@@ -266,6 +266,7 @@
             </if>
             AND (clubId IS NULL OR clubId = '')
         </where>
+        GROUP BY id
     </select>
     <select id="getActiveDate" resultType="java.lang.String">
         SELECT

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

@@ -390,8 +390,8 @@
         <th>状态</th>
         <th>审核人</th>
         <th>机构级别</th>
-        <th>活跃状态<span class="acticer_span" onmousemove="activeStageMessage(1)">?</span></th>
-        <th>客户价值<span class="acticer_span" onmousemove="activeStageMessage(2)">?</span></th>
+        <th>活跃状态<span class="acticer_span" onclick="activeStageMessage(1)">?</span></th>
+        <th>客户价值<span class="acticer_span" onclick="activeStageMessage(2)">?</span></th>
         <th>注册IP</th>
         <th>注册时间</th>
         <th>审核时间</th>

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

@@ -231,7 +231,7 @@
                         <%--<span class="right_span">当前范围:<a id="orderScopeNum" href="javascript:void(0);"></a></span>--%>
                     <%--<span>所有:<a class="line" href="${ctx}/order/orderList?buyer=${cmPortrait.clubName}">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if> <c:if test="${empty portrait.orderTotalAmount}">0</c:if>&nbsp;&nbsp;(<c:if test="${!empty portrait.orderTotal}">${portrait.orderTotal}</c:if><c:if test="${empty portrait.orderTotal}">0</c:if>个)</a></span>
 <%--                    <span>购买总额:<a href="javascript: void(0);">￥<c:if test="${!empty portrait.orderTotalAmount}">${portrait.orderTotalAmount}</c:if><c:if test="${empty portrait.orderTotalAmount}">0</c:if></a></span>--%>
-                    <span class="right_span">订单数量:<a id="orderScopeNum" href="javascript:void(0);"></a></span>
+                    <span class="right_span">订单数量:<a id="orderScopeNum" href="javascript: void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="orderTabs">
@@ -268,7 +268,7 @@
                             test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>
                     <span class="right_span">当前范围:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></span>--%>
                     <%--<span>所有:<em><c:if test="${!empty portrait.totalkeywords}">${portrait.totalkeywords}</c:if><c:if test="${empty portrait.totalkeywords}">0</c:if> 条</em></span>--%>
-                    <span class="right_span">关键词数量:<a id="keyWordsScopeNum" href="javascript:void(0);"></a></span>
+                    <span class="right_span">关键词数量:<a id="keyWordsScopeNum" href="javascript:void(0);" style="text-decoration: auto;"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="keyWordTabs">
@@ -308,7 +308,7 @@
                             test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
                     <span class="right_span">当前范围:<a id="remarksScopeNum" href="javascript:void(0);"></a></span>
                     <<%--span>所有:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>--%>
-                    <span class="right_span">咨询数量:<a id="remarksScopeNum" href="javascript:void(0);"></a></span>
+                    <span class="right_span">咨询数量:<a id="remarksScopeNum" class="visits" href="javascript:void(0);"></a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="serviceTabs">
@@ -384,26 +384,35 @@
 <script type="text/javascript" src="${ctxStatic}/modules/cmClubPortrait/cmClubPortrait.js"></script>
 <script>
     var clubId =  $('#clubId').val();
-    // 前往新后台
+
+    $('#orderScopeNum').click(function () {
+        const clubId = $('#clubId').val();
+        const buyer = "${cmPortrait.clubName}";
+        const startTime = $('#orderTimeStart').val();
+        const endTime = $('#orderTimeEnd').val()
+        window.location.href = "${ctx}/order/orderList?clubId=" + clubId+ "&buyer=" + buyer + "&startTime="+ startTime + "&endTime="+endTime;
+
+    })
+    // 前往新后台   访问记录
     $('#visitNum').click(function () {
         var link = "";
         var startTime = $('#visitTimeStart').val()
         var endTime = $('#visitTimeEnd').val()
         var name = "${statistics.name}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager.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 + "&clubId=" + clubId + "&startTime=" + startTime + "&endTime=" + endTime + "&token=" + data;
             window.open(link, "_blank");
         });
     })
-
-    $('#visits').click(function () {
+    // 咨询记录
+    $('.visits').click(function () {
         <%--var link = "";--%>
-        <%--var startTime = $('#serviceTimeStart').val()--%>
-        <%--var endTime = $('#serviceTimeEnd').val()--%>
+        var startTime = $('#serviceTimeStart').val()
+        var endTime = $('#serviceTimeEnd').val()
         <%--var name = "${statistics.name}"--%>
         var clubId = "${cmPortrait.clubID}"
         $.get("${ctx}/jump/link", function (data) {
-            link = "https://manager.caimei365.com/#/user/consult/list?clubId=" + clubId + "&token=" + data;
+            link = "https://manager.caimei365.com/#/user/consult/list?clubId=" + clubId + "&startTime=" + startTime + "&endTime=" + endTime + "&token=" + data;
             window.open(link, "_blank");
         });
     })

src/main/webapp/static/modules/cmClubPortrait/cmClubPortrait.css

@@ -195,6 +195,9 @@
 .flex-box .box-title span a.line{
     /*text-decoration: underline;*/
 }
+a {
+    text-decoration: underline;
+}
 .flex-box .box-tabmain{
     width: 100%;
     height: 40px;
@@ -259,7 +262,7 @@
 }
 .right_span {
     width: 300px;
-    float: right;
+    float: left;
     margin-left: 0px;
 }
 .flex-box .box-eachts{

src/main/webapp/static/modules/cmClubSales/cmClubSalesEachs.js

@@ -138,8 +138,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.newClub){
                             $('#clubEchartsNone').show();
                             $('#clubEcharts').hide();
-                            $('#clubEndTime').val(data.newClub.endTime);
-                            $('#clubStartTime').val(data.newClub.startTime);
+                            $('#clubEndTime').val(data.clubSales.endTime);
+                            $('#clubStartTime').val(data.clubSales.startTime);
                             $('#newClubScopeNum').text('0个');
                         }else{
                             setClubData(type,data)
@@ -149,8 +149,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.remarks){
                             $('#clubRemarkEacthsNone').show();
                             $('#clubRemarkEacths').hide();
-                            $('#remarkEndTime').val(data.remarks.endTime);
-                            $('#remarkStartTime').val(data.remarks.startTime);
+                            $('#remarkEndTime').val(data.clubSales.endTime);
+                            $('#remarkStartTime').val(data.clubSales.startTime);
                             $('#clubRemarkScopeNum').text('0个');
                         }else{
                             getClubRemarkData(type,data)
@@ -160,8 +160,8 @@ const  getClubSalesEacthsData = function (type,dateType) {
                         if(!data.active){
                             $('#clubActiveEacthsNone').show();
                             $('#clubActiveEacths').hide();
-                            $('#clubActiveEndTime').val(data.active.endTime);
-                            $('#clubActiveStartTime').val(data.active.startTime);
+                            $('#clubActiveEndTime').val(data.clubSales.endTime);
+                            $('#clubActiveStartTime').val(data.clubSales.startTime);
                         }else{
                             setClubActiveData(type,data)
                         }
@@ -184,8 +184,8 @@ const setClubData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubEcharts').show();
                 $('#clubEchartsNone').hide();
-                $('#clubEndTime').val(data.newClub.endTime);
-                $('#clubStartTime').val(data.newClub.startTime);
+                $('#clubEndTime').val(data.clubSales.endTime);
+                $('#clubStartTime').val(data.clubSales.startTime);
                 $('#newClubScopeNum').text(`${data.newClub.total}个`);
             },
             id:'clubEcharts',
@@ -206,8 +206,8 @@ const getClubRemarkData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubRemarkEacths').show();
                 $('#clubRemarkEacthsNone').hide();
-                $('#remarkEndTime').val(data.remarks.endTime);
-                $('#remarkStartTime').val(data.remarks.startTime);
+                $('#remarkEndTime').val(data.clubSales.endTime);
+                $('#remarkStartTime').val(data.clubSales.startTime);
                 $('#clubRemarkScopeNum').text(`${data.remarks.total}个`);
             },
             id:'clubRemarkEacths',
@@ -233,8 +233,8 @@ const setClubActiveData = function (type,data) {
                 $('.eachts-total').show();
                 $('#clubActiveEacths').show();
                 $('#clubActiveEacthsNone').hide();
-                $('#clubActiveEndTime').val(data.active.endTime);
-                $('#clubActiveStartTime').val(data.active.startTime);
+                $('#clubActiveEndTime').val(data.clubSales.endTime);
+                $('#clubActiveStartTime').val(data.clubSales.startTime);
             },
             id:'clubActiveEacths',
             name:{