Merge branch 'dev-mysql' into feature-newHome

# Conflicts:
#	src/main/java/com/uas/platform/b2c/common/search/rpc/service/Impl/SearchServiceImpl.java

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

@@ -400,8 +400,7 @@ public class UserController {
 			if (!userService.isTelUseable(newUserTel)) {
 				throw new IllegalOperatorException("手机号不可用...");
 			}
-			user.setUserTel(newUserTel);
-			user = userService.save(user);
+			user = userService.updateUserTel(userTel,newUserTel,user.getUserUU());
 			if(sysUser.getEnterprise()!=null){
 				user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			}

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

@@ -78,7 +78,7 @@ public interface UserService {
 	List<User> findAll();
 
 	/**
-	 * 保存用户信息(邮箱，手机，姓名)
+	 * 保存用户信息(邮箱，姓名)
 	 * @param user
 	 * @return
 	 */
@@ -151,4 +151,13 @@ public interface UserService {
 	 * @return
 	 */
 	Page<User> getPageStatusRealAuth(final PageParams pageInfo, Short idEnable);
+
+	/**
+	 * 修改手机号
+	 * @param oldTel
+	 * @param newTel
+	 * @param uu
+	 * @return
+	 */
+	User updateUserTel(String oldTel,String newTel,Long uu);
 }

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

@@ -37,6 +37,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -458,4 +459,27 @@ public class UserServiceImpl implements UserService {
 			}
 		}, info);
 	}
