更新功能：如果供应商联系人存在uu号，录入该uu号；不存在则录入管理员uu号

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

src/main/java/com/uas/platform/b2b/model/Cart.java

@@ -111,6 +111,21 @@ public class Cart implements Serializable {
 	@Column(name = "ca_venduser")
 	private String venduser;
 
+	/**
+	 * 供应商联系人电话
+	 */
+	@Column(name = "ca_vendusertel")
+	private String vendusertel;
+
+
+	public String getVendusertel() {
+		return vendusertel;
+	}
+
+	public void setVendusertel(String vendusertel) {
+		this.vendusertel = vendusertel;
+	}
+
 	public String getVenduser() {
 		return venduser;
 	}

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAll.java

@@ -113,6 +113,12 @@ public class PurchaseOrderAll {
 	@Column(name = "pu_venduser")
 	private String venduser;
 
+	/**
+	 * 供应商联系人电话
+	 */
+	@Column(name = "pu_vendusertel")
+	private String vendusertel;
+
 	/**
 	 * 收货地址
 	 */
@@ -437,4 +443,12 @@ public class PurchaseOrderAll {
 		this.venduser = venduser;
 	}
 
+	public String getVendusertel() {
+		return vendusertel;
+	}
+
+	public void setVendusertel(String vendusertel) {
+		this.vendusertel = vendusertel;
+	}
+
 }

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

@@ -14,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 
-import com.alibaba.fastjson.JSON;
 import com.uas.account.entity.RequsetStatus;
 import com.uas.account.support.Page;
 import com.uas.account.util.AccountUtils;
@@ -116,7 +115,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					if (row.getCell(0) == null) {
 						infos.add("第" + r + 1 + "行商品名称为空");
 					} else {
-						System.out.println(row.getCell(0));
 						row.getCell(0).setCellType(Cell.CELL_TYPE_STRING);
 						product.setTitle(row.getCell(0).getStringCellValue().trim());
 					}
@@ -177,7 +175,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 						modelMap.put("success", total - alters.size());
 						products.add(product);
 					}
