修改前端信息接口

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -47,7 +47,7 @@ public class AuthenticationController {
 			return null;
 		}
 		User sysUser = SystemSession.getUser();
-		//List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
+		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
 		try{
@@ -57,9 +57,15 @@ public class AuthenticationController {
 		} catch (NullPointerException e) { }
 
 		UserInfo userInfo = new UserInfo(user);
-		if (user.getHasQuestion() == 1) {
+		if (!CollectionUtils.isEmpty(userQuestion)) {
 			userInfo.setHaveUserQuestion(true);
-			userInfo.setSecLevel((short)(1+userInfo.getSecLevel()));
+			userInfo.setSecLevel((short) (1 + userInfo.getSecLevel()));
+		} else {
+			Integer hasQuestion = user.getHasQuestion();
+			if (hasQuestion != null && hasQuestion ==1) {
+				userInfo.setHaveUserQuestion(true);
+				userInfo.setSecLevel((short) (1 + userInfo.getSecLevel()));
+			}
 		}
 		return userInfo;
 	}

src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -71,6 +71,8 @@ public class UserInfo {
 		this.haveUserQuestion = haveUserQuestion;
 		this.lastLoginTime = user.getLastLoginTime();
 		this.secLevel = countSecLevel();
+		this.emailValidCode = user.getEmailValidCode();
+
 	}
 
 	private Short countSecLevel(){
@@ -136,6 +138,16 @@ public class UserInfo {
 
 	private Set<UserLoginTime> userLoginTimeSet;
 
+	public Integer getEmailValidCode() {
+		return emailValidCode;
+	}
+
+	public void setEmailValidCode(Integer emailValidCode) {
+		this.emailValidCode = emailValidCode;
+	}
+
+	private  Integer emailValidCode;
+
 	public Long getLastLoginTime() {
 		return lastLoginTime;
 	}
@@ -216,6 +228,7 @@ public class UserInfo {
 		this.userTel = userTel;
 	}
 
+
 	public String getUserSex() {
 		return userSex;
 	}

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -194,7 +194,6 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 			JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
 			String userSpa = data.toJSONString();
 			AccountUtils.register(detail,userView);
-
 		} catch (Exception e) {
 			return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());
 		}

src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2c.common.account.v2.controller;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
 import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.fa.payment.utils.StringUtils;
 import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -37,8 +38,14 @@ public class UserController {
      */
 	@RequestMapping(value = "/bindUser", method = RequestMethod.POST)
     @ResponseBody
-    public void bindUser(Long userUU, Long spaceUU, Integer type) {
-        userService.bindOrUnbind(userUU, spaceUU, type);
+    public void bindUser(Long userUU, Long spaceUU, String type) {
+		Integer integerType = null;//1为绑定，0为解绑
+		if (!StringUtils.isEmpty(type) && type.equals("bind")) {
+			integerType = 1;
+		} else {
+			integerType = 0;
+		}
+		userService.bindOrUnbind(userUU, spaceUU, integerType);
     }
 
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -105,11 +105,11 @@ public class UserServiceImpl implements UserService {
         u.setIdEnable(identityValidCode);
         String imId = user.getImId();
         if (!StringUtils.isEmpty(imId)) {
-            u.setUserIMId(Long.parseLong(imId));
+            u.setUserIMId(Long.parseLong(imId.trim()));
         }
         Short lock = user.getLock();
-        if (lock == 0) {
-            u.setEnable((short)1);
+        if (lock != null && lock == 0) {
+            u.setEnable((short) 1);
         }
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);

src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -655,8 +655,8 @@
 					<span ng-show="userInfo.userEmail"><i ng-modal="userInfo.userEmail" style="color:#666;">{{userInfo.userEmail}}</i></span>
 					<span ng-hide="userInfo.userEmail">绑定邮箱可帮助您找回登录密码，并可订阅获取最新的订单动态、促销信息。</span>
 				</span>
-          <a ng-show="userInfo.userEmail" ng-click="updateUserEmail()">修改</a>
-          <a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
+          <a ng-show="userInfo.emailValidCode && userInfo.emailValidCode == 2" ng-click="updateUserEmail()">修改</a>
+          <a ng-hide="userInfo.emailValidCode && userInfo.emailValidCode != 2" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
         </li>
         <li>
 				<span>