再次邀请

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

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

@@ -44,6 +44,17 @@ public class InvitationRecordController {
 		return invitationRecordService.invite(record);
 	}
 
+	/**
+	 * 再次邀请
+	 * 
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/reInvite/{id}", method = RequestMethod.POST)
+	private ModelMap reInvite(@PathVariable Long id) {
+		return invitationRecordService.reInvite(id);
+	}
+
 	/**
 	 * 查询邀请记录（个人）
 	 * 

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

@@ -176,14 +176,29 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 						product.setCode(product.getCode());
 						List<Component> components = componentDao.findByCode(product.getCmpCode());
 						if (components.size() == 1) {
-							product.setPbranden(components.get(0).getBrand().getNameEn());
-							product.setPbrand(components.get(0).getBrand().getNameCn());
-							product.setCmpUuId(components.get(0).getUuid());
-							product.setPcmpcode(components.get(0).getCode());
-							product.setKind(components.get(0).getKind().getNameCn());
-							product.setKinden(components.get(0).getKind().getNameEn());
-							product.setStandard(Constant.YES);
-							product.setMessage("success");
+							Component cmp = components.get(0);
+							if (cmp.getBrand().getNameEn().equals(product.getBrand())
+									&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 先匹配英文文
+								product.setPbranden(cmp.getBrand().getNameEn());
+								product.setPbrand(cmp.getBrand().getNameCn());
+								product.setCmpUuId(cmp.getUuid());
+								product.setPcmpcode(cmp.getCode());
+								product.setKind(cmp.getKind().getNameCn());
+								product.setKinden(cmp.getKind().getNameEn());
+								product.setStandard(Constant.YES);
+								product.setMessage("success");
+							} else if (!cmp.getBrand().getNameEn().equals(product.getBrand())
+									&& cmp.getBrand().getNameCn().equals(product.getBrand())
+									&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 再匹配中文
+								product.setPbranden(cmp.getBrand().getNameEn());
+								product.setPbrand(cmp.getBrand().getNameCn());
+								product.setCmpUuId(cmp.getUuid());
+								product.setPcmpcode(cmp.getCode());
+								product.setKind(cmp.getKind().getNameCn());
+								product.setKinden(cmp.getKind().getNameEn());
+								product.setStandard(Constant.YES);
+								product.setMessage("success");
+							}
 						} else if (components.size() > 1) {
 							for (Component cmp : components) {// 器件有多个，先匹配品牌
 								if (cmp.getBrand().getNameEn().equals(product.getBrand())

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

@@ -70,13 +70,21 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 			}
 			invitationRecordDao.save(oldrecord);
 			if (oldrecord.getVenduseremail() != null) {
-				mailService.send(messageConf.getTplInvitationForB2B(), record.getVenduseremail(), model);
+				try {
+					mailService.send(messageConf.getTplInvitationForB2B(), record.getVenduseremail(), model);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 			if(oldrecord.getVendusertel()!=null){
-				smsService.send(messageConf.getMsgInvitationForB2B(), record.getVendusertel(),
-						new Object[] { record.getVendusername(), record.getVendname(),
-								SystemSession.getUser().getUserName() + "("
-										+ SystemSession.getUser().getEnterprise().getEnName() + ")" });
+				try {
+					smsService.send(messageConf.getMsgInvitationForB2B(), record.getVendusertel(),
+							new Object[] { record.getVendusername(), record.getVendname(),
+									SystemSession.getUser().getUserName() + "("
+											+ SystemSession.getUser().getEnterprise().getEnName() + ")" });
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 			map.put("success", "邀请已发送");
 		} else {
@@ -103,6 +111,11 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		return map;
 	}
 
+	@Override
+	public ModelMap reInvite(Long id) {
+		return invite(invitationRecordDao.findOne(id));
+	}
+
 	@Override
 	public List<InvitationRecord> getRecords() {
 		return invitationRecordDao.findByUseruu(SystemSession.getUser().getUserUU());
@@ -115,7 +128,6 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 		List<InvitationRecord> newRecords = new ArrayList<InvitationRecord>();
 		for (InvitationRecord record : records) {
 			List<Enterprise> enters = enterpriseDao.findByEnName(record.getVendname());
-			System.out.println(enters.size());
 			if (!CollectionUtils.isEmpty(enters)) {
 				if (enters.size() == 1) {
 					record.setActive(Constant.YES);

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

@@ -113,14 +113,29 @@ public class PurcProductServiceImpl implements PurcProductService {
 						product.setCode(product.getCode());
 						List<Component> components = componentDao.findByCode(product.getCmpCode());
 						if (components.size() == 1) {
-							product.setPbranden(components.get(0).getBrand().getNameEn());
-							product.setPbrand(components.get(0).getBrand().getNameCn());
-							product.setCmpUuId(components.get(0).getUuid());
-							product.setPcmpcode(components.get(0).getCode());
-							product.setKind(components.get(0).getKind().getNameCn());
-							product.setKinden(components.get(0).getKind().getNameEn());
-							product.setStandard(Constant.YES);
-							product.setMessage("success");
+							Component cmp = components.get(0);
+							if (cmp.getBrand().getNameEn().equals(product.getBrand())
+									&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 先匹配英文文
+								product.setPbranden(cmp.getBrand().getNameEn());
+								product.setPbrand(cmp.getBrand().getNameCn());
+								product.setCmpUuId(cmp.getUuid());
+								product.setPcmpcode(cmp.getCode());
+								product.setKind(cmp.getKind().getNameCn());
+								product.setKinden(cmp.getKind().getNameEn());
+								product.setStandard(Constant.YES);
+								product.setMessage("success");
+							} else if (!cmp.getBrand().getNameEn().equals(product.getBrand())
+									&& cmp.getBrand().getNameCn().equals(product.getBrand())
+									&& cmp.getKind().getNameCn().equals(product.getTitle())) {// 再匹配中文
+								product.setPbranden(cmp.getBrand().getNameEn());
+								product.setPbrand(cmp.getBrand().getNameCn());
+								product.setCmpUuId(cmp.getUuid());
+								product.setPcmpcode(cmp.getCode());
+								product.setKind(cmp.getKind().getNameCn());
+								product.setKinden(cmp.getKind().getNameEn());
+								product.setStandard(Constant.YES);
+								product.setMessage("success");
+							}
 						} else if (components.size() > 1) {
 							for (Component cmp : components) {// 器件有多个，先匹配品牌
 								if (cmp.getBrand().getNameEn().equals(product.getBrand())

src/main/webapp/resources/js/index/app.js

@@ -1199,6 +1199,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
   			$scope.tableParams.reload();
   			$scope.tip = keyword;
 		}
+		
+		// 再次邀请
+		$scope.reInvite = function(id) {
+			InvitationRecord.reInvite({id: id}, {}, function(data) {
+				if(data.success) {
+					toaster.pop('success', '提示', data.success);
+				}
+			}, function(response) {
+				toaster.pop('error', '提示', response.data);
+			});
+		}
 	}]);
 	
 	/**

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -374,6 +374,10 @@ define(['ngResource'], function() {
 				url: 'invitationrecord/enterpriseList/:name',
 				method: 'GET',
 				isArray: true
+			},
+			reInvite: {
+				url: 'invitationrecord/reInvite/:id',
+				method: 'POST'
 			}
 		})
 	}]);