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

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

@@ -0,0 +1,77 @@
+package com.uas.platform.b2b.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.User;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.UserService;
+
+/**
+ * 对外公开的资料查询接口
+ * <p>
+ * 只提供有限资料
+ * </p>
+ * 
+ * @author yingp
+ *
+ */
+@Controller
+@RequestMapping("/public/queriable")
+public class PublicQueryController {
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+
+	@Autowired
+	private UserService userService;
+
+	/**
+	 * 按UU号查找企业信息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/members/{uu}", method = RequestMethod.GET)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public ModelMap getEnterprise(@PathVariable("uu") Long uu) {
+		Enterprise enterprise = enterpriseService.findById(uu);
+		if (enterprise != null) {
+			ModelMap map = new ModelMap();
+			map.put("name", enterprise.getEnName());
+			map.put("shortname", enterprise.getEnShortname());
+			map.put("address", enterprise.getEnAddress());
+			return map;
+		}
+		return null;
+	}
+
+	/**
+	 * 按UU号查找用户信息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/members/{enUU}/users/{userUU}", method = RequestMethod.GET)
+	@ResponseBody
+	@ResponseStatus(value = HttpStatus.OK)
+	public ModelMap getUser(@PathVariable("enUU") Long enUU, @PathVariable("userUU") Long userUU) {
+		User user = userService.findUserByEnUUAndUserUU(enUU, userUU);
+		if (user != null) {
+			ModelMap map = new ModelMap();
+			map.put("name", user.getUserName());
+			map.put("tel", user.getUserTel());
+			map.put("email", user.getUserEmail());
+			return map;
+		}
+		return null;
+	}
+
+}

src/main/java/com/uas/platform/b2b/service/UserService.java

@@ -62,6 +62,15 @@ public interface UserService {
 	 * @return
 	 */
 	User findUserByUserUU(Long userUU);
+	
+	/**
+	 * 按企业及个人uu取用户信息
+	 * 
+	 * @param enUU
+	 * @param userUU
+	 * @return
+	 */
+	User findUserByEnUUAndUserUU(Long enUU, Long userUU);
 
 	/**
 	 * 按email取用户信息

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

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.User;
@@ -184,4 +185,10 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
+	@Override
+	public User findUserByEnUUAndUserUU(Long enUU, Long userUU) {
+		List<User> users = userDao.findByEnUUAndUserUU(enUU, userUU);
+		return CollectionUtils.isEmpty(users) ? null : users.get(0);
+	}
+
 }

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -427,7 +427,7 @@
 						<span class="text-trans warning">已报价</span>
 						<div ng-if="inquiryItem.replyable" style="padding-top: 50px;">
 							<div ng-show="!inquiryItem.$editing">
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">修 改<br>报 价</a>
+								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">修改报价</a>
 							</div>
 							<div ng-show="inquiryItem.$editing">
 								<div>