Browse Source

邀请好友页面开发,服务商页面修改

anderx 7 years ago
parent
commit
598fe3c44b

+ 3 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -798,6 +798,9 @@ public class PublicController extends BaseController {
 		if(StringUtils.isBlank(vid)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","抵用券"));
 		}
+		if(StringUtils.isBlank(uid)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","领用者"));
+		}
 		res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
 		return res;
 	}

+ 11 - 0
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1501,6 +1501,17 @@ public class WebpageController extends BaseController {
 	}
 	
 	/**
+	 * 邀请好友
+	 * @param modelview
+	 * @return
+	 */
+	@RequestMapping(value = "/portal/invitation", method = RequestMethod.GET)
+	public ModelAndView portalInvitation(ModelAndView modelview){
+		modelview.setViewName("/portal/invitation");
+		return modelview;
+	}
+	
+	/**
 	 * 政策 资讯 百科
 	 * @param policy
 	 * @param pageNo

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserMapper.java

@@ -114,7 +114,7 @@ public interface UserMapper {
 	
 	List<JtMessageConsumer> getAllUser();
 	
-	int getCountByMobile(@Param("id")String id,@Param("mobile")String mobile);
+	int getCountByMobile(@Param("id")String id,@Param("mobile")String mobile,@Param("type")Integer type);
 
 	List<String> getUserListMobile();
 

+ 5 - 1
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1275,7 +1275,11 @@
 	</select>
 	<!-- 验证手机号码是否重复 -->
 	<select id="getCountByMobile" parameterType="com.goafanti.common.model.User" resultType="java.lang.Integer">
-		select count(0) from user where mobile = #{mobile,jdbcType=VARCHAR} and id &lt;&gt; #{id,jdbcType=VARCHAR}
+		select count(0) from user where mobile = #{mobile,jdbcType=VARCHAR} 
+		<if test="type != null">
+		and type= #{type,jdbcType=INTEGER}
+		</if>
+		and id &lt;&gt; #{id,jdbcType=VARCHAR}
 	</select>
 	<select id="getUserListMobile"  resultType="java.lang.String">
 	select mobile from `user`

+ 2 - 2
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -694,7 +694,7 @@ public class UserApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateUserBase", method = RequestMethod.POST)
-	public Result updateUserBase(String identifyName,String mobile,String email,String nickname){
+	public Result updateUserBase(String identifyName,String mobile,String email,String nickname,Integer type){
 		Result res = new Result();
 		if(StringUtils.isBlank(identifyName) || StringUtils.isBlank(mobile)
 				||StringUtils.isBlank(nickname)){
@@ -711,7 +711,7 @@ public class UserApiController extends BaseApiController {
 				res.getError().add(buildError("电话号码格式不对","电话号码格式不对"));
 			}else{
 				//验证手机是否存在
-				int i = userService.getCountByMobile(user.getId(),mobile);
+				int i = userService.getCountByMobile(user.getId(),mobile,type);
 				if(i>0){
 					res.getError().add(buildError("电话号码重复","电话号码重复"));
 				}else{

+ 1 - 1
src/main/java/com/goafanti/user/service/UserService.java

@@ -68,7 +68,7 @@ public interface UserService {
 	 * @param user
 	 * @return
 	 */
-	int getCountByMobile(String id, String mobile);
+	int getCountByMobile(String id, String mobile,Integer type);
 
 	String updateGetInvitationCode(String uid);
 

+ 2 - 2
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -259,8 +259,8 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	}
 
 	@Override
