Merge branch 'dev-mysql' into feature_release-tomysql

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

@@ -195,14 +195,28 @@ public class UsageLog extends BufferedLogable implements Serializable {
 	}
 
 	public String getUserTel() {
+		if(user.getUserTel()!=null){
+			return user.getUserTel().substring(0,user.getUserTel().length()-(user.getUserTel().substring(3)).length())+"****"+user.getUserTel().substring(7);
+		}
 		return user.getUserTel();
 	}
 
 	public String getUserEmail() {
+		if(user.getUserEmail()!=null){
+			String email = user.getUserEmail();
+			int index = org.apache.commons.lang.StringUtils.indexOf(user.getUserEmail(), "@");
+			if (index <= 1)
+				return user.getUserEmail();
+			else
+				return org.apache.commons.lang.StringUtils.rightPad(org.apache.commons.lang.StringUtils.left(email, 1), index, "*").concat(org.apache.commons.lang.StringUtils.mid(email, index, org.apache.commons.lang.StringUtils.length(email)));
+		}
 		return user.getUserEmail();
 	}
 
 	public String getUserName() {
+		if(user.getUserName()!=null){
+			return user.getUserName().substring(0,1)+"**";
+		}
 		return user.getUserName();
 	}
 

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

@@ -634,7 +634,11 @@ define([ 'app/app' ], function(app) {
 				$scope.saleAccount = $scope.salePerAccount;
 			}
 			if(angular.isUndefined($scope.saleAccount)||angular.equals("{}", angular.toJson($scope.saleAccount)) || $scope.saleAccount == null) {
-				toaster.pop('info', '提示', '请选择卖家账户');
+				if ($scope.type == 'PAIDTOVENDOR') {
+					toaster.pop('info', '提示', '尚未选择收款账户，请联系卖家处理');
+				} else {
+					toaster.pop('info', '提示', '请选择卖家账户');
+				}
 				return ;
 			}
 			if(!str || str == ''){

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

@@ -1674,7 +1674,7 @@ define(['app/app'], function (app) {
                 return ;
             }
             Purchase.sellerCancelOrder({purchaseId : purchaseid, reason : $scope.purchase.reason}, null, function () {
-                toaster.pop('success','操作成功，等待卖家确认');
+                toaster.pop('success','操作成功，等待买家确认');
                 $modalInstance.close();
                 // $scope.reloadRoute();
             }, function (res) {

src/main/webapp/resources/view/admin/logUsage.html

@@ -55,13 +55,13 @@
 			<tbody ng-repeat="logUsage in $data">
 				<tr class="text-center">
 					<td><span ng-bind="logUsage.userUU"></span></td>
-					<td><span ng-bind="logUsage.user.userName"></span></td>
+					<td><span ng-bind="logUsage.userName"></span></td>
 					<td><span ng-bind="logUsage.title"></span></td>
 					<td><span ng-bind="logUsage.message+logUsage.detail"></span></td>
 					<td><span ng-bind="logUsage.time | date:'yyyy-MM-dd HH:mm:ss'"></span></td>
 					<td><span ng-bind="logUsage.ip"></span></td>
-					<td><span ng-bind="logUsage.user.userTel"></span></td>
-					<td><span ng-bind="logUsage.user.userEmail"></span></td>
+					<td><span ng-bind="logUsage.userTel"></span></td>
+					<td><span ng-bind="logUsage.userEmail"></span></td>
 				</tr>
 			</tbody>
 		</table>

src/main/webapp/resources/view/usercenter/forstore/buyer_transfer.html

@@ -60,6 +60,7 @@
 						<div ng-if="type == 'PAIDTOVENDOR'" ng-bind="salePerAccount.bankname" title="{{salePerAccount.bankname}}" class="word-in-10"></div>
 						<div ng-if="type == 'PAIDTOVENDOR'" ng-bind="salePerAccount.number"></div>
 						<div ng-if="type == 'PAIDTOVENDOR'" ng-bind="salePerAccount.accountname"></div>
+						<div ng-if="!salePerAccount || salePerAccount == null"><i class="fa fa-exclamation-circle" style="color: #5078cb;margin-right: 5px;"></i>尚未选择收款账户，请联系卖家处理</div>
 					</li>
 				</ul>
 			</div>