【UAS获取供应商资料接口】供应商及客户资料详情点uu设置、列表筛选批量获取uu，增加返回值营业执照、法人、企业地址等信息。

src/main/java/com/uas/platform/b2b/controller/PublicQueryController.java

@@ -1,39 +1,9 @@
 package com.uas.platform.b2b.controller;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import com.alibaba.fastjson.JSONObject;
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
-import com.uas.platform.b2b.model.AccessToken;
-import com.uas.platform.b2b.model.Enterprise;
-import com.uas.platform.b2b.model.EnterpriseDetail;
-import com.uas.platform.b2b.model.QueriableMember;
-import com.uas.platform.b2b.model.QueriableUser;
-import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.AccessTokenService;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.MonthProdioService;
@@ -42,6 +12,19 @@ import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.StringUtil;
 import com.uas.platform.core.util.encry.Md5Utils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
 
 /**
  * 对可信任第三方公开的资料查询接口
@@ -112,7 +95,7 @@ public class PublicQueryController {
 	 */
 	@RequestMapping(value = "/batch/members", method = RequestMethod.GET)
 	@ResponseBody
-	public Map<String, Object> queryEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
+	public Map<String, Map<String, Object>> queryEnterprises(@RequestParam("data") String data) throws UnsupportedEncodingException {
 		if (!StringUtils.isEmpty(data)) {
 			List<String> accounts = null;
 			// data = URLDecoder.decode(data, "UTF-8");
@@ -125,10 +108,15 @@ public class PublicQueryController {
 			}
 			List<Object[]> backInfo = enterpriseService.findByEnNames(accounts);
 			Map<String, Object> infos = new HashMap<String, Object>();
+			Map<String, Map<String, Object>> map = new HashMap<>();
 			for (Object[] objs : backInfo) {
-				infos.put(objs[1].toString(), objs[0]);
+				infos.put("uu", objs[0]);
+				infos.put("businessCode", objs[2]);
+				infos.put("address", objs[3]);
+				infos.put("corporation", objs[4]);
+				map.put(objs[1].toString(), infos);
 			}
-			return infos;
+			return map;
 		}
 		return null;
 	}

src/main/java/com/uas/platform/b2b/erp/model/B2BCustomer.java

@@ -67,7 +67,7 @@ public class B2BCustomer {
     private String cu_industry;
 
     /**
-     * 主营业务
+     * 经营范围
      */
     private String cu_mainbusiness;
 

src/main/java/com/uas/platform/b2b/erp/model/B2BVendor.java

@@ -77,7 +77,7 @@ public class B2BVendor {
     private Short servicerSwitch;
 
     /**
-     * 主营业务
+     * 经营范围
      */
     private String ve_businessrange;
 

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

@@ -181,7 +181,7 @@
 							</div>
 							<div class="row">
 								<div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::customer.myEnterprise.profession"></span></div>
-								<div class="col-md-7"><span class="text-muted">主营业务：</span><span ng-bind="::customer.myEnterprise.tags"></span></div>
+								<div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::customer.myEnterprise.tags"></span></div>
 							</div>
 							<div class="row">
 								<div class="col-md-12">

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

@@ -380,7 +380,7 @@
                 </div>
                 <div class="row">
                     <div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::request.enterprise.profession"></span></div>
-                    <div class="col-md-7"><span class="text-muted">主营业务：</span><span ng-bind="::request.enterprise.tags"></span></div>
+                    <div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::request.enterprise.tags"></span></div>
                 </div>
                 <div class="row col-md-12"><span class="text-muted">企业地址：</span><span ng-bind="::request.enterprise.enAddress"></span></div>
             </td>

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

@@ -198,7 +198,7 @@
 							</div>
 							<div class="row">
 								<div class="col-md-3"><span class="text-muted">行业：</span><span ng-bind="::vendor.vendorEnterprise.profession"></span></div>
-								<div class="col-md-7"><span class="text-muted">主营业务：</span><span ng-bind="::vendor.vendorEnterprise.tags"></span></div>
+								<div class="col-md-7"><span class="text-muted">经营范围：</span><span ng-bind="::vendor.vendorEnterprise.tags"></span></div>
 							</div>
 							<div class="row">
 								<div class="col-md-12">