Merge remote-tracking branch 'origin/release-201846-wangcz' into release-201846-wangcz

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

@@ -429,7 +429,10 @@ public class UserServiceImpl implements UserService {
 			user.setUserUU(addssoUser.getUserUU());
 			user.addEnterprise(SystemSession.getUser().getEnterprise());
 			user.setCurrentEnterprise();
-			user = userDao.save(user);
+			List<User> exitUser = userDao.findUserByUserUU(addssoUser.getUserUU());
+			if (CollectionUtils.isEmpty(exitUser)) {
+				user = userDao.save(user);
+			}
 		} catch (Exception e) {
 			throw new RuntimeException(e.getMessage());
 		}

src/main/java/com/uas/platform/b2c/prod/product/common/service/impl/CreateNumberServiceImpl.java

@@ -1,24 +1,26 @@
 package com.uas.platform.b2c.prod.product.common.service.impl;
 
-import com.uas.platform.b2c.prod.commodity.controller.GoodsController;
 import com.uas.platform.b2c.prod.product.common.dao.CreateNumberDao;
 import com.uas.platform.b2c.prod.product.common.model.CreateNumber;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import com.uas.platform.b2c.core.utils.DateFormatUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.Serializable;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class CreateNumberServiceImpl implements CreateNumberService {
@@ -78,8 +80,19 @@ public class CreateNumberServiceImpl implements CreateNumberService {
 	    while((times < 10) && !success) {
             String time = getTime();
             int num = 0;
-            CreateNumber createNumber = createNumberDao.findByTbname(tnName);
-            if (createNumber == null) {
+			List<CreateNumber> numbers = jdbcTemplate.query("select cn_number, cn_tbname, cn_time from product$creat_number where cn_tbname = '" + tnName + "'", new RowMapper<CreateNumber>() {
+
+				@Override
+				public CreateNumber mapRow(ResultSet resultSet, int i) throws SQLException {
+					CreateNumber createNumber = new CreateNumber();
+					createNumber.setTbname(resultSet.getString("cn_tbname"));
+					createNumber.setNumber(resultSet.getInt("cn_number"));
+					createNumber.setTime(resultSet.getString("cn_time"));
+					return createNumber;
+				}
+			});
+			CreateNumber createNumber = null;
+            if (CollectionUtils.isEmpty(numbers)) {
                 num = (addNums.length > 0) ? (num + addNums[0]) : (num + 1);
                 createNumber = new CreateNumber(tnName, time, num + 1);
                 try {
@@ -90,6 +103,7 @@ public class CreateNumberServiceImpl implements CreateNumberService {
                     e.printStackTrace();
                 }
             } else {
+				createNumber = numbers.get(0);
                 //如果已经存在createNumber信息
                 Integer originNum = createNumber.getNumber();
                 String originTime = createNumber.getTime();

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -248,7 +248,7 @@ define(['app/app'], function (app) {
                 toaster.pop('error', '请输入用户名信息');
                 return;
             }
-            if (!$scope.userTelSuccess && !$scope.userEmailSuccess) {
+            if (!$scope.userEmailSuccess || !$scope.userTelSuccess) {
                 toaster.pop('error', '请输入正确的信息后提交');
                 return;
             }
@@ -262,12 +262,11 @@ define(['app/app'], function (app) {
                 $scope.tableParams.page(1);
                 $scope.tableParams.reload();
                 $scope.adding = false;
-                // $scope.newUserForm.newUserTel.$setValidity('available', false);
+                // $scope.newUserForm.newUser.userTel.$setValidity('available', false);
                 // $scope.newUserForm.newUserEmail.$setValidity('available', false);
                 $scope.userTelSuccess = false;
+                $scope.userEmailSuccess = true;
                 $scope.userTelError = false;
-                $scope.userEmailSuccess = false;
-                $scope.userEmailError = false;
             }, function (response) {
                 $scope.loading = false;
                 toaster.pop('error', '错误', response.data);
@@ -369,6 +368,7 @@ define(['app/app'], function (app) {
          */
         $scope.emailValid = function (email) {
             var reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+            console.log(email)
             if (email) {
                 reg.test(email) ? $scope.userEmailSuccess = true : $scope.userEmailSuccess = false;
             } else {

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

@@ -86,6 +86,9 @@ define(['app/app', 'jquery-uploadify'], function (app) {
 									var newBrand = {};
 									newBrand.name = brand.name;
 									newBrand.url = brand.url;
+									if(isPdf(brand.url)) {
+										newBrand.isPdf = true
+									}
 									$scope.brands.push(newBrand);
 								});
 							}

src/main/webapp/resources/view/sso/staffManagement.html

@@ -968,12 +968,14 @@
                         <!--</td>-->
                         <td ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
                             <input ng-model="newUser.userTel"
+                                   autocomplete="off"
                                    ng-blur="telValid(newUser.userTel)" required name="newUserTel"
                                    ng-pattern="/^1\d{10}$/" type="text" placeholder="手机">
                         </td>
                         <td ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
                             <input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
                                    ng-blur="emailValid(newUser.userEmail)"
+                                   autocomplete="off"
                                    name="newUserEmail" type="text"
                                    placeholder="邮箱">
                         </td>

src/test/java/com/uas/platform/b2c/javase/collection/TableOrderTest.java

@@ -7,6 +7,7 @@ import com.uas.platform.b2c.prod.commodity.model.Product;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -46,4 +47,13 @@ public class TableOrderTest extends BaseJunitTest {
             System.out.println("sfsaf");
         }
     }
+
+    @Transactional
+    @Test
+    public void testA() {
+        for (int i = 0; i < 5; i++) {
+            String timeNumber = createNumberService.getTimeNumber("trade$order_detail", 8);
+            System.out.println(timeNumber);
+        }
+    }
 }