-					System.out.println(JSON.toJSON(products));
 				}
 			}
 			if (!CollectionUtils.isEmpty(products)) {
@@ -271,6 +268,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		PurchaseOrderAll purcOrder = new PurchaseOrderAll();
 		Set<PurchaseOrderAllItem> orderItems = new HashSet<PurchaseOrderAllItem>();
 		EnterpriseInfo enter = enterpriseDao.findEnterpriseInfoByUu(SystemSession.getUser().getEnterprise().getUu());
+		List<UserBaseInfo> userBaseInfos = userBaseInfoDao.findByUserTel(neworder.getVendusertel());
+		UserBaseInfo userBaseInfo = new UserBaseInfo();
+		if (!CollectionUtils.isEmpty(userBaseInfos)) {
+			userBaseInfo = userBaseInfos.get(0);
+		}
 		// 采购单
 		purcOrder.setCode(neworder.getCode());
 		purcOrder.setDate(neworder.getDate());
@@ -281,10 +283,14 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		purcOrder.setUserUU(SystemSession.getUser().getUserUU());
 		purcOrder.setEnterprise(enter);
 		purcOrder.setUser(SystemSession.getUser());
-		purcOrder.setVendUserUU(neworder.getCustUserUU());
+		if (userBaseInfo != null) {// 如果供应商联系人存在uu号，录入该uu号；如果不存在，录入企业管理员uu
+			purcOrder.setVendUserUU(userBaseInfo.getUserUU());
+		} else {
+			purcOrder.setVendUserUU(neworder.getCustUserUU());
+		}
 		purcOrder.setVendUU(neworder.getCust().getUu());
 		purcOrder.setDisplay(Constant.YES);
-		purcOrder.setCurrency("RMB");
+		purcOrder.setCurrency(neworder.getCurrency());
 		purcOrder.setType("平台采购");
 		purcOrder.setAuditor(SystemSession.getUser().getUserName());
 		purcOrder.setShipAddress(neworder.getShipaddress());
@@ -296,6 +302,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		purcOrder.setRemark(neworder.getRemark());
 		purcOrder.setShipAddress(neworder.getShipaddress());
 		purcOrder.setVenduser(neworder.getVenduser());
+		purcOrder.setVendusertel(neworder.getVendusertel());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(neworder.getOrderItems())) {
 			for (OrderItems orderitem : neworder.getOrderItems()) {
@@ -466,6 +473,11 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		Cart cart = new Cart();
 		Set<CartDetail> cartDetails = new HashSet<CartDetail>();
 		EnterpriseInfo enter = enterpriseDao.findEnterpriseInfoByUu(SystemSession.getUser().getEnterprise().getUu());
+		List<UserBaseInfo> userBaseInfos = userBaseInfoDao.findByUserTel(neworder.getVendusertel());
+		UserBaseInfo userBaseInfo = new UserBaseInfo();
+		if (!CollectionUtils.isEmpty(userBaseInfos)) {
+			userBaseInfo = userBaseInfos.get(0);
+		}
 		// 主记录
 		cart.setCode(neworder.getCode());
 		cart.setDate(neworder.getDate());
@@ -474,9 +486,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		cart.setUserUU(SystemSession.getUser().getUserUU());
 		cart.setEnterprise(enter);
 		cart.setUser(SystemSession.getUser());
-		cart.setVendUserUU(neworder.getCustUserUU());
+		if (userBaseInfo != null) {// 如果供应商联系人存在uu号，录入该uu号；如果不存在，录入企业管理员uu
+			cart.setVendUserUU(userBaseInfo.getUserUU());
+		} else {
+			cart.setVendUserUU(neworder.getCustUserUU());
+		}
 		cart.setVendUU(neworder.getCust().getUu());
-		cart.setCurrency("RMB");
+		cart.setCurrency(neworder.getCurrency());
 		cart.setShipAddress(neworder.getShipaddress());
 		cart.setReceiveName(neworder.getCust().getEnName());
 		cart.setReceiveCode(String.valueOf(neworder.getCust().getUu()));
@@ -486,6 +502,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		cart.setPayments(neworder.getPayments());
 		cart.setRemark(neworder.getRemark());
 		cart.setVenduser(neworder.getVenduser());
+		cart.setVendusertel(neworder.getVendusertel());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(neworder.getOrderItems())) {
 			for (OrderItems orderitem : neworder.getOrderItems()) {

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

@@ -78,10 +78,10 @@ public class CartServiceImpl implements CartService {
 		purcOrder.setUserUU(SystemSession.getUser().getUserUU());
 		purcOrder.setEnterprise(cart.getEnterprise());
 		purcOrder.setUser(SystemSession.getUser());
-		purcOrder.setVendUserUU(cart.getUserUU());
+		purcOrder.setVendUserUU(cart.getVendUserUU());
 		purcOrder.setVendUU(cart.getEnUU());
 		purcOrder.setDisplay(Constant.YES);
-		purcOrder.setCurrency("RMB");
+		purcOrder.setCurrency(cart.getCurrency());
 		purcOrder.setType("平台采购");
 		purcOrder.setAuditor(SystemSession.getUser().getUserName());
 		purcOrder.setShipAddress(cart.getShipAddress());
@@ -92,6 +92,7 @@ public class CartServiceImpl implements CartService {
 		purcOrder.setPayments(cart.getPayments());
 		purcOrder.setRemark(cart.getRemark());
 		purcOrder.setVenduser(cart.getVenduser());
+		purcOrder.setVendusertel(cart.getVendusertel());
 		short i = 1;
 		if (!CollectionUtils.isEmpty(cart.getCartDetails())) {
 			for (CartDetail cartdetail : cart.getCartDetails()) {

src/main/java/com/uas/platform/b2b/temporary/model/NewPurcOrder.java

@@ -21,6 +21,7 @@ public class NewPurcOrder {
 	private String remark;
 	private String shipaddress;
 	private String venduser;
+	private String vendusertel;
 
 	public String getCode() {
 		return code;
@@ -102,6 +103,14 @@ public class NewPurcOrder {
 		this.venduser = venduser;
 	}
 
+	public String getVendusertel() {
+		return vendusertel;
+	}
+
+	public void setVendusertel(String vendusertel) {
+		this.vendusertel = vendusertel;
+	}
+
 	@Override
 	public String toString() {
 		return "NewPurcOrder [code=" + code + ", date=" + date + ", orderItems=" + orderItems + ", cust=" + cust