-	public int getCountByMobile(String id,String mobile) {
-		return userMapper.getCountByMobile(id,mobile);
+	public int getCountByMobile(String id,String mobile,Integer type) {
+		return userMapper.getCountByMobile(id,mobile,type);
 	}
 
 	@Override

+ 81 - 75
src/main/webapp/WEB-INF/views/portal/facilitator.html

@@ -27,82 +27,88 @@
     	<div class="facTab">
     		<span class="facActive">所有项目</span>
     		<span>主页</span>
-    		
+    		<span>点我领劵</span>
     	</div>
-    	<div class="facFirst">
-    		<div class="jianjie">
-    			<h4>公司简介</h4>
-    			  <p th:text="(${org.introduction}==null or ${org.introduction}=='')?'暂无':${org.introduction}"></p>
-    		</div>
-    		<div class="jianjie">
-    			<h4>业务范围</h4>
-    			<p th:text="(${org.businessScope}==null or${org.businessScope}=='')?'暂无':${org.businessScope}"></p>
-    		</div>
-    		<div class="RecommendTitle">
-	            <h2>荣誉资质</h2>
-	            <span></span>
-	        </div>
-    		<div class="rongyuCont" >
-    			<div th:each="pic:${honors}">
-    				<img  th:src="(${pic}==null or ${pic}=='')?${portalHost+'/img/fac/fea2.png'}:${avatarUploadHost+pic}" alt="" >
-    			</div>
-    			
-    		</div>
-    		<div class="RecommendTitle">
-	            <h2>联系我们</h2>
-	            <span></span>
-	        </div>
-	        <ol class="contantUs">
-	            <li>
-	                <span class="glyphicon glyphicon-earphone"></span>
-	                <div>
-	                    <p>联系方式<span class="pho" th:text="(${org.fixedTel}==null or ${org.fixedTel}=='')?'暂无':${org.fixedTel}"></span></p>
-	                    <p>QQ号码<span class="pho" th:text="(${org.qq}==null or ${org.qq}=='')?'暂无':${org.qq}"></span></p>
-	                </div>
-	            </li>
-	            <li>
-	                <span class="glyphicon glyphicon-envelope"></span>
-	                <div>
-	                    <p>公司邮箱</span></p>
-	                    <p><span th:text="(${org.email}==null or ${org.email}=='')?'暂无':${org.email}">3846252890@qq.com</span> </p>
-	                </div>
-	            </li>
-	            <li>
-	                <span class="glyphicon glyphicon-map-marker"></span>
-	                <div>
-	                    <p>公司地址</span></p>
-	                    <p><span th:text="(${org.postalAddress}==null or ${org.postalAddress}=='')?'暂无':${org.postalAddress}">湖南省长沙市营盘东路</span> </p>
-	                </div>
-	            </li>
-	        </ol>
-    	</div>
-    	<div id="facAll">
-    		<div class="facAll">
-    			
-    		</div>
-    		<div class="pagination_box">
-	            <nav aria-label="Page navigation" class="clearfix">
-	                <ul class="pagination">
-	                    <li class="pagePre">
-	                        <a href="#" aria-label="Previous">
-	                            <span aria-hidden="true">&laquo;</span>
-	                        </a>
-	                    </li>
-	                    <li class="pageNumber"><a href="#" value="1">1</a></li>
-	                    <li class="pageNext">
-	                        <a href="#" aria-label="Next">
-	                            <span aria-hidden="true">&raquo;</span>
-	                        </a>
-	                    </li>
-	                </ul>
-	                <div class="inp">
-	                    <input type="text" class=""><button class="btn btn-default">跳转</button>
-	                </div>
-	                <span class="totalCount">共0条数据</span>
-	            </nav>
-	        </div>
-    	</div>
-    </div>
+    	<div class="facJuan">
+	    	<div class="facFirst">
+	    		<div class="jianjie">
+	    			<h4>公司简介</h4>
+	    			  <p th:text="(${org.introduction}==null or ${org.introduction}=='')?'暂无':${org.introduction}"></p>
+	    		</div>
+	    		<div class="jianjie">
+	    			<h4>业务范围</h4>
+	    			<p th:text="(${org.businessScope}==null or${org.businessScope}=='')?'暂无':${org.businessScope}"></p>
+	    		</div>
+	    		<div class="RecommendTitle">
+		            <h2>荣誉资质</h2>
+		            <span></span>
+		        </div>
+	    		<div class="rongyuCont" >
+	    			<div th:each="pic:${honors}">
+	    				<img  th:src="(${pic}==null or ${pic}=='')?${portalHost+'/img/fac/fea2.png'}:${avatarUploadHost+pic}" alt="" >
+	    			</div>
+	    			
+	    		</div>
+	    		<div class="RecommendTitle">
+		            <h2>联系我们</h2>
+		            <span></span>
+		        </div>
+		        <ol class="contantUs">
+		            <li>
+		                <span class="glyphicon glyphicon-earphone"></span>
+		                <div>
+		                    <p>联系方式<span class="pho" th:text="(${org.fixedTel}==null or ${org.fixedTel}=='')?'暂无':${org.fixedTel}"></span></p>
+		                    <p>QQ号码<span class="pho" th:text="(${org.qq}==null or ${org.qq}=='')?'暂无':${org.qq}"></span></p>
+		                </div>
+		            </li>
+		            <li>
+		                <span class="glyphicon glyphicon-envelope"></span>
+		                <div>
+		                    <p>公司邮箱</span></p>
+		                    <p><span th:text="(${org.email}==null or ${org.email}=='')?'暂无':${org.email}">3846252890@qq.com</span> </p>
+		                </div>
+		            </li>
+		            <li>
+		                <span class="glyphicon glyphicon-map-marker"></span>
+		                <div>
+		                    <p>公司地址</span></p>
+		                    <p><span th:text="(${org.postalAddress}==null or ${org.postalAddress}=='')?'暂无':${org.postalAddress}">湖南省长沙市营盘东路</span> </p>
+		                </div>
+		            </li>
+		        </ol>
+	    	</div>
+	    	<div id="facAll">
+	    		<div class="facAll">
+	    			
+	    		</div>
+	    		<div class="pagination_box">
+		            <nav aria-label="Page navigation" class="clearfix">
+		                <ul class="pagination">
+		                    <li class="pagePre">
+		                        <a href="#" aria-label="Previous">
+		                            <span aria-hidden="true">&laquo;</span>
+		                        </a>
+		                    </li>
+		                    <li class="pageNumber"><a href="#" value="1">1</a></li>
+		                    <li class="pageNext">
+		                        <a href="#" aria-label="Next">
+		                            <span aria-hidden="true">&raquo;</span>
+		                        </a>
+		                    </li>
+		                </ul>
+		                <div class="inp">
+		                    <input type="text" class=""><button class="btn btn-default">跳转</button>
+		                </div>
+		                <span class="totalCount">共0条数据</span>
+		            </nav>
+		        </div>
+	    	</div>
+	    	<div class="listJ">
+              <ul></ul>
+        	</div>
+	    </div>
+	   
+	</div>
     <footer>
       <div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>

+ 58 - 0
src/main/webapp/WEB-INF/views/portal/invitation.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html  xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+
+<head th:replace="common::header(~{::title},~{::link})">
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>邀请好友</title>
+<link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+<link th:href="${portalHost + '/newMenu/Invitation.css'}" rel="stylesheet">
+</head>
+
+<body>
+  <div th:replace="common::nav('','index')"></div>
+    <!-- 上面公共头部 -->
+    <div class="continueHighBanner">
+        <img th:src="${portalHost+'/img/load/Invitation-banner.png'}" alt="">
+    </div>
+    <div class="container invitation">
+        <div class="activeRule">
+            <h3>活动规则</h3>
+            <span>1、邀请客户</span>
+            <p>每邀请一位客户,被邀请新客户获500元抵用券及注册好礼抵用券2000元,邀请者获200元抵用券。</p>
+            <span>2、邀请入驻商</span>
+            <p>每邀请一位服务商,被邀请新服务商获1000元抵用券及注册好礼抵用券3000元,邀请者获500元抵用券。</p>
+            <p class="lastP">注意:邀请客户或者入驻商,邀请者收到的劵类型都是通用劵。</p>
+        </div>
+        <div class="rule">
+            <h3>抵用券使用规则</h3>
+            <p>1、抵用券有效期为6个月,抵用券有效期从获取日后始计算,因客户未及时使用而导致该电子抵用券逾期失效,将被视为客户自行放弃该电子抵用券。 </p>
+            <p>2、抵用券必须一次性使用,不累计,不找零,不兑现,并且使用时,一笔订单只能使用一张抵用券,订单总额必须大于抵用券面额。 </p>    
+            <p>3、抵用券只能应用于线上交易平台,且使用对象与注册认证资料一致(包含PC平台/APP手机客户端)</p>    
+            <p>4、抵用券分为200、500、1000、2000面额,抵用券只能在适用范围内使用,具体可查看抵用券券面说明。</p>    
+            <p>5、对于活动发送的抵用券,如果发生订单退货,抵用券会失效。如果已经使用,将从退货款中扣除对应金额。</p>    
+            <p>6、如有争议,最终解释权归技淘网所有。</p>    
+        </div>
+        <div class="ruleBottom">
+            <a href="javascript:;">立即邀请客户</a>
+            <a href="javascript:;">立即邀请商家</a>
+        </div>
+    </div>
+   <!-- 下面公共底部 -->
+    <footer>
+      <div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+    </footer>
+     <div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost+'/dll/dll.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost+'/newMenu/Invitation.js'}"></script>
+	</div>
+
+</body>
+
+</html>