瀏覽代碼

PC端新增首页弹框,效果是打开首页显示技淘币活动框

anderx 7 年之前
父節點
當前提交
05fce2d540

+ 3 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -440,4 +440,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userService.getUserInfo(user, pageNo, pageSize));
 		return res;
 	}
+	
+	
+	
 }

+ 0 - 1
src/main/java/com/goafanti/app/controller/AppDiscoveryController.java

@@ -10,7 +10,6 @@ import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.demand.service.DemandService;

+ 1 - 8
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -45,7 +45,6 @@ import com.goafanti.common.model.User;
 import com.goafanti.common.service.FieldGlossoryService;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.common.utils.VerifyCodeUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.bo.InputDemand;
@@ -609,13 +608,7 @@ public class AppUserController extends CertifyApiController {
 		
 	}
 	
-	private void cleanCodeSession() {
-		VerifyCodeUtils.clearResetCode();
-		VerifyCodeUtils.clearResetCodeTime();
-		VerifyCodeUtils.clearMobileCode();
-		VerifyCodeUtils.clearMobileCodeTime();
-	}
-	
+
 	/*APP我的订单列表
 	 * userType-----0-购买者   1-出售者  2-管理员
 	 * 

+ 0 - 1
src/main/java/com/goafanti/app/controller/OpenAppHomeController.java

@@ -19,7 +19,6 @@ import com.goafanti.comment.service.CommentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.model.JtBusinessCategory;
 import com.goafanti.common.service.GlobalSearchService;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.demand.service.DemandService;

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

@@ -814,4 +814,19 @@ public class PublicController extends BaseController {
 		res.data(voucherDetailService.saveUserGetVoucher(uid,vid));
 		return res;
 	}
+	
+	/**
+	 * 服务商列表
+	 * @param user
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value="/organizationList", method = RequestMethod.GET)
+	@ResponseBody
+	public Result organizationList(User user, Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(userService.selectOrganizationList(user, pageNo, pageSize));
+		return res;
+	}
 }

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

@@ -1298,5 +1298,22 @@
 	<include refid="Base_Column_List" />
 	from `user` where to_invite_code= #{toInviteCode,jdbcType=VARCHAR}
 	</select>
-
+	
+	<select id="selectOrganizationList" resultType="com.goafanti.common.model.User">
+	SELECT 
+	<include refid="Base_Column_List" />
+	FROM user
+   where status=0 and source=0
+   and `type`=1
+   <if test="page_sql != null">
+			${page_sql}
+		</if>
+	</select>
+	<select id="selectOrganizationCount" resultType="java.lang.Integer">
+	SELECT 
+	count(*)
+	FROM user
+   where status=0 and source=0
+   and `type`=1
+	</select>
 </mapper>

+ 0 - 1
src/main/java/com/goafanti/common/service/GlobalSearchService.java

@@ -2,7 +2,6 @@ package com.goafanti.common.service;
 
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.springframework.stereotype.Service;

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

@@ -1022,6 +1022,7 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 	
+	
 
 
 }

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

@@ -75,5 +75,7 @@ public interface UserService {
 	void saveVoucher(User us);
 
 	boolean checkeToInviteCode(String beInviteCode);
+
+	Pagination<User> selectOrganizationList(User user, Integer pageNo, Integer pageSize);
 	
 }

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

@@ -317,4 +317,14 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 		return false;
 		
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<User> selectOrganizationList(User user, Integer pageNo, Integer pageSize) {
+		Map<String, Object> params=new HashMap<>();
+		if(pageNo==null||pageNo<0)pageNo=1;
+		if(pageSize==null || pageSize<0)pageSize=10;
+		
+		return  (Pagination<User>) findPage("selectOrganizationList", "selectOrganizationCount", params, pageNo, pageSize);
+	}
 }

+ 7 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -537,6 +537,13 @@
 				<button class="btn btn-default">返回</button>
 			</div>
 		</div>
+		<div class="initModel">
+				<div>
+				<span class="glyphicon glyphicon-remove"></span>
+				<a th:href="@{/portal/invitation}" class="moreActive">了解活动规则详情 >></a>
+				<a th:href="@{/user/signIn}" class="ljZhuCe">立即注册 >></a>
+			</div>
+		</div>
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -52,7 +52,7 @@
 					</div>
 					<div class="zhuce_input">
 						<img th:src="${portalHost+'/img/indedImg/enroll3.png'}" alt=""/>
-						<input type="text" name="userName" placeholder="请输入用户名"  id="username" autocomplete="off"/>
+						<input type="text" name="userName" placeholder="请输入昵称"  id="username" autocomplete="off"/>
 						<span class="star"> * </span>
 						<span class="Tips"></span>
 					</div>