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

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

@@ -4,6 +4,7 @@ import com.caimei.modules.user.entity.CmBehaviorRecord;
 import com.caimei.modules.user.entity.CmPageType;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -51,4 +52,6 @@ public interface CmBehaviorRecordDao extends CrudDao<CmBehaviorRecord> {
 
 
     List<CmBehaviorRecord> behaviorAgency(CmBehaviorRecord cmBehaviorRecord);
+
+    List<CmBehaviorRecord> selRegion(@Param("IP") String IP, @Param("pageType") String pageType, @Param("accessTime") String accessTime);
 }

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

@@ -38,25 +38,7 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
 
 
     public Page<CmBehaviorRecord> findPageList(Page<CmBehaviorRecord> page, CmBehaviorRecord cmBehaviorRecord) {
-        cmBehaviorRecord.setPage(page);
-        List<CmBehaviorRecord> list = behaviorList(cmBehaviorRecord);
-        int pageNo = page.getPageNo();
-        int pageSize = page.getPageSize();
-        int number = 0;
-        if (pageNo == 1) {
-            number = 0;
-        } else {
-            number = (pageNo - 1) * pageSize;
-        }
-        List<CmBehaviorRecord> behaviorList = new ArrayList<>();
-        for (int i = 0; i <= list.size()-1 ; i++) {
-            if (i >= number && i < number+pageSize) {
-                behaviorList.add(list.get(i));
-            }
-        }
-        page.setCount(list.size());
-        page.setList(behaviorList);
-        return page;
+        return super.findPage(page,cmBehaviorRecord);
     }
 
     public List<CmBehaviorRecord> behaviorList(CmBehaviorRecord cmBehaviorRecord) {
@@ -86,8 +68,13 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
                 list.addAll(listData);
             } else {
                 listData = cmBehaviorRecordDao.findListBefore(cmBehaviorRecord);
+                Double doubles = 0.0;
                 if (listData.size() != 0) {
                     CmBehaviorRecord behaviorRecord = listData.get(0);
+                    for (CmBehaviorRecord recordList: listData) {
+                        doubles += Double.parseDouble(recordList.getAccessDuration());
+                    }
+                    behaviorRecord.setAccessDuration(doubles.toString());
                     listDataMerge.add(behaviorRecord);
                     listData = listDataMerge;
                 }
@@ -105,7 +92,7 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
      */
     public Page<CmBehaviorRecord> recordPage(Page<CmBehaviorRecord> page, CmBehaviorRecord cmBehaviorRecord){
         cmBehaviorRecord.setPage(page);
-        Integer userID = cmBehaviorRecord.getUserID();
+        /*Integer userID = cmBehaviorRecord.getUserID();
         // 每天访问用户数
         CmBehaviorRecord cmRecord = new CmBehaviorRecord();
         cmRecord.setIP(cmBehaviorRecord.getIP());
@@ -123,10 +110,10 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
             if (!cmBehaviorRecord.getAccessDate().equals(format)) {
                 cmBehaviorRecord.setUserID(null);
             }
-        }
+        }*/
         // 用户行为详情
         List<CmBehaviorRecord> cmBehaviorRecordList = cmBehaviorRecordDao.recordList(cmBehaviorRecord);
-        cmBehaviorRecord.setUserID(userID);
+        //cmBehaviorRecord.setUserID(userID);
         for(CmBehaviorRecord record: cmBehaviorRecordList) {
             record.setProductImage(AppUtils.getImageURL("product", record.getProductImage(), 0, ""));
             String time = calculationTime(record.getAccessDuration());
@@ -138,6 +125,19 @@ public class CmBehaviorRecordService extends CrudService<CmBehaviorRecordDao, Cm
                 e.printStackTrace();
             }
             record.setPagePath(decode);
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+            String s = null;
+            try {
+                s = simpleDateFormat.format(simpleDateFormat.parse(record.getAccessTime()));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            List<CmBehaviorRecord> region = cmBehaviorRecordDao.selRegion(record.getIP(), record.getPageType(), s);
+            if (region.size() != 0) {
+                for (CmBehaviorRecord behaviorRecord : region) {
+                    record.setAccessSource(behaviorRecord.getAccessSource());
+                }
+            }
         }
         page.setList(cmBehaviorRecordList);
         return page;

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

@@ -1035,7 +1035,8 @@
           AND co.organizeID = 0
           AND co.orderType != 2
           AND co.refundType != 2
-          AND p.splitCode != 'E1807059160'
+          -- AND p.splitCode != 'E1807059160'
+          AND co.orderID NOT IN (SELECT orderID FROM cm_order_product cops LEFT JOIN product ps ON cops.productID = ps.productID WHERE ps.splitCode = 'E1807059160' AND cops.orderID = cop.orderID)
     </select>
 
     <select id="getOnlineBalance" resultType="com.caimei.modules.order.entity.OrderReceiptRelationPo">

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

@@ -1147,7 +1147,8 @@
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0
           AND a.receiptStatus=3
-          AND p.splitCode != 'E1807059160'
+          -- AND p.splitCode != 'E1807059160'
+          AND co.orderID NOT IN (SELECT orderID FROM cm_order_product cops LEFT JOIN product ps ON cops.productID = ps.productID WHERE ps.splitCode = 'E1807059160' AND cops.orderID = cop.orderID)
           AND co.orderID NOT IN (
             SELECT orderID
             FROM cm_order_product
@@ -1291,7 +1292,8 @@
           AND cror.delFlag = 0
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 1
-          AND p.splitCode != 'E1807059160'
+          -- AND p.splitCode != 'E1807059160'
+          AND co.orderID NOT IN (SELECT orderID FROM cm_order_product cops LEFT JOIN product ps ON cops.productID = ps.productID WHERE ps.splitCode = 'E1807059160' AND cops.orderID = cop.orderID)
         <if test="startTime != null and startTime != ''">
             AND (a.orderTime &gt; #{startTime} OR a.orderTime = #{startTime})
         </if>

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

@@ -27,6 +27,7 @@
           s.contractMobile AS scontractMobile,
           c.clubID as clubID,
           s.shopID as shopID,
+          b.accessClient,
           max(b.region) as region,
           max(accessTime) AS lastAccessTime,
           (SELECT CASE STATUS WHEN 91 THEN '采美默认协销经理(官方账号)' ELSE linkMan END FROM serviceprovider WHERE serviceProviderID = c.spID) AS spName,
@@ -37,7 +38,7 @@
         LEFT JOIN shop s ON b.userID = s.userID
         LEFT JOIN serviceprovider sp on c.spID = sp.serviceProviderID
         <where>
-            b.IP != '106.55.202.118' AND b.accessDate = #{accessDate}
+            b.IP != '106.55.202.118' AND b.delFlag = 0
             <if test="behaviorType == 2">
                 AND b.behaviorType = #{behaviorType}
             </if>
@@ -45,7 +46,7 @@
                 AND b.IP = #{IP}
             </if>
             <if test="name != null and name != ''">
-                AND c.name = #{name} or s.name = #{name}
+                AND (c.name like concat('%',#{name},'%')  or s.name like concat ('%',#{name},'%'))
             </if>
             <if test="userIdentity != null and userIdentity != ''">
                 <if test="userIdentity == 2">
@@ -161,7 +162,7 @@
         LEFT JOIN product p ON b.productID = p.productID
         LEFT JOIN cm_page_type pt ON b.pageType = pt.id
         <where>
-             b.accessDate = #{accessDate}  AND b.IP != '106.55.202.118'
+             b.accessDate = #{accessDate}  AND b.IP != '106.55.202.118' AND b.delFlag = 0
             <if test="behaviorType == 2">
                 AND behaviorType = #{behaviorType}
             </if>
@@ -278,4 +279,7 @@
         GROUP BY b.pageLabel
         ORDER BY accessTime DESC
     </select>
+    <select id="selRegion" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
+        SELECT * FROM cm_behavior_record_ref WHERE IP = #{IP} AND pageType = #{pageType} AND accessTime like concat('%', #{accessTime} ,'%')
+    </select>
 </mapper>

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

@@ -235,18 +235,16 @@
                     <label class="control-label"><b>地址：</b></label>
                     <div class="controls">
                         <form:select path="provinceID" class="input-xlarge" id="province"
-                                     onchange="loadCity()" style="width:100px;">
+                                     onchange="loadCity()" disabled="true" style="width:100px;">
                             <form:option value="" label="省" provinceId=""/>
                         </form:select>
-                        <form:select path="cityID" class="input-xlarge" id="city" onchange="loadTown()"
+                        <form:select path="cityID" class="input-xlarge" id="city" onchange="loadTown()" disabled="true"
                                      style="width:100px;">
                             <form:option value="" label="市" cityId=""/>
                         </form:select>
-                        <form:select path="townID" class="input-xlarge" id="town" style="width:100px;">
+                        <form:select path="townID" class="input-xlarge" id="town" disabled="true" style="width:100px;">
                             <form:option value="" label="区"/>
                         </form:select>
-                        <%--<form:input path="address" id="address" name="address" class="input-xlarge userAddress" width="20px" maxlength="60"
-                                    placeholder="请填写会所详细的地址"/>--%>
                         ${newCmClub.address}
                     </div>
                 </div>
@@ -265,23 +263,12 @@
                 <div class="control-group">
                     <label class="control-label"><b>营业执照：</b></label>
                     <img width="100" height="100" src="${newCmClub.businessLicenseImage}">
-                    <%--<div class="controls">
-                        <form:hidden id="businessLicenseImage" name="businessLicenseImage" path="businessLicenseImage" htmlEscape="false"
-                                     maxlength="255" class="input-xlarge required"/>
-                        <sys:ckfinder input="businessLicenseImage" type="images" uploadPath="/photo"
-                                      selectMultiple="false" maxWidth="100" maxHeight="100"/>
-                    </div>--%>
                 </div>
             </td>
             <td>
                 <div class="control-group">
                     <label class="control-label"><b>门头照：</b></label>
                     <img width="100" height="100" src="${newCmClub.headpic}">
-                    <%--<div class="controls">
-                        <form:hidden id="headpic" name="headpic" path="headpic" htmlEscape="false" maxlength="255"
-                                     class="input-xlarge"/>
-                        <sys:ckfinder input="headpic" type="images" uploadPath="/photo" maxWidth="100" maxHeight="100"/>
-                    </div>--%>
                 </div>
             </td>
         </tr>
@@ -305,67 +292,11 @@
                             <c:if test="${cmClubinfo.secondClubType eq '5'}"> - 美容院</c:if>
                             <c:if test="${cmClubinfo.secondClubType eq '6'}"> - 养生馆</c:if>
                             <c:if test="${cmClubinfo.secondClubType eq '7'}"> - 其他</c:if>
-<%--                            <input name="firstClubType" value="1" type="radio" ${cmClubinfo.firstClubType == "1" ? "checked" : ""}/>医美--%>
                         </div>
-                        <%--<div class="raw-beauty">
-                            <input name="firstClubType" value="2" type="radio" ${cmClubinfo.firstClubType == "2" ? "checked" : ""}/>生美
-                        </div>
-                        <div class="raw-beauty">
-                            <input name="firstClubType" value="3" type="radio" ${cmClubinfo.firstClubType == "3" ? "checked" : ""}/>项目公司
-                        </div>
-                        <div class="raw-beauty">
-                            <input name="firstClubType" value="4" type="radio" ${cmClubinfo.firstClubType == "4" ? "checked" : ""}/>个人
-                        </div>
-                        <div class="raw-beauty">
-                            <input name="firstClubType" value="5" type="radio" ${cmClubinfo.firstClubType == "5" ? "checked" : ""}/>其他
-                        </div>--%>
                     </div>
-                    <span class="err-tip"></span>
-                    <div class="med-option the-oradio" style="display: none" id="ejf">
-                        <div class="med-beauty">
-                            <%--<c:if test="${cmClubinfo.secondClubType eq '1'}">-诊所</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '2'}">-门诊</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '3'}">-医院</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '4'}">-其他</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '5'}">-美容院</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '6'}">-养生馆</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '7'}">-其他</c:if>--%>
-<%--                            <input name="secondClubType" value="1"--%>
-<%--                                                       type="radio"  ${cmClubinfo.secondClubType == "1" ? "checked" : ""}/>诊所--%>
-                        </div>
-                        <%--<div class="med-beauty"><input name="secondClubType" value="2"
-                                                       type="radio"  ${cmClubinfo.secondClubType == "2" ? "checked" : ""}/>门诊
-                        </div>
-                        <div class="med-beauty"><input name="secondClubType" value="3"
-                                                       type="radio" ${cmClubinfo.secondClubType == "3" ? "checked" : ""}/>医院
-                        </div>
-                        <div class="med-beauty"><input name="secondClubType" value="4"
-                                                       type="radio" ${cmClubinfo.secondClubType == "4" ? "checked" : ""}/>其他
-                        </div>
-                        <span class="err-tip"></span>--%>
-                    </div>
-                    <%--<div class="raw-option the-oradio" style="display: none" id="ej">
-                        <div class="med-beauty"><input name="secondClubType" value="5"
-                                                       type="radio"  ${cmClubinfo.secondClubType == "5" ? "checked" : ""}/>美容院
-                        </div>
-                        <div class="med-beauty"><input name="secondClubType" value="6"
-                                                       type="radio"  ${cmClubinfo.secondClubType == "6" ? "checked" : ""}/>养生馆
-                        </div>
-                        <div class="med-beauty"><input name="secondClubType" value="7"
-                                                       type="radio" ${cmClubinfo.secondClubType == "7" ? "checked" : ""}/>其他
-                        </div>
-                        <span class="err-tip"></span>
-                    </div>--%>
                     <div class="qualification control-group" style="display: none">
                         <label class="control-label"><b>医疗许可证：</b></label>
                         <img width="100" height="100" src="${cmClubinfo.medicalPracticeLicenseImg}">
-                        <%--<div class="controls" style="margin-bottom: 10px">
-                            <form:hidden id="medicalPracticeLicenseImg" path="medicalPracticeLicenseImg"
-                                         htmlEscape="false" maxlength="255"
-                                         class="input-xlarge"/>
-                            <sys:ckfinder input="medicalPracticeLicenseImg" type="images" uploadPath="/photo"
-                                          maxWidth="100" maxHeight="100"/>
-                        </div>--%>
                     </div>
                 </div>
                 <div class="control-group epart" style="display: none">
@@ -377,10 +308,7 @@
                 </div>
                 <div class="control-group" >
                     <label class="control-label"><b>主营内容：</b></label>
-<%--                    <div class="tags-area" id="clubArea"></div>--%>
-<%--                    <span class="err-tip" style="display: inline-block;margin-left:-55px;"></span>--%>
                     <font size="3">${cmClubinfo.mainpro}</font>
-<%--                    <input type="hidden" name="mainpro" value="${cmClubinfo.mainpro}" id="cMainPro">--%>
                 </div>
             </td>
         </tr>
@@ -421,20 +349,17 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
                 <tr height="28">
                     <th>机构面积：</th>
-                    <td>${cmClubinfo.area}<%--<form:input path="area" name="area" htmlEscape="false" class="input-medium" onkeyup="num(this)"/>--%>
+                    <td>${cmClubinfo.area}
                     </td>
                 </tr>
                 <tr height="28">
                     <th>美容床数：</th>
-                    <td>${cmClubinfo.bedNums}<%--<form:input path="bedNums" name="bedNums" htmlEscape="false" maxlength="11" class="input-medium"
-                                    onkeyup="int(this)"/>--%>
-                            <%--<input type="text" name="bedNums" value="${clubInfo.bedNums}">--%>
+                    <td>${cmClubinfo.bedNums}
                     </td>
                 </tr>
                 <tr height="28">
                     <th>美容师数：</th>
-                    <td>${cmClubinfo.beauticians}<%--<form:input path="beauticians" name="beauticians" htmlEscape="false" maxlength="11" class="input-medium"
-                                    onkeyup="int(this)"/>--%>
+                    <td>${cmClubinfo.beauticians}
                     </td>
                 </tr>
             </table>
@@ -444,20 +369,17 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
                 <tr height="28">
                     <th>月业绩：</th>
-                    <td>${cmClubinfo.monthAchievement}<%--<form:input path="monthAchievement" name="monthAchievement" htmlEscape="false" maxlength="63" class="input-medium"
-                                    onkeyup="num(this)"/>--%>
+                    <td>${cmClubinfo.monthAchievement}
                     </td>
                 </tr>
                 <tr height="28">
                     <th>促销业绩：</th>
-                    <td>${cmClubinfo.promotionAchievement}<%--<form:input path="promotionAchievement" name="promotionAchievement" htmlEscape="false" maxlength="63" class="input-medium"
-                                    onkeyup="num(this)"/>--%>
+                    <td>${cmClubinfo.promotionAchievement}
                     </td>
                 </tr>
                 <tr height="28">
                     <th>年业绩：</th>
-                    <td>${cmClubinfo.yearAchievement}<%--<form:input path="yearAchievement" name="yearAchievement" htmlEscape="false" maxlength="63" class="input-medium"
-                                    onkeyup="num(this)"/>--%>
+                    <td>${cmClubinfo.yearAchievement}
                     </td>
                 </tr>
             </table>
@@ -467,26 +389,17 @@
             <table border="0" cellspacing="0" cellpadding="0" width="100%">
                 <tr height="28">
                     <th>A类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">
-                        <%--<form:input path="cateA" name="cateA" htmlEscape="false" maxlength="11" class="cut-input-medium"
-                                    onkeyup="int(this)"/>--%>${cmClubinfo.cateA}人&nbsp;
-                        <%--<form:input path="consumeA" name="consumeA" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>--%>${cmClubinfo.consumeA}元
+                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateA}人&nbsp;${cmClubinfo.consumeA}元
                     </td>
                 </tr>
                 <tr height="28">
                     <th>B类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">
-                        <%--<form:input path="cateB" name="cateB"  htmlEscape="false" maxlength="11" class="cut-input-medium"
-                                    onkeyup="int(this)"/>--%>${cmClubinfo.cateB}人&nbsp;
-                        <%--<form:input path="consumeB" name="consumeB" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>--%>${cmClubinfo.consumeB}元
+                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateB}人&nbsp;${cmClubinfo.consumeB}元
                     </td>
                 </tr>
                 <tr height="28">
                     <th>C类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">
-                        <%--<form:input path="cateC" name="cateC" htmlEscape="false" maxlength="11" class="cut-input-medium"
-                                    onkeyup="int(this)"/>--%>${cmClubinfo.cateC}人&nbsp;
-                        <%--<form:input path="consumeC" name="consumeC" htmlEscape="false" class="cut-input-medium" onkeyup="num(this)"/>--%>${cmClubinfo.consumeC}元
+                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateC}人&nbsp;${cmClubinfo.consumeC}元
                     </td>
                 </tr>
             </table>