+
+	@Override
+	public User updateUserTel(String oldTel, String newTel,Long uu) {
+		//旧手机号是否正确
+		User user = userDao.findOne(uu);
+			if(!user.getUserTel().equals(oldTel)){
+				throw new IllegalOperatorException("旧手机号错误");
+			}
+			try {
+				if(!StringUtils.isEmpty(oldTel) && !StringUtils.isEmpty(newTel)) {
+					//保存数据库
+					List<com.uas.account.entity.User> users = AccountUtils.updateTel(oldTel, newTel);
+					if (users != null && users.size() > 0) {
+						user.setUserTel(users.get(0).getUid());
+						user = userDao.save(user);
+						return user;
+					}
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			return null;
+		}
 }

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

@@ -75,8 +75,12 @@ public class UserServiceImpl implements UserService {
         if (!StringUtils.isEmpty(user.getDialectUID())) {
             u.setUserUU(Long.valueOf(user.getDialectUID()));
         }
-        u.setPwdSecLevel(user.getPwdSecLevel());
-        u.setLastLoginTime(user.getLastLoginTime());
+        if (user.getPwdSecLevel()!=null) {
+            u.setPwdSecLevel(user.getPwdSecLevel());
+        }
+        if(user.getLastLoginTime()!=null){
+            u.setLastLoginTime(user.getLastLoginTime());
+        }
         Enterprise enterprise = null;
         if(user.getSpaceDialectUID()!=null){
             enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));

src/main/java/com/uas/platform/b2c/common/search/constant/SearchUrl.java

@@ -10,23 +10,23 @@ public class SearchUrl {
     /**
      * 获取类目id
      */
-    public static final String KIND_ID_URL = "/search/kindIds/{keyword}";
+    public static final String KIND_ID_URL = "/search/kindIds?keyword={keyword}";
 
     /**
      * 获取类目的数据
      *
      */
-    public static final String KIND_INFO_URL = "/search/kinds/{keyword}?page={page}&size={size}";
+    public static final String KIND_INFO_URL = "/search/kinds?keyword={keyword}?page={page}&size={size}";
 
     /**
      * 搜索品牌的id
      */
-    public static final String BRAND_ID_URL = "/search/brandIds/{keyword}?page={page}&size={size}";
+    public static final String BRAND_ID_URL = "/search/brandIds?keyword={keyword}?page={page}&size={size}";
 
     /**
      * 搜索品牌的具体信息
      */
-    public static final String BRAND_INFO_URL = "/search/brands/{keyword}?page={page}&size={size}";
+    public static final String BRAND_INFO_URL = "/search/brands?keyword={keyword}?page={page}&size={size}";
 
 
     /**
@@ -59,38 +59,38 @@ public class SearchUrl {
     /**
      * 根据关键字联想
      */
-    public static final String SIMILAR_KEYWORD_URL = "/search/similarKeywords/{keyword}";
+    public static final String SIMILAR_KEYWORD_URL = "/search/similarKeywords?keyword={keyword}";
 
 
     /**
      * 根据关键字联想器件
      */
-    public static final String SIMILAR_COMPONENT_URL = "/search/similarComponents/{keyword}";
+    public static final String SIMILAR_COMPONENT_URL = "/search/similarComponents?keyword={keyword}";
 
 
     /**
      * 根据关键字联想品牌
      */
-    public static final String SIMILAR_BRAND_URL = "/search/similarBrands/{keyword}";
+    public static final String SIMILAR_BRAND_URL = "/search/similarBrands?keyword={keyword}";
 
 
     /**
      * 根据关键字联想类目
      */
-    public static final String SIMILAR_KIND_URL = "/search/similarKinds/{keyword}";
+    public static final String SIMILAR_KIND_URL = "/search/similarKinds?keyword={keyword}";
 
 
 
     /**
      * 获取某个信息的叶子节点
      */
-    public static final String SIMILAR_LEAF_KIND_URL = "/search/similarLeafKinds/{keyword}";
+    public static final String SIMILAR_LEAF_KIND_URL = "/search/similarLeafKinds?keyword={keyword}";
 
 
     /**
      * 获取类目的层级
      */
-    public static final String SIMILAR__KIND_LEVEL_URL = "/search/similarKindsByLevel?kindName={kindName}&level={level}";
+    public static final String SIMILAR__KIND_LEVEL_URL = "/search/similarKindsByLevel?keyword={kindName}&level={level}";
 
 
     /**

src/main/java/com/uas/platform/b2c/common/search/controller/SearcherController.java

@@ -271,8 +271,8 @@ public class SearcherController {
 	 */
 	@RequestMapping(value = "/similarKeywords", method = RequestMethod.GET)
 	@ResponseBody
-	public List<String> getSimilarKeywords(String keyword) {
-		return (List<String>) searcherService.getSimilarKeywords(keyword).get("all");
+	public Map<String,Object> getSimilarKeywords(String keyword) {
+		return  searcherService.getSimilarKeywords(keyword);
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/common/search/rpc/service/Impl/SearchServiceImpl.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2c.common.search.rpc.service.Impl;
 
 
-import com.uas.platform.b2c.common.search.constant.SearchParam;
+import com.alibaba.fastjson.JSONArray;
 import com.uas.platform.b2c.common.search.constant.SearchUrl;
 import com.uas.platform.b2c.common.search.rpc.service.SearchService;
 import com.uas.platform.b2c.core.config.SysConf;
@@ -92,14 +92,14 @@ public class SearchServiceImpl implements SearchService{
     }
 
     @Override
-    public SPage<Map<String, Object>> getBrands(String keyword, Integer page, Integer size) throws SearchException {
+    public SPage<Map<String, List<Integer>>> getBrands(String keyword, Integer page, Integer size) throws SearchException {
         Map<String, Object> map = initSearchMap(keyword, page, size);
         String str = restTemplate.getForObject(sysConf.getSearchUrl() + SearchUrl.BRAND_INFO_URL, String.class, map);
         if(StringUtils.isEmpty(str)) {
             return null;
         }else {
             try {
-                SPage<Map<String, Object>> sPage = FastjsonUtils.fromJson(str, SPage.class);
+                SPage<Map<String, List<Integer>>> sPage = FastjsonUtils.fromJson(str, SPage.class);
                 return sPage;
             }catch (Exception e) {
                 e.printStackTrace();
@@ -109,7 +109,7 @@ public class SearchServiceImpl implements SearchService{
     }
 
     @Override
-    public Map<String, Object> getComponentIds(String keyword, SearchParam var2) throws SearchException {
+    public Map<String, Object> getComponentIds(String keyword, PageParams var2) throws SearchException {
         Map<String, Object> map = new HashedMap();
         map.put("keyword", keyword);
         map.put("params", FlexJsonUtils.toJsonDeep(var2));
@@ -216,9 +216,9 @@ public class SearchServiceImpl implements SearchService{
         }else {
             try {
                 List<String> reMapA = FastjsonUtils.fromJson(strA, List.class);
-                List<String> reMapC = FastjsonUtils.fromJson(strC, List.class);
-                List<String> reMapB = FastjsonUtils.fromJson(strB, List.class);
-                List<String> reMapK = FastjsonUtils.fromJson(strK, List.class);
+                List<Object> reMapC = FastjsonUtils.fromJsonArray(strC);
+                List<Object> reMapB = FastjsonUtils.fromJsonArray(strB);
+                List<Object> reMapK = FastjsonUtils.fromJsonArray(strK);
                 map.clear();
                 map.put("all",reMapA);
                 map.put("kind",reMapK);
@@ -345,7 +345,7 @@ public class SearchServiceImpl implements SearchService{
     }
 
     @Override
-    public Map<String, Object> getGoodsIds(String keyword, SearchParam var2) throws SearchException {
+    public Map<String, Object> getGoodsIds(String keyword, PageParams var2) throws SearchException {
         Map<String, Object> map = new HashedMap();
         map.put("keyword", keyword);
         map.put("params", FlexJsonUtils.toJsonDeep(var2));

src/main/java/com/uas/platform/b2c/external/erp/prod/service/impl/ProdServiceImpl.java

@@ -13,6 +13,7 @@ import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.apache.log4j.Logger;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 
@@ -49,15 +50,17 @@ public class ProdServiceImpl implements ProdService {
             List<Product> productExists = productDao.getProductByEnUUAndProdNum(enuu, prod.getPr_code());
             Product product = ModelConverter.convert(prod);
             if (!CollectionUtils.isEmpty(productExists)) {
-                product.setId(productExists.get(0).getId());
-                product.setCmpUuId(null);// 将已存在的变更过物料uuid置为null，以便后续进行重新匹配
+                Product existProduct = productExists.get(0);
+                BeanUtils.copyProperties(product, productExists.get(0), "id");
+                existProduct.setCmpUuId(null);// 将已存在的变更过物料uuid置为null，以便后续进行重新匹配
+                products.add(existProduct);
+            } else {
+                products.add(product);
             }
-            products.add(product);
         }
         productDao.save(products);// 保存上传的物料
 
-        logger.log("物料资料", "上传物料资料,数量：" + prods.size());
-        loggerOut.info("--------------" + SystemSession.getUser().getEnterprise().getEnName() + " 上传物料资料,数量：" + prods.size() + "---------------");
+        logger.log("物料资料",  SystemSession.getUser().getEnterprise().getEnName() + "上传物料资料,数量：" + prods.size());
         return "success";
     }
 

src/main/java/com/uas/platform/b2c/logistics/service/impl/AddressServiceImpl.java

@@ -148,6 +148,7 @@ public class AddressServiceImpl implements AddressService {
 					num =addressDao.getCountByUseruuTypeUsetypeAndDissociative(user.getUserUU(),address.getType(), address.getUsetype(), Type.PERSONAL.value());
 				}
 			}else {
+				address.setUseruu(user.getUserUU());
 				address.setEnuu(user.getEnterprise().getUu());
 				address.setUsetype((short)2);
 				num = addressDao.getCountByEnuuAndTypeAndUsetype(user.getEnterprise().getUu(), address.getType(), address.getUsetype());
@@ -156,13 +157,13 @@ public class AddressServiceImpl implements AddressService {
 		}
 		Long modifyId = address.getId();
 		Address add = save(address);
-		if (modifyId == null && add.getNum().intValue() == 1){
+		if (modifyId == null && add.getNum() == 1){
 			isSetTop = true;
 		}
 		if(modifyId == null || isSetTop) { //只有新增加的地址 或者需要被置顶的地址 才需要重新排序。
 			setTop(add.getId(), isSetTop);
 		}
-		if (address.getNum().intValue() == 1 && !isSetTop) { //取消默认地址的时候需要重新排序
+		if (address.getNum() == 1 && !isSetTop) { //取消默认地址的时候需要重新排序
 			setTop(add.getId(), isSetTop);
 		}
 		return add;
@@ -173,9 +174,9 @@ public class AddressServiceImpl implements AddressService {
 		List<Address> address = new ArrayList<Address>();
 		if (send) {
 			if (enuu != null) {
-				address = addressDao.findByUseruuAndEnuuAndTypeAndUsetypeOrderByNumAsc(useruu, enuu, Type.Address_Sending_Code.value(), (short)1);
+				address = addressDao.findByEnuuAndTypeAndUsetypeOrderByNumAsc(enuu, Type.Address_Sending_Code.value(), (short)2);
 			} else {
-				address = addressDao.findByUseruuAndTypeAndUsetypeAndDissociative(useruu, Type.Address_Sending_Code.value(), (short)1, Type.PERSONAL.value());
+				address = addressDao.findByUseruuAndTypeAndUsetypeAndDissociative(useruu, Type.Address_Sending_Code.value(), (short)2, Type.PERSONAL.value());
 			}
 		} else {
 			if (enuu != null) {

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -95,9 +95,9 @@ public class GoodsController {
 		PageInfo info = new PageInfo(params);
 		Long enUU = SystemSession.getUser().getEnterprise().getUu();
 		info.filter("enUU", enUU);
-		if (status.equals("AVAILABLE")) {
+		if ("AVAILABLE".equals(status)) {
 			info.filter("status", Status.AVAILABLE.value());
-		} else if (status.equals("UNAVAILABLE")) {
+		} else if ("UNAVAILABLE".equals(status)) {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
@@ -116,9 +116,9 @@ public class GoodsController {
     @RequestMapping(value = "/saling/admin", method = RequestMethod.GET)
 	public Page<Goods> findSalingGoodsAdmin(PageParams params, String status, String keyword) {
 		PageInfo info = new PageInfo(params);
-		if (status.equals("AVAILABLE")) {
+		if ("AVAILABLE".equals(status)) {
 			info.filter("status", Status.AVAILABLE.value());
-		} else if (status.equals("UNAVAILABLE")) {
+		} else if ("UNAVAILABLE".equals(status)) {
 			info.filter("status", Status.UNAVAILABLE.value());
 		}
 		Page<Goods> page = goodsService.findPageByStatus(info, keyword);
@@ -214,7 +214,8 @@ public class GoodsController {
     @RequestMapping(value = "/simple/byUuidAndCurrency", method = RequestMethod.GET, params = "_status=available")
 	@ResponseBody
 	public List<GoodsSimple> findSimpleAvailableByUuid(String uuid, String currencyName) {
-		if (StringUtils.isEmpty(currencyName) || "without".equals(currencyName)) {// 不进行币别筛选
+		// 不进行币别筛选
+		if (StringUtils.isEmpty(currencyName) || "without".equals(currencyName)) {
 			logger.log("商品批次", "根据商品uuid获取有效的商品批次", "uuid: " + uuid);
 			return goodsService.findSimpleAvailableByUuid(uuid);
 		} else {

src/main/resources/prod/account.properties

@@ -11,7 +11,7 @@ sso.cookie.secure=true
 sso.cookie.httponly=true
 sso.login.url=https://account.ubtob.com/sso/login
 sso.logout.url=https://account.ubtob.com/sso/logout
-sso.register.url=http://account.ubtob.com/sso/register
+sso.register.url=https://account.ubtob.com/sso/register_p
 
 #cross domain
 sso.ask.url=https://account.ubtob.com/sso/login/ask

src/main/webapp/resources/js/common/query/brand.js

@@ -1,7 +1,7 @@
 define([ 'ngResource' ], function() {
 	angular.module('brandServices', [ 'ngResource' ]).factory('BrandsSubmit', ['$resource', 'BaseService', function($resource, BaseService) {
 		//获取BrandSubmit的分页数据
-		var rootPath = BaseService.getRootPath();
+		var rootPath = BaseService.getRootPath() + '/';
 		return $resource('produce/brandSubmit', {}, {
 			//未审核
 			getUnAudited : {
@@ -18,7 +18,7 @@ define([ 'ngResource' ], function() {
 		});
 	}]).factory('BrandSubmit', ['$resource', 'BaseService', function($resource, BaseService) {
 		//对单个BrandSubmit的操作
-		var rootPath = BaseService.getRootPath();
+		var rootPath = BaseService.getRootPath() + '/';
 		return $resource('produce/brandSubmit/:id', {}, {
 			//提交（保存）
 			submit : {

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

@@ -1,4 +1,10 @@
 <style>
+    .modal {
+        top: 0;
+        left: 0;
+        margin-left: 0;
+        margin-top: 0;
+    }
 .modal-dialog{
     width: 795px;
 }

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

@@ -24,6 +24,8 @@
         padding-bottom: 5px;
         border-radius: 3px;
         min-height: 34px;
+        max-height: 94px;
+        overflow-y: auto;
     }
     .dis-manage-header-item {
         display: inline-block;