Просмотр исходного кода

增加对企业的询价,增加供应商客户的禁用与解除禁用

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8194 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 лет назад
Родитель
Сommit
869cdab822

+ 12 - 0
src/main/java/com/uas/platform/b2b/controller/EnterpriseController.java

@@ -129,4 +129,16 @@ public class EnterpriseController {
 	private void removeShipAddress(@PathVariable Long id) {
 		shipAddressService.removeShipAddress(id);
 	}
+
+	/**
+	 * 根据uu获取企业基本信息
+	 * 
+	 * @param enuu
+	 * @return
+	 */
+	@RequestMapping(value = "/info/{bussinessCode}", method = RequestMethod.GET)
+	@ResponseBody
+	private Enterprise getInfo(@PathVariable String bussinessCode) {
+		return enterpriseService.findByenBussinessCode(bussinessCode);
+	}
 }

+ 41 - 4
src/main/java/com/uas/platform/b2b/controller/PurcOrderController.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -55,13 +56,49 @@ public class PurcOrderController {
 	}
 
 	/**
-	 * 解除供应商客户关系
+	 * 解除供应商关系(禁用)
 	 * 
 	 * @param id
 	 */
-	@RequestMapping(value = "/relieve/{id}", method = RequestMethod.DELETE)
+	@RequestMapping(value = "/relieve/{id}", method = RequestMethod.POST)
 	@ResponseBody
-	private void relieve(@PathVariable Long id) {
-		purcOrderService.relieve(id);
+	private ModelMap relieve(@PathVariable Long id) {
+		return purcOrderService.relieve(id);
+	}
+
+	/**
+	 * 启用供应商
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/activeVend/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap activeVend(@PathVariable Long id) {
+		return purcOrderService.activeVend(id);
+	}
+
+	/**
+	 * 禁用客户
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/disableCust/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap disableCust(@PathVariable Long id) {
+		return purcOrderService.disableCust(id);
+	}
+
+	/**
+	 * 启用客户
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/activeCust/{id}", method = RequestMethod.POST)
+	@ResponseBody
+	private ModelMap activeCust(@PathVariable Long id) {
+		return purcOrderService.activeCust(id);
 	}
 }

+ 32 - 0
src/main/java/com/uas/platform/b2b/model/Vendor.java

@@ -118,6 +118,22 @@ public class Vendor implements Serializable {
 	@Column(name = "ve_apcheck")
 	private Short apcheck;
 
+	/**
+	 * 供应商开关,客户操作,因为是相对的,如果一个条件不能构成约束<br>
+	 * 1. 启用<br>
+	 * 0. 禁用
+	 */
+	@Column(name = "ve_vendswitch")
+	private Short vendswitch;
+
+	/**
+	 * 客户开关,供应商操作,因为是相对的,如果一个条件不能构成约束<br>
+	 * 1. 启用<br>
+	 * 0. 禁用
+	 */
+	@Column(name = "ve_custswitch")
+	private Short custswitch;
+
 	public Long getId() {
 		return id;
 	}
@@ -230,6 +246,22 @@ public class Vendor implements Serializable {
 		this.apcheck = apcheck;
 	}
 
+	public Short getVendswitch() {
+		return vendswitch;
+	}
+
+	public void setVendswitch(Short vendswitch) {
+		this.vendswitch = vendswitch;
+	}
+
+	public Short getCustswitch() {
+		return custswitch;
+	}
+
+	public void setCustswitch(Short custswitch) {
+		this.custswitch = custswitch;
+	}
+
 	@Override
 	public String toString() {
 		return this.vendorEnterprise.getEnName();

+ 28 - 2
src/main/java/com/uas/platform/b2b/service/PurcOrderService.java

@@ -1,5 +1,7 @@
 package com.uas.platform.b2b.service;
 
+import org.springframework.ui.ModelMap;
+
 import com.uas.platform.b2b.model.Product;
 import com.uas.platform.b2b.model.Vendor;
 
@@ -31,10 +33,34 @@ public interface PurcOrderService {
 	public Vendor getCustomerInfo(Long custuu);
 
 	/**
-	 * 解除客户、供应商关系
+	 * 解除供应商关系(禁用)
+	 * 
+	 * @param id
+	 */
+	public ModelMap relieve(Long id);
+
+	/**
+	 * 启用供应商
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public ModelMap activeVend(Long id);
+	
+	/**
+	 * 禁用客户
+	 * 
+	 * @param id
+	 * @return
+	 */
+	public ModelMap disableCust(Long id);
+
+	/**
+	 * 启用客户
 	 * 
 	 * @param id
+	 * @return
 	 */
-	public void relieve(Long id);
+	public ModelMap activeCust(Long id);
 
 }

+ 38 - 6
src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
 
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.ProductDao;
@@ -40,12 +41,43 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 	}
 
 	@Override
-	public void relieve(Long id) {
-		try {
-			vendorDao.delete(id);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+	public ModelMap relieve(Long id) {
+		ModelMap map = new ModelMap();
+		Vendor vendor = vendorDao.findOne(id);
+		vendor.setVendswitch((short) 0);
+		vendor = vendorDao.save(vendor);
+		map.put("success", "禁用成功");
+		return map;
+	}
+
+	@Override
+	public ModelMap activeVend(Long id) {
+		ModelMap map = new ModelMap();
+		Vendor vendor = vendorDao.findOne(id);
+		vendor.setVendswitch((short) 1);
+		vendor = vendorDao.save(vendor);
+		map.put("success", "启用成功");
+		return map;
+	}
+
+	@Override
+	public ModelMap disableCust(Long id) {
+		ModelMap map = new ModelMap();
+		Vendor vendor = vendorDao.findOne(id);
+		vendor.setCustswitch((short) 0);
+		vendor = vendorDao.save(vendor);
+		map.put("success", "禁用成功");
+		return map;
+	}
+
+	@Override
+	public ModelMap activeCust(Long id) {
+		ModelMap map = new ModelMap();
+		Vendor vendor = vendorDao.findOne(id);
+		vendor.setCustswitch((short) 1);
+		vendor = vendorDao.save(vendor);
+		map.put("success", "启用成功");
+		return map;
 	}
 
 }