@@ -497,22 +410,16 @@
                 <tr height="28">
                     <th>最高业绩：</th>
                     <td>${cmClubinfo.highestAchievement}
-                        <%--<form:input path="highestAchievement" name="highestAchievement" htmlEscape="false" maxlength="63" class="input-medium"
-                                    onkeyup="num(this)"/>--%>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>到店人数：</th>
                     <td>${cmClubinfo.reachPepole}
-                        <%--<form:input path="reachPepole" name="reachPepole" htmlEscape="false" maxlength="11" class="input-medium"
-                                    onkeyup="int(this)"/>--%>
                     </td>
                 </tr>
                 <tr height="28">
                     <th>成交人数：</th>
                     <td>${cmClubinfo.clinchPepole}
-                        <%--<form:input path="clinchPepole" htmlEscape="false" maxlength="11" class="input-medium"
-                                    onkeyup="int(this)"/>--%>
                     </td>
                 </tr>
             </table>
@@ -521,13 +428,9 @@
             <tr height="28">
                 <th>店内所经营品牌及推广优势：</th>
                 <td colspan="10" width="25%">${cmClubinfo.brandSuperiority}
-                    <%--<form:textarea rows="7" cols="80" path="brandSuperiority" htmlEscape="false" cssStyle="width:90%;"
-                                   maxlength="200"/>--%>
                 </td>
                 <th>临近一次促销的模式及达成业绩：</th>
                 <td colspan="10" width="25%">${cmClubinfo.lastPromotion}
