Trang chủ Khám phá Trợ giúp
Đăng nhập
caimei365
/
caimei365-manager
3
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

行为记录链接

Duan_xu 2 năm trước cách đây
mục cha
d857a3b442
commit
f77dbcf4db
11 tập tin đã thay đổi với 67 bổ sung và 25 xóa
Split View Hiển thị tình trạng sai khác
  1. 2 0
      src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java
  2. 4 2
      src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java
  3. 2 1
      src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml
  4. 7 4
      src/main/resources/mappings/modules/user/NewCmClubMapper.xml
  5. 15 4
      src/main/webapp/WEB-INF/views/modules/consult/type/cmConsulttypeList.jsp
  6. 1 1
      src/main/webapp/WEB-INF/views/modules/userNew/ReportList.jsp
  7. 1 1
      src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp
  8. 3 2
      src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp
  9. 15 4
      src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksList.jsp
  10. 15 4
      src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp
  11. 2 2
      src/main/webapp/WEB-INF/views/modules/userNew/recordLinkageForm.jsp

+ 2 - 0
src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java
Xem Tập Tin 

@@ -79,4 +79,6 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     void addRecordLinkage(@Param("describe")String describe,@Param("link")String link,@Param("clubId")Integer clubId);
 
 
     String recordLinkage(Integer clubId);
 
+
 
+    String recordDescribe(Integer clubId);
 
 }

+ 4 - 2
src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java
Xem Tập Tin 

@@ -1200,9 +1200,10 @@ private VisitRemarkDao visitRemarkDao;
 
     @RequestMapping("recordLinkage")
 
     public String RecordLinkage(Integer clubId,HttpServletRequest request, HttpServletResponse response, Model model) {
 
        String link= newCmClubDao.recordLinkage(clubId);
 
+        String describe= newCmClubDao.recordDescribe(clubId);
 
        String linkage="";
 
         if(domain.contains("-b")){
 
-            linkage="http://zzjtest.free.aeert.com/clubinfo.html?clubId="+clubId;
 
+            linkage="http://zzjtest.gz.aeert.com/clubinfo.html?clubId="+clubId;
 
         }else if(domain.contains("www")){
 
             linkage="https://www.caimei365.com/clubinfo.html?clubId="+clubId;
 
         }else {
 
@@ -1210,6 +1211,7 @@ private VisitRemarkDao visitRemarkDao;
 
         }
 
         model.addAttribute("link",link);
 
         model.addAttribute("linkage",linkage);
 
+        model.addAttribute("describe",describe);
 
         model.addAttribute("clubId", clubId);
 
         return "modules/userNew/recordLinkageForm";
 
     }
 
@@ -1219,7 +1221,7 @@ private VisitRemarkDao visitRemarkDao;
 
         model.addAttribute("clubId", clubId);
 
 
         if(domain.contains("-b")){
 
-            link="http://zzjtest.free.aeert.com/clubinfo.html?clubId="+clubId;
 
+            link="http://zzjtest.gz.aeert.com/clubinfo.html?clubId="+clubId;
 
         }else if(domain.contains("www")){
 
             link="https://www.caimei365.com/clubinfo.html?clubId="+clubId;
 
         }else {

+ 2 - 1
src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml
Xem Tập Tin 

@@ -206,7 +206,8 @@
 
 			cityID = #{cityID},
 
 			inviterName = #{inviterName},
 
 			inviterBindID = #{inviterBindID},
 
-			scanTime = #{scanTime}
 
+			scanTime = #{scanTime},
 
+		    newDeal=1
 
 		WHERE clubid = #{id}
 
 	</update>

+ 7 - 4
src/main/resources/mappings/modules/user/NewCmClubMapper.xml
Xem Tập Tin 

@@ -373,9 +373,6 @@
 
         <if test="medicalPracticeLicenseImg != null and medicalPracticeLicenseImg != ''">
 
             medicalPracticeLicenseImg=#{medicalPracticeLicenseImg},
 
         </if>
 
-        <if test="status == 90">
 
-            newDeal=1,
 
-        </if>
 
         userID = #{userID}
 
         WHERE clubID = #{clubID}
 
     </update>
 
@@ -406,7 +403,7 @@
 
     </select>
 
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
 
         select DISTINCT ccr.id                                                                        as remarksId,
 
-                        remarks,
 
+                        ccr.remarks,
 
                         s.linkMan                                                                     as spName,
 
                         ccr.addTime,
 
                         ccr.questionMan,
 
@@ -689,7 +686,13 @@
 
 
 <select id="recordLinkage" resultType="string">
 
     SELECT link from record_link where clubId=#{clubId}
 
+    ORDER BY id DESC
 
     LIMIT 1
 
 </select>
 
+    <select id="recordDescribe" resultType="string">
 
+        SELECT `describe` from record_link where clubId=#{clubId}
 
+        ORDER BY id DESC
 
+        LIMIT 1
 
+    </select>
 
 
 </mapper>

+ 15 - 4
src/main/webapp/WEB-INF/views/modules/consult/type/cmConsulttypeList.jsp
Xem Tập Tin 

@@ -61,10 +61,21 @@
 
 </head>
 
 <body>
 
 <ul class="nav nav-tabs">
 
-    <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
-    <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
-    <li class="active"><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
-    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    <shiro:hasPermission name="user:agency:regist">
 
+        <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:unregist">
 
+        <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:reportList">
 
+        <li><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmConsulttype">
 
+        <li class="active"><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmrenaksList">
 
+        <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    </shiro:hasPermission>
 
 </ul>
 
 <form:form id="searchForm" modelAttribute="cmConsulttype" action="${ctx}/consult/type/cmConsulttype/" method="post"
 
            class="breadcrumb form-search">

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/userNew/ReportList.jsp
Xem Tập Tin 

@@ -374,7 +374,7 @@
 
                 <c:if test="${not empty list.auditText}">
 
                     <c:if test="${list.status eq 1}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: red;text-decoration: underline;">待审核</a></c:if>
 
                     <c:if test="${list.status eq 2}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: #00aa00;text-decoration: underline;">已审核</a></c:if>
 
-                    <c:if test="${list.status eq 3}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="text-decoration: underline;">审核未通过</a></c:if>
 
+                    <c:if test="${list.status eq 3}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="text-decoration: underline; color: #0d0d0d">审核未通过</a></c:if>
 
                 </c:if>
 
 
             </td>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/userNew/cmAgencyList.jsp
Xem Tập Tin 

@@ -102,7 +102,7 @@
 
         <div class="item">
 
             <label>新分配机构：</label>
 
             <form:select path="newDeal" class="input-medium">
 
-                <form:option value="0" label="请选择"/>
 
+                <form:option value="" label="请选择"/>
 
                 <form:option value="1">是</form:option>
 
                 <form:option value="2">否</form:option>
 
             </form:select>

+ 3 - 2
src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp
Xem Tập Tin 

@@ -197,9 +197,10 @@
 
                                 height="50"> ${clubRemarks.productName}
 
                             </div>
 
                             <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
-                                供应商名称:
 
+                                供应商名称:${clubRemarks.shopName}
 
+
 
                             </div>
 
-                            <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.shopName}</div>
 
