Browse Source

【后台】+【vendor控制器以及实现类】+【客户资料模块,添加查询客户下所有用户信息方法】

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2509 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 years ago
parent
commit
e41f9f2150

+ 22 - 0
src/main/java/com/uas/platform/b2b/controller/VendorController.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.controller;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +9,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 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;
@@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.JxlsExcelView;
@@ -57,6 +61,24 @@ public class VendorController {
 		return vendorService.findAllByPageInfo(info);
 	}
 
+	/**
+	 * 获取客户在供应商对应的用户
+	 */
+	@RequestMapping(value = "/userInfo/{uu}", method = RequestMethod.GET)
+	@ResponseBody
+	public List<Distribute> getUserInfo(@PathVariable("uu") Long custUu){
+		return vendorService.findUserInfo(custUu);
+	}
+	
+	/**
+	 * 获取当前用户
+	 */
+	@RequestMapping(value = "/user", method = RequestMethod.GET)
+	@ResponseBody
+	public User getUser(){
+		return vendorService.findUser();
+	}
+	
 	/**
 	 * 导出
 	 * 

+ 3 - 0
src/main/java/com/uas/platform/b2b/dao/DistributeDao.java

@@ -25,4 +25,7 @@ public interface DistributeDao extends JpaSpecificationExecutor<Distribute>, Gen
 	 * @return
 	 */
 	public List<Distribute> findByUserUUAndVendorId(Long userUU,Long vendorId);
+	
+	public List<Distribute> findByVendorId(List<Long> vendorIds);
+	
 }

+ 6 - 0
src/main/java/com/uas/platform/b2b/service/VendorService.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.springframework.data.domain.Page;
 
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.core.model.PageInfo;
 
@@ -27,4 +29,8 @@ public interface VendorService {
 	public Vendor addCustomer(Vendor customer);
 	
 	public List<Vendor> addCustomers(List<Vendor> customers);
+	
+	public List<Distribute> findUserInfo(Long custUU);
+	
+	public User findUser();
 }

+ 32 - 1
src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -12,8 +12,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import com.uas.platform.b2b.dao.DistributeDao;
+import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.dao.VendorDao;
+import com.uas.platform.b2b.model.Distribute;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.model.Vendor;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.SystemSession;
@@ -24,7 +29,12 @@ public class VendorsServiceImpl implements VendorService {
 
 	@Autowired
 	private VendorDao vendorDao;
-
+	
+	@Autowired
+	private DistributeDao distributeDao;
+	
+	@Autowired
+	private UserDao userDao;
 	@Override
 	public List<Vendor> findMyVendors() {
 		return vendorDao.findByMyEnUU(SystemSession.getUser().getEnterprise().getUu());
@@ -82,4 +92,25 @@ public class VendorsServiceImpl implements VendorService {
 		}, pageInfo);
 	}
 
+	@Override
+	public List<Distribute> findUserInfo(Long custUU) {
+		List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(custUU,SystemSession.getUser().getEnterprise().getUu());
+		List<Long> ids = new ArrayList<Long>();
+		if(!CollectionUtils.isEmpty(vendors)) {
+			for(Vendor v : vendors) {
+				ids.add(v.getId());
+			}
+		}
+		return distributeDao.findByVendorId(ids);
+	}
+
+	@Override
+	public User findUser() {
+		List<User> users = userDao.findUserByUserUU(SystemSession.getUser().getUserUU());
+		if(!CollectionUtils.isEmpty(users)) {
+			return users.get(0);
+		}
+		return null;
+	}
+
 }