-                    <%--<form:textarea rows="7" cols="80" path="lastPromotion" htmlEscape="false" cssStyle="width:90%;"
-                                   maxlength="200"/>--%>
                 </td>
             </tr>
         </table>

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

@@ -76,7 +76,7 @@
                 </c:if>
             </td>
             <td>
-                <c:if test="${cmBehaviorRecord.accessSource == '0'}">
+                <c:if test="${cmBehaviorRecord.accessSource == '0' || cmBehaviorRecord.accessSource == '7'}">
                     直接访问
                 </c:if>
                 <c:if test="${cmBehaviorRecord.accessSource == '1'}">
@@ -97,9 +97,6 @@
                 <c:if test="${cmBehaviorRecord.accessSource == '6'}">
                     搜狗搜索
                 </c:if>
-                <c:if test="${cmBehaviorRecord.accessSource == '7'}">
-                    直接访问
-                </c:if>
             </td>
             <td>
                 <c:if test="${cmBehaviorRecord.accessClient == '0'}">

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

@@ -77,6 +77,7 @@
         <tr>
             <th>IP</th>
             <th>地区</th>
+            <th>访问客户端</th>
             <th>公司类型</th>
             <th>公司名称</th>
             <th>联系人</th>
@@ -101,6 +102,14 @@
                 ${cmBehaviorRecord.region}
             </c:if>
             </td>