+<%--                            <span style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.shopName}</span>--%>
 
                         </c:if>
 
                     </div>
 
                     <c:if test="${not empty clubRemarks.proName}">

+ 15 - 4
src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksList.jsp
Xem Tập Tin 

@@ -29,10 +29,21 @@
 
 </head>
 
 <body>
 
 <ul class="nav nav-tabs">
 
-    <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
-    <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
-    <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
-    <li class="active"><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    <shiro:hasPermission name="user:agency:regist">
 
+        <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:unregist">
 
+        <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:reportList">
 
+        <li><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmConsulttype">
 
+        <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmrenaksList">
 
+        <li class="active"><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    </shiro:hasPermission>
 
 </ul>
 
 <form:form id="searchForm" modelAttribute="cmRemaks" action="${ctx}/new/user/agency/cmrenaksList" method="post"
 
            class="breadcrumb form-search">

+ 15 - 4
src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp
Xem Tập Tin 

@@ -44,10 +44,21 @@
 
 </head>
 
 <body>
 
 <ul class="nav nav-tabs">
 
-    <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
-    <li class="active"><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
-    <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
-    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    <shiro:hasPermission name="user:agency:regist">
 
+        <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:unregist">
 
+        <li class="active"><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:reportList">
 
+        <li><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmConsulttype">
 
+        <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
 
+    </shiro:hasPermission>
 
+    <shiro:hasPermission name="user:agency:cmrenaksList">
 
+        <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 
+    </shiro:hasPermission>
 
 </ul>
 
 <br/>
 
 <form:form id="searchForm" modelAttribute="visit" action="${ctx}/new/user/visit/unregist" method="post"

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/userNew/recordLinkageForm.jsp
Xem Tập Tin 

@@ -129,9 +129,9 @@
 
 	<input type="hidden" id='clubId' name='clubId' value="${clubId}">
 
 		<div class="control-group">
 
 			<label class="control-label"><font color="red">*</font>描述：</label>
 
-            <textarea id='describe' name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"></textarea>
 
+            <textarea id='describe'  <c:if test="${not empty describe}">placeholder="${describe}"</c:if> <c:if test="${empty describe}">placeholder="请输入该用户的行为信息，例如查看了什么商品或者文章，以及任何需要销售人员注意的信息"</c:if> name='describe' rows='5' cols='12' style="width: 700px" maxlength="200"></textarea>
 
 		</div>
 
-	<div >链接：<span id='link' name='link'>${link}</span></div>
 
+	<div class="control-label">链接：</div><span id='link' name='link'>${link}</span>
 
 		<div class="form-actions">
 
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 
 			<input id="btnSubmit" class="btn btn-primary"  type="submit" value="确定并生成链接"/>