修改手机，密码 数据同步处理

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

@@ -2,7 +2,6 @@ package com.uas.platform.b2c.common.account.controller;
 
 import com.uas.message.mail.service.MailService;
 import com.uas.message.sms.service.SmsService;
-import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserInfo;
 import com.uas.platform.b2c.common.account.model.UserQuestion;
@@ -130,11 +129,10 @@ public class UserController {
 		}
 		User sysUser = SystemSession.getUser();
 		User user = userService.findUserPwdByUserUU(sysUser.getUserUU());
-		Enterprise enterprise = user.getEnterprise();
 		if (!StringUtils.isEmpty(newPassword)) {
 			user.setPwdSecLevel(secLevel);
 			user = userService.updatePassword(user, password, newPassword);
-			user.setEnterprise(enterprise);
+			user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
@@ -263,6 +261,7 @@ public class UserController {
 			}
 			user.setUserEmail(newUserEmail);
 			user = userService.save(user);
+			user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
@@ -309,7 +308,7 @@ public class UserController {
 			}
 			String checkCode = String.valueOf((int) ((Math.random() * 9 + 1) * 100000));
 			try {
-				//smsService.send("1eba04ae-f3d9-4105-ad32-0196309fabb3", newUserTel, new Object[] {checkCode});
+				smsService.send("1eba04ae-f3d9-4105-ad32-0196309fabb3", newUserTel, new Object[] {checkCode});
 				session.setAttribute("telCheckCode", checkCode);
 				session.setAttribute("telCheckTime", new Date().getTime());
 				session.setAttribute("newUserTel", newUserTel);
@@ -390,6 +389,7 @@ public class UserController {
 			}
 			user.setUserTel(newUserTel);
 			user = userService.save(user);
+			user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
@@ -453,6 +453,7 @@ public class UserController {
 		User user = userService.findUserPwdByUserUU(sysUser.getUserUU());
 		if (!StringUtils.isEmpty(newUserPay)) {
 			user = userService.updateUserPay(user, userPay, newUserPay);
+			user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			session.setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
@@ -488,6 +489,9 @@ public class UserController {
 		for (UserQuestion uq : userQuestions) {
 			uq.setUser(sysUser);
 			uq.setUserUU(sysUser.getUserUU());
+			if(uq.getAnswer()==null && uq.getQuestion()==null && uq.getAnswer().length()>30){
+				throw new IllegalOperatorException("请按照要求输入信息...");
+			}
 			uqService.save(uq);
 		}
 		return new ResponseEntity<>(HttpStatus.OK);
@@ -503,15 +507,21 @@ public class UserController {
 	@RequestMapping(value = "/updateRealAuth", method = RequestMethod.POST)
 	public ResponseEntity<String> updateRealAuth(final String userName, final String userIdcode, final String idImgUrl,HttpServletRequest request) {
 		User sysUser = SystemSession.getUser();
-		sysUser.setUserName(userName);
-		sysUser.setUserIccode(userIdcode);
-		sysUser.setIdImgUrl(idImgUrl);
-		sysUser.setIdEnable((short)2);
-		sysUser.setIdDate(new Date());
-		sysUser = userService.saveRealAuth(sysUser);
-		request.getSession().setAttribute("user",sysUser);
-		SystemSession.setUser(sysUser);
-		return new ResponseEntity<>(HttpStatus.OK);
+		User user = userService.findUserByUserUU(sysUser.getUserUU());
+		if(user!=null){
+			user.setUserName(userName);
+			user.setUserIccode(userIdcode);
+			user.setIdImgUrl(idImgUrl);
+			user.setIdEnable((short)2);
+			user.setIdDate(new Date());
+			user = userService.saveRealAuth(user);
+			user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
+			request.getSession().setAttribute("user",user);
+			SystemSession.setUser(user);
+			return new ResponseEntity<>(HttpStatus.OK);
+		}else{
+			throw new IllegalOperatorException("找不到用户...");
+		}
 	}
 
 	/**

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

@@ -31,7 +31,13 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void save(User user) {
-        com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        com.uas.platform.b2c.common.account.model.User u = null;
+        if(user.getDialectUID()!=null){
+            u = userDao.findOne(Long.parseLong(user.getDialectUID()));
+        }else if(user.getUid()!=null){
+            u = userDao.findUserByUserTel(user.getUid()).size()>0?userDao.findUserByUserTel(user.getUid()).get(0):null;
+        }
+
         if (null == u){
             u =  new com.uas.platform.b2c.common.account.model.User();
         }
@@ -39,19 +45,25 @@ public class UserServiceImpl implements UserService {
         u.setUserName(user.getName());
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
-        u.setUserUU(Long.valueOf(user.getDialectUID()));
+        if(user.getDialectUID()!=null){
+            u.setUserUU(Long.valueOf(user.getDialectUID()));
+        }
+        u.setUserTel(user.getUid());
         //添加密码强度以及最后一次登录时间
         u.setPwdSecLevel(user.getPwdSecLevel());
         u.setLastLoginTime(user.getLastLoginTime());
-        Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
-        if(null != enterprise) {
-            u.setEnterprise(enterprise);
+        Enterprise enterprise = null;
+        if(user.getSpaceDialectUID()!=null){
+            enterprise= enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
+            if(null != enterprise) {
+                u.setEnterprise(enterprise);
+            }
         }
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         com.uas.platform.b2c.common.account.model.User newUser = userDao.save(u);
         SystemSession.setUser(newUser);
         if(oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
+            logger.log("更新用户信息", u.getUserUU() + "time: " + sdf.format(new Date()), enterprise.getUu()==null?null:enterprise.getUu(), u.getUserUU());
         } else {
             if(null != enterprise && null == enterprise.getEnAdminuu()) {
                 enterprise.setEnAdminuu(u.getUserUU());

src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -24,7 +24,7 @@ define(['app/app'], function (app) {
               ? $scope.userInfo.userEmail.indexOf("@") : '';
           if (userEmailTemp != '') {
             $scope.userInfo.userEmail = $scope.userInfo.userEmail.substr(
-                0, userEmailTemp - 2) + "***"
+                0,1) + "***"
                 + $scope.userInfo.userEmail.substr(userEmailTemp);
           }
           // 获取企业信息
@@ -758,7 +758,7 @@ define(['app/app'], function (app) {
                 $modalInstance.close();
               }, function (response) {
                 toaster.pop('error', '错误', response.data);
-                $modalInstance.close();
+               // $modalInstance.close();
               });
             } else {
               toaster.pop('error', '错误', '重复密码不一致');
@@ -894,8 +894,8 @@ define(['app/app'], function (app) {
               toaster.pop('success', '成功', '修改邮箱成功。');
               //修改userInfo里面的userEmail
               $scope.userInfo.userEmail =$scope.user.newUserEmail.substr(
-                  0, $scope.userInfo.userEmail.indexOf("@") - 2) + "***"
-                  + $scope.user.newUserEmail.substr($scope.userInfo.userEmail.indexOf("@"));
+                  0,1) + "***"
+                  + $scope.user.newUserEmail.substr($scope.user.newUserEmail.indexOf("@"));
               $scope.user.userEmail = null;
               $scope.user.newUserEmail = null;
               $scope.checking = false;
@@ -909,7 +909,7 @@ define(['app/app'], function (app) {
               $modalInstance.close();
             }, function (response) {
               toaster.pop('error', '错误', response.data);
-              //$modalInstance.close();
+              $modalInstance.close();
             });
           };
 
@@ -1039,8 +1039,8 @@ define(['app/app'], function (app) {
               telCheckCode:$scope.telCheckCode
             }, {}, function () {
               toaster.pop('success', '成功', '手机修改成功。');
-              $scope.userInfo.userTel = $scope.user.userTel.substr(0, 3)
-                  + '****' + $scope.user.userTel.substr(7);
+              $scope.userInfo.userTel = $scope.user.newUserTel.substr(0, 3)
+                  + '****' + $scope.user.newUserTel.substr(7);
               $scope.user.userTel = null;
               $scope.user.newUserTel = null;
               $scope.checking = false;
@@ -1423,15 +1423,18 @@ define(['app/app'], function (app) {
           //检查身份证
           $scope.checkSuccess1 = false;
           $scope.checkFailed1 = false;
+          $scope.checkFailed1_1 = false;
           $scope.checkUserIdcode = function (userIdcode) {
             if (userIdcode == null) {
               //toaster.pop('error', '请输入您的身份证号');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
+              $scope.checkFailed1_1 = false;
               return;
             } else if (userIdcode.length != 18) {
               //toaster.pop('error', '请输入18位的身份证号');
               $scope.checkSuccess1 = false;
+              $scope.checkFailed1 = false;
               $scope.checkFailed1_1 = true;
               return;
             } else {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -22,7 +22,7 @@ define(['app/app'], function (app) {
               ? $scope.userInfo.userEmail.indexOf("@") : '';
           if (userEmailTemp != '') {
             $scope.userInfo.userEmail = $scope.userInfo.userEmail.substr(
-                0, userEmailTemp - 2) + "***"
+                0,1) + "***"
                 + $scope.userInfo.userEmail.substr(userEmailTemp);
           }
           // 获取企业信息
@@ -665,7 +665,7 @@ define(['app/app'], function (app) {
                 $modalInstance.close();
               }, function (response) {
                 toaster.pop('error', '错误', response.data);
-                $modalInstance.close();
+                // $modalInstance.close();
               });
             } else {
               toaster.pop('error', '错误', '重复密码不一致');
@@ -801,8 +801,8 @@ define(['app/app'], function (app) {
               toaster.pop('success', '成功', '修改邮箱成功。');
               //修改userInfo里面的userEmail
               $scope.userInfo.userEmail =$scope.user.newUserEmail.substr(
-                  0, $scope.userInfo.userEmail.indexOf("@") - 2) + "***"
-                  + $scope.user.newUserEmail.substr($scope.userInfo.userEmail.indexOf("@"));
+                  0,1) + "***"
+                  + $scope.user.newUserEmail.substr($scope.user.newUserEmail.indexOf("@"));
               $scope.user.userEmail = null;
               $scope.user.newUserEmail = null;
               $scope.checking = false;
@@ -816,7 +816,7 @@ define(['app/app'], function (app) {
               $modalInstance.close();
             }, function (response) {
               toaster.pop('error', '错误', response.data);
-              //$modalInstance.close();
+              $modalInstance.close();
             });
           };
 
@@ -946,8 +946,8 @@ define(['app/app'], function (app) {
               telCheckCode:$scope.telCheckCode
             }, {}, function () {
               toaster.pop('success', '成功', '手机修改成功。');
-              $scope.userInfo.userTel = $scope.user.userTel.substr(0, 3)
-                  + '****' + $scope.user.userTel.substr(7);
+              $scope.userInfo.userTel = $scope.user.newUserTel.substr(0, 3)
+                  + '****' + $scope.user.newUserTel.substr(7);
               $scope.user.userTel = null;
               $scope.user.newUserTel = null;
               $scope.checking = false;
@@ -1330,15 +1330,18 @@ define(['app/app'], function (app) {
           //检查身份证
           $scope.checkSuccess1 = false;
           $scope.checkFailed1 = false;
+          $scope.checkFailed1_1 = false;
           $scope.checkUserIdcode = function (userIdcode) {
             if (userIdcode == null) {
               //toaster.pop('error', '请输入您的身份证号');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
+              $scope.checkFailed1_1 = false;
               return;
             } else if (userIdcode.length != 18) {
               //toaster.pop('error', '请输入18位的身份证号');
               $scope.checkSuccess1 = false;
+              $scope.checkFailed1 = false;
               $scope.checkFailed1_1 = true;
               return;
             } else {
@@ -1397,5 +1400,4 @@ define(['app/app'], function (app) {
             $modalInstance.close();
           };
         }]);
-
 });

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -24,12 +24,12 @@
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a href="javascript:void(0)" ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
-                <div ng-hide="!(userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true)))">
+                <div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true))">
                     <li ng-class="{'active' : active == 'buyer_order'}"><a href="javascript:void(0)" ui-sref="buyer_order">订单中心</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a href="javascript:void(0)" ui-sref="buyer_invoice">发票管理</a></li>
                 </div>
-                <div ng-hide="userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true))">
+                <div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true)">
                     <li  ng-class="{'active' : active == 'buyer_order'}"><a ng-disabled="true" href="javascript:void(0)">订单中心</a></li>
                     <li ng-class="{'active' : active == 'pay_center'}"><a ng-disabled="true" href="javascript:void(0)">支付中心</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-disabled="true" href="javascript:void(0)">发票管理</a></li>

src/main/webapp/resources/view/usercenter/modal/homeCenter_modal.html

@@ -48,12 +48,10 @@
        <!-- <i class="glyphicon glyphicon-remove" ng-click="cancel()"></i>-->
     </div>
     <div class="modal-body">
-        你的账户的安全等级过低，请 <a ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>
-        <span ng-hide="userInfo.haveUserQuestion && userInfo.userEmail==null?false:true" >
-            ,<a ng-click="goLink('question')">设置密保问题</a>
-            或
-            <a ng-click="goLink('email')">绑定邮箱</a>
-        </span>来保障您的账户安全！
+        你的账户的安全等级过低，请 <a ng-show="!userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>
+        <a ng-show="!userInfo.haveUserQuestion" ng-click="goLink('question')">,设置密保问题</a>
+        <a  ng-show="!(userInfo.userEmail==null?false:true)" ng-click="goLink('email')">,绑定邮箱</a>
+        来保障您的账户安全！
         <a class="mall-btn-default" ng-click="goLink('sec')" >立即前往</a>
     </div>
 </div>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -21,7 +21,7 @@
 <div id="vendor_left_bar" class="user_left fl" ng-controller="VendorMenuCtrl">
 	<a href="javascript:void(0)" ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>
 	<ul>
-		<div ng-hide="!(userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true)))">
+		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true))">
 		<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ui-sref="vendor_order">订单中心</a></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_deliveryRule">物流管理</a></li>
 		<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ui-sref="vendorInvoice">发票管理</a></li>
@@ -51,7 +51,7 @@
 			<a href="javascript:void(0)" ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
 		</li>
 		</div>
-		<div ng-hide="userInfo.pwdEnable && (userInfo.haveUserQuestion || (userInfo.userEmail==null?false:true))">
+		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true)">
 			<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ng-disabled="true">订单中心</a></li>
 			<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ng-disabled="true">物流管理</a></li>
 			<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ng-disabled="true" >发票管理</a></li>

src/main/webapp/resources/view/vendor/modal/updateUserEmail.html

@@ -126,7 +126,7 @@
             <label class="col-md-3 col-sm-3 col text-right">验证码：</label>
             <div class="col-md-8 col-sm-8 col">
                 <input ng-model="checkCode"
-                       class="form-control input-sm"  type="checkCode" ng-blur="validCheckCode(checkCode)" required>
+                       class="form-control input-sm" placeholder="请输入验证码" type="checkCode" ng-blur="validCheckCode(checkCode)" required>
                 <input ng-click="sendCheckCode(user.newUserEmail)" ng-disabled="!sendSuccess" ng-init="paracont='获取验证码'" class="code-btn" ng-model="paracont"/>
             </div>
             <div class="col">

src/main/webapp/resources/view/vendor/modal/updateUserQuestion.html

@@ -2,7 +2,8 @@
     .userQuestion .modal-body .row {
         line-height: 34px;
         font-size: 14px;
-        color: #666
+        color: #666;
+        height:39px;
     }
     .modal-content {
         width: 409px;