+            <td>
+                <c:if test="${cmBehaviorRecord.accessClient == '0'}">
+                    网站
+                </c:if>
+                <c:if test="${cmBehaviorRecord.accessClient == '1'}">
+                    小程序
+                </c:if>
+            </td>
            <td>
                <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
                    机构

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

@@ -77,6 +77,7 @@
     <tr>
         <th>IP</th>
         <th>地区</th>
+        <th>访问客户端</th>
         <th>公司类型</th>
         <th>公司名称</th>
         <th>联系人</th>
@@ -102,6 +103,14 @@
                     ${cmBehaviorRecord.region}
                 </c:if>
             </td>
+            <td>
+                <c:if test="${cmBehaviorRecord.accessClient == '0'}">
+                    网站
+                </c:if>
+                <c:if test="${cmBehaviorRecord.accessClient == '1'}">
+                    小程序
+                </c:if>
+            </td>
             <td>
                 <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
                     机构

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

@@ -128,7 +128,7 @@
 		<div class="control-group">
 			<label class="control-label"><font color="red">*</font>描述：</label>
             <textarea id='describe' <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if>
-					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"><c:if test="${not empty describe}">${describe}</c:if><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
+					  name='describe' rows='5' cols='12' style="width: 700px" maxlength="500"><c:if test="${not empty describe}">${describe}</c:if><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
 			<textarea hidden id="masBehavior" path="masBehavior"  name="masBehavior" style="width: 700px; visibility: hidden" maxlength="200"><c:if test="${masBehavior ne ''}">,${masBehavior}</c:if></textarea>
 		</div><%--<c:if test="${masBehavior ne ''}">,${masBehavior}</c:if>--%>