添加用户时增加加载符号，通知用户邮件模板更新

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10529 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/service/impl/UserServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.util.StringUtils;
 
 import com.uas.account.entity.UserDetail;
 import com.uas.account.util.AccountUtils;
+import com.uas.message.mail.service.MailService;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.DistributeDao;
 import com.uas.platform.b2b.dao.EnterpriseDao;
@@ -34,6 +35,7 @@ import com.uas.platform.b2b.model.UserInfo;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
+import com.uas.platform.b2b.support.MessageConf;
 import com.uas.platform.b2b.support.SendMailService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.TokenService;
@@ -69,7 +71,10 @@ public class UserServiceImpl implements UserService {
 	private EnterpriseDao enterpriseDao;
 	@Autowired
 	private CommonDao commonDao;
-
+	@Autowired
+	private MailService mailService;
+	@Autowired
+	private MessageConf messageConf;
 	static final String TEL_REGEXP = "^((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18|17)\\d{9}$";
 
 	static final String UU_REGEXP = "^\\d{4,}$";
@@ -329,7 +334,9 @@ public class UserServiceImpl implements UserService {
 		model.put("dateTime", timeFormat.format(new Date()));
 		model.put("userTel", user.getUserTel());
 		model.put("rootpath", AgentUtils.getHost(request));
-		sendMailService.sendTemplateMail(user.getUserEmail(), "欢迎使用UAS商务平台", model, "velocity/newUser.vm");
+		if (user.getUserEmail() != null) {
+			mailService.send(messageConf.getTplInvitationForB2B(), user.getUserEmail(), model);
+		}
 		return user;
 	}
 

src/main/java/com/uas/platform/b2b/support/MessageConf.java

@@ -7,16 +7,25 @@ import org.springframework.stereotype.Component;
 public class MessageConf {
 
 	/**
-	 * 模板id：邀请客户注册优软模板id
+	 * 邮件模板id：邀请客户注册优软模板id
 	 * 
 	 * @return
 	 */
 	@Value("#{message.tplInvitationForB2B}")
 	private String tplInvitationForB2B;
 
+	/**
+	 * 短信模板id：邀请客户注册优软模板id
+	 */
 	@Value("#{message.msgInvitationForB2B}")
 	private String msgInvitationForB2B;
 
+	/**
+	 * 邮件模板id: 平台添加人员后通知相关人员模板id
+	 */
+	@Value("#{message.tplAfterBeAddedtoB2B}")
+	private String tplAfterBeAddedtoB2B;
+
 	public String getTplInvitationForB2B() {
 		return tplInvitationForB2B;
 	}
@@ -33,4 +42,12 @@ public class MessageConf {
 		this.msgInvitationForB2B = msgInvitationForB2B;
 	}
 
+	public String getTplAfterBeAddedtoB2B() {
+		return tplAfterBeAddedtoB2B;
+	}
+
+	public void setTplAfterBeAddedtoB2B(String tplAfterBeAddedtoB2B) {
+		this.tplAfterBeAddedtoB2B = tplAfterBeAddedtoB2B;
+	}
+
 }

src/main/resources/dev/message.properties

@@ -1,2 +1,3 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
 msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2

src/main/resources/prod/message.properties

@@ -1,2 +1,3 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
-msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
+msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2

src/main/resources/test/message.properties

@@ -1,2 +1,3 @@
 tplInvitationForB2B=e472f874-0579-4ca2-9bb8-2635109dc7f3
-msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
+msgInvitationForB2B=73c513f8-7423-49c4-b57c-50a63bd8a0af
+tplAfterBeAddedtoB2B=b9dee589-9fd8-45d3-9b2a-64b56d65e7e2

src/main/webapp/resources/js/index/app.js

@@ -9014,6 +9014,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         });
         var loadUsers = function () {
+        	$scope.loading = true;
         	if($scope.searchMthod) {
         		AccountUser.findUsersByKeyword({keyword: $scope.keyword}, {}, function(data) {
         			 users = data;
@@ -9109,7 +9110,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
          */
         $scope.addUser = function () {
             $scope.adding = true;
+            $scope.loading = true;
             AccountUser.save({}, $scope.newUser, function () {
+            	$scope.loading = false;
                 toaster.pop('success', '提示', '增加用户成功：' + $scope.newUser.userName);
                 $scope.newUser = {userSex: 'M'};
                 loadUsers();
@@ -9121,6 +9124,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.userEmailSuccess = false;
                 $scope.userEmailError = false;
             }, function (response) {
+            	$scope.loading = false;
                 toaster.pop('error', '错误', response.data);
             });
         };

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -254,8 +254,8 @@ width: 80px;
                 <div class="col-xs-6">
                     <div class="search">
                         <div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-                            <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入物料名称、编号或规格搜索" />
-                            <a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+                            <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="输入物料名称、编号或规格搜索" />
+                            <a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
                         </div>
                     </div>
                 </div>