Merge branch 'newAccount' of ssh://10.10.101.21/source/platform-b2b into dev_copy

pom.xml

@@ -39,7 +39,7 @@
             <properties>
                 <profile>prod</profile>
                 <!-- static plugin -->
-                <static-path>http://static.ubtob.com</static-path>
+                <static-path>static</static-path>
             </properties>
             <!-- 默认 -->
             <activation>
@@ -369,7 +369,7 @@
         </resources>
         <!-- 在maven生命周期validate阶段生成timestamp -->
         <plugins>
-            <!--<plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
                 <version>1.3</version>
@@ -402,7 +402,7 @@
                 <groupId>com.samaxes.maven</groupId>
                 <artifactId>minify-maven-plugin</artifactId>
                 <version>1.7.4</version>
-                &lt;!&ndash; 静态文件压缩  &ndash;&gt;
+                <!-- 静态文件压缩  -->
                 <executions>
                     <execution>
                         <id>default-minify</id>
@@ -463,7 +463,7 @@
                 <groupId>com.uas.plugins</groupId>
                 <artifactId>static-maven-plugin</artifactId>
                 <version>0.0.2-SNAPSHOT</version>
-                &lt;!&ndash; 静态资源分离  &ndash;&gt;
+                <!-- 静态资源分离  -->
                 <executions>
                     <execution>
                         <id>default-static</id>
@@ -507,7 +507,7 @@
                         </resource>
                     </webResources>
                 </configuration>
-            </plugin>-->
+            </plugin>
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>

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

@@ -156,8 +156,8 @@ public class InvitationRecordController {
 	private ModelMap setenterprise() {
         String url = ContextUtils.getBean(SysConf.class).getRegisterUrl();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        url = url + "?inviteUserCode=" + SystemSession.getUser().getUserUU() + "&inviteuid="
-                + SystemSession.getUser().getEnterprise().getEnBussinessCode() + "&invitationTime=" + sdf.format(new Date()) + "&source=B2B";
+        url = url + "?inviteUserUU=" + SystemSession.getUser().getUserUU() + "&inviteSpaceUU="
+                + SystemSession.getUser().getEnterprise().getUu() + "&invitationTime=" + sdf.format(new Date()) + "&source=B2B";
         logger.log("邀请注册", "获取邀请链接", url);
 		return new ModelMap("url", url);
 	}

src/main/java/com/uas/platform/b2b/dao/InvitationRecordDao.java

@@ -45,4 +45,12 @@ public interface InvitationRecordDao
 	 * @return
 	 */
 	List<InvitationRecord> findByVendname(String vednName);
+
+	/**
+	 * 通过注册UU号查询邀请记录
+	 *
+	 * @param enuu uu号
+	 * @return
+	 */
+    List<InvitationRecord> findByVenduu(Long enuu);
 }

src/main/java/com/uas/platform/b2b/event/SaleSendAcceptReleaseEvent.java

@@ -34,7 +34,7 @@ public class SaleSendAcceptReleaseEvent extends SaveReleaseEvent<PagingReleaseDe
 	public PagingReleaseDetail release(SaleSend send) {
         Long emUU = send.getCustUserUU();
         String emName = "操作员";
-        if (null == send.getCustUser()) {
+        if (null != send.getCustUser()) {
             emName = send.getCustUser().getUserName();
         }
         Long enUU = send.getCustUU();

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

@@ -281,6 +281,30 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_weight")
 	private Integer weight;
 
+    /**
+     * 邀请企业UU
+     */
+	@Column(name = "en_inviteuu")
+    private Long inviteUU;
+
+    /**
+     * 邀请用户UU
+     */
+	@Column(name = "en_inviteuseruu")
+    private Long inviteUserUU;
+
+    /**
+     * 邀请时间
+     */
+	@Column(name = "en_invitetime")
+    private Long inviteTime;
+
+    /**
+     * 邀请来源
+     */
+	@Column(name = "en_invitesource")
+    private String inviteSource;
+
 	public String getEnManagement() {
 		return enManagement;
 	}
@@ -763,4 +787,36 @@ public class Enterprise implements Serializable {
 	public void setWeight(Integer weight) {
 		this.weight = weight;
 	}
+
+    public Long getInviteUU() {
+        return inviteUU;
+    }
+
+    public void setInviteUU(Long inviteUU) {
+        this.inviteUU = inviteUU;
+    }
+
+    public Long getInviteUserUU() {
+        return inviteUserUU;
+    }
+
+    public void setInviteUserUU(Long inviteUserUU) {
+        this.inviteUserUU = inviteUserUU;
+    }
+
+    public Long getInviteTime() {
+        return inviteTime;
+    }
+
+    public void setInviteTime(Long inviteTime) {
+        this.inviteTime = inviteTime;
+    }
+
+    public String getInviteSource() {
+        return inviteSource;
+    }
+
+    public void setInviteSource(String inviteSource) {
+        this.inviteSource = inviteSource;
+    }
 }

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

@@ -273,5 +273,6 @@ public class EnterpriseBaseInfo implements Serializable {
         this.enTel = e.getEnTel();
         this.date = e.getEnDate();
         this.enCorporation = e.getEnCorporation();
+        this.enEstablishDate = e.getEnDate();
     }
 }

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

@@ -142,6 +142,18 @@ public class InvitationRecord implements Serializable {
 	@Transient
 	private Date registerDate;
 
+	/**
+	 * 邀请注册的人，记录是从哪个链接去注册的
+	 */
+	@Transient
+	private String inviteUserName;
+
+	/**
+	 * 邀请注册的企业，记录是从哪个链接去注册的
+	 */
+	@Transient
+	private String inviteEnName;
+
 	public Long getId() {
 		return id;
 	}
@@ -301,4 +313,20 @@ public class InvitationRecord implements Serializable {
     public void setRegisterDate(Date registerDate) {
         this.registerDate = registerDate;
     }
+
+	public String getInviteUserName() {
+		return inviteUserName;
+	}
+
+	public void setInviteUserName(String inviteUserName) {
+		this.inviteUserName = inviteUserName;
+	}
+
+	public String getInviteEnName() {
+		return inviteEnName;
+	}
+
+	public void setInviteEnName(String inviteEnName) {
+		this.inviteEnName = inviteEnName;
+	}
 }

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

@@ -1,6 +1,5 @@
 package com.uas.platform.b2b.service;
 
-import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.search.b2b.model.PageParams;
@@ -62,4 +61,12 @@ public interface InvitationRecordService {
 	 * 通过被邀请企业的名称查询邀请记录
 	 */
 	List<InvitationRecord> findbyVendName(String name);
+
+	/**
+	 * 通过注册UU号查询邀请记录
+	 *
+	 * @param enuu 注册UU号
+	 * @return
+	 */
+	List<InvitationRecord> findByVendUU(Long enuu);
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.dao.*;
@@ -678,6 +679,16 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnable(Constant.YES);
 		enterprise.setEnStatus((short) Status.UNAUDIT.value());// 审核状态设为未审核
 		enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());// 上传状态设为未上传
+
+		//  在账户中心注册企业
+		try {
+			registerAccountEnterprise(enterprise);
+			logger.log("接口注册", "success", "一键注册企业同步到账户中心", enterprise.getUu());
+		} catch (Exception e) {
+			logger.log("接口注册", "faliure", "一键注册企业同步到账户中心", enterprise.getUu());
+			return null;
+		}
+
 		Enterprise newEnterprise = enterpriseDao.save(enterprise);// 保存enterprise
 		User user = null;
 		// 允许管理员账户已存在，添加对照关系，先根据手机号和邮箱判断是否是已存在的User
@@ -702,19 +713,19 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		}
 		user.addEnterprise(newEnterprise);// 添加userenterpris对应关系
 		User newUser = userDao.save(user);// 保存user
-		if (!ok) {
-			if (StringUtils.isEmpty(enterprise.getEnAdminPassword())) {
-				enterprise.setEnAdminPassword("111111");
-			}
-			newUser.setUserPwd(Md5Utils.encode(enterprise.getEnAdminPassword(), newUser.getUserUU()));
-			user = userDao.save(newUser);
-			try {
-				userService.postToAccountCenter(user);
-				logger.log("接口注册", "success", "一键注册用户同步到账户中心", user.getUserUU());
-			} catch (Exception e) {
-				logger.log("接口注册", "faliure", "一键注册用户同步到账户中心", user.getUserUU());
-			}
-		}
+//		if (!ok) {
+//			if (StringUtils.isEmpty(enterprise.getEnAdminPassword())) {
+//				enterprise.setEnAdminPassword("111111");
+//			}
+//			newUser.setUserPwd(Md5Utils.encode(enterprise.getEnAdminPassword(), newUser.getUserUU()));
+//			user = userDao.save(newUser);
+//			try {
+//				userService.postToAccountCenter(user);
+//				logger.log("接口注册", "success", "一键注册用户同步到账户中心", user.getUserUU());
+//			} catch (Exception e) {
+//				logger.log("接口注册", "faliure", "一键注册用户同步到账户中心", user.getUserUU());
+//			}
+//		}
 		newEnterprise.setEnAdminuu(newUser.getUserUU());// 设置管理员UU号
 		newEnterprise.setEnIsErp(Constant.YES);
 		newEnterprise = enterpriseDao.save(newEnterprise);// 再次保存enterprise
@@ -723,6 +734,27 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		return newEnterprise;
 	}
 
+	private void registerAccountEnterprise(Enterprise enterprise) throws Exception {
+		UserSpaceView userSpaceView = new UserSpaceView();
+		userSpaceView.setSpaceName(enterprise.getEnName());
+		userSpaceView.setBusinessCode(enterprise.getEnBussinessCode());
+		userSpaceView.setBusinessCodeImage(enterprise.getBusinesscodeimg());
+		userSpaceView.setCorporation(enterprise.getEnCorporation());
+		userSpaceView.setRegAddress(enterprise.getEnAddress());
+		userSpaceView.setArea(enterprise.getEnArea());
+		userSpaceView.setProfession(enterprise.getProfession());
+		userSpaceView.setAccessSecret(enterprise.getAccessSecret());
+		UserView admin = new UserView();
+		admin.setEmail(enterprise.getEnAdminEmail());
+		admin.setMobile(enterprise.getEnAdminTel());
+		admin.setPassword(enterprise.getEnAdminPassword());
+		admin.setVipName(enterprise.getEnAdminName());
+		userSpaceView = AccountUtils.register(userSpaceView, admin);
+		enterprise.setUu(userSpaceView.getSpaceUU());
+		enterprise.setEnAdminuu(userSpaceView.getAdmin().getUserUU());
+		enterprise.setEnAdminPassword(userSpaceView.getAdmin().getPassword());
+	}
+
 	@Override
 	public Set<Enterprise> findByNameKey(String name) {
 		Set<Enterprise> enterprises = new HashSet<Enterprise>();

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

@@ -203,26 +203,47 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 			invitatrecords = searchService.getInvitationByKeyword(keyword, params);
 		} catch (Exception e) {
 		}
-		List<InvitationRecord> records = invitatrecords.getContent();
-		if (!CollectionUtils.isEmpty(records)) {
-            for (InvitationRecord record : records) {
-                List<Enterprise> enters = enterpriseDao.findByEnName(record.getVendname());
-                if (!CollectionUtils.isEmpty(enters)) {
-                    if (enters.size() == 1) {
-                        record.setActive(Constant.YES);
-                        record.setSamecount(enters.size());
-                        record.setVenduu(enters.get(0).getUu());
-                        record.setProductNum(productDao.countByEnUU(enters.get(0).getUu()));
-                        record.setRegisterDate(enters.get(0).getEnDate());
-                    } else {
-                        record.setActive(Constant.NO);
-                        record.setSamecount(enters.size());
-                    }
-                } else {
-                    record.setActive(Constant.NO);
-                    record.setSamecount(enters.size());
-                }
-                invitationRecordDao.save(record);
+		if (!CollectionUtils.isEmpty(invitatrecords.getContent())) {
+            for (InvitationRecord record : invitatrecords.getContent()) {
+            	if (null != record.getVenduu()) {
+            		Enterprise e = enterpriseDao.findOne(record.getVenduu());
+					record.setProductNum(productDao.countByEnUU(record.getVenduu()));
+            		if (null != e.getInviteUU()) {
+            			Enterprise inviteEn = enterpriseDao.findOne(e.getInviteUU());
+            			record.setInviteEnName(inviteEn != null ? inviteEn.getEnName() : null);
+					}
+					if (null != e.getInviteUserUU()) {
+            			User inviteUser = userDao.findOne(e.getInviteUserUU());
+						record.setInviteUserName(inviteUser != null ? inviteUser.getUserName() : null);
+					}
+				} else {
+					List<Enterprise> enters = enterpriseDao.findByEnName(record.getVendname());
+					if (!CollectionUtils.isEmpty(enters)) {
+						if (enters.size() == 1) {
+							Enterprise e = enters.get(0);
+							record.setActive(Constant.YES);
+							record.setSamecount(enters.size());
+							record.setVenduu(e.getUu());
+							record.setRegisterDate(e.getEnDate());
+							record.setProductNum(productDao.countByEnUU(e.getUu()));
+							if (null != e.getInviteUU()) {
+								Enterprise inviteEn = enterpriseDao.findOne(e.getInviteUU());
+								record.setInviteEnName(inviteEn != null ? inviteEn.getEnName() : null);
+							}
+							if (null != e.getInviteUserUU()) {
+								User inviteUser = userDao.findOne(e.getInviteUserUU());
+								record.setInviteUserName(inviteUser != null ? inviteUser.getUserName() : null);
+							}
+						} else {
+							record.setActive(Constant.NO);
+							record.setSamecount(enters.size());
+						}
+					} else {
+						record.setActive(Constant.NO);
+						record.setSamecount(enters.size());
+					}
+					invitationRecordDao.save(record);
+				}
             }
         }
 		return invitatrecords;
@@ -262,4 +283,15 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 	public List<InvitationRecord> findbyVendName(String name) {
 		return invitationRecordDao.findByVendname(name);
 	}
+
+    /**
+     * 通过注册UU号查询邀请记录
+     *
+     * @param enuu 注册UU号
+     * @return
+     */
+    @Override
+    public List<InvitationRecord> findByVendUU(Long enuu) {
+        return invitationRecordDao.findByVenduu(enuu);
+    }
 }

src/main/java/com/uas/platform/b2b/v2/controller/EnterpriseController.java

@@ -1,7 +1,10 @@
 package com.uas.platform.b2b.v2.controller;
 
+import com.uas.platform.b2b.core.util.ThreadUtils;
+import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.support.CommBufferedLogger;
 import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
+import com.uas.platform.b2b.v2.service.InviteRecordService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserView;
@@ -26,6 +29,9 @@ public class EnterpriseController {
 	@Autowired
 	private EnterpriseService enterpriseService;
 
+	@Autowired
+    private InviteRecordService inviteRecordService;
+
 	@Autowired
 	private SysConf conf;
 
@@ -89,7 +95,20 @@ public class EnterpriseController {
 			enterprise.setEnAddress(userSpaceDetail.getAddress());
 			enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
 			try {
-				enterpriseService.save(enterprise);
+				final EnterpriseBaseInfo baseInfo = new EnterpriseBaseInfo(enterpriseService.save(enterprise));
+                // 如果改了名字，需要去更新邀请记录里面的信息
+                if (!enterprise.getEnName().equals(userSpaceDetail.getName())) {
+                    ThreadUtils.task(new Runnable() {
+                        @Override
+                        public void run() {
+                            try {
+                                inviteRecordService.updateVendName(baseInfo);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }).run();
+                }
 				return "success";
 			} catch (Exception e) {
 				e.printStackTrace();

src/main/java/com/uas/platform/b2b/v2/controller/InviteRecordController.java

@@ -18,6 +18,8 @@ import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.web.bind.RequestState;
 import com.uas.ps.core.util.StringUtils;
 import com.uas.search.b2b.model.SPage;
+import com.uas.search.b2b.model.Sort;
+import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -89,6 +92,9 @@ public class InviteRecordController {
         logger.log("邀请注册", "查询邀请记录", "关键字：" + keyword, userUU, enUU);
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("in_useruu", userUU);
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
 
@@ -111,6 +117,9 @@ public class InviteRecordController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.YES);
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
 
@@ -133,6 +142,9 @@ public class InviteRecordController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
         pageParams.getFilters().put("in_useruu", userUU);
         pageParams.getFilters().put("in_active", Constant.NO);
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("in_date", false, Sort.Type.LONG, new Long(1)));
+        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         return inviteRecordService.getInviteRecords(enUU, userUU, pageParams, keyword);
     }
 

src/main/java/com/uas/platform/b2b/v2/service/InviteRecordService.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.v2.service;
 
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.v2.model.Invitation;
@@ -85,4 +86,11 @@ public interface InviteRecordService {
      * @return
      */
     ModelMap inviteByBatch(Long enUU, Long userUU, List<InvitationRecord> records, String source);
+
+    /**
+     * 更新邀请注册记录企业信息
+     *
+     * @param e 企业信息
+     */
+    void updateVendName(EnterpriseBaseInfo e);
 }

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -64,6 +64,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setLogUrl(detail.getLogoImage());
 		enterprise.setProfession(detail.getProfession());
 		enterprise.setTags(detail.getTags());
+		enterprise.setInviteSource(detail.getSource());
+		enterprise.setInviteTime(detail.getInvitationTime());
+		enterprise.setInviteUserUU(detail.getInviteUserUU());
+		enterprise.setInviteUU(detail.getInviteSpaceUU());
 		enterprise = enterpriseDao.save(enterprise);
 
 		// 把管理员添加进企业

src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.entity.PartnershipRecordView;
 import com.uas.sso.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
-import com.uas.message.sms.service.SmsService;
 import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
@@ -18,7 +17,6 @@ import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.MessageConf;
-import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.SmsMessage;
 import com.uas.platform.b2b.v2.model.Invitation;
 import com.uas.platform.b2b.v2.service.InviteRecordService;
@@ -29,8 +27,6 @@ import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.search.b2b.model.PageParams;
 import com.uas.search.b2b.model.SPage;
-import com.uas.sso.entity.PartnershipRecordView;
-import com.uas.sso.util.AccountUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
@@ -63,9 +59,6 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Autowired
     private MessageConf messageConf;
 
-    @Autowired
-    private SmsService smsService;
-
     @Autowired
     private MailService mailService;
 
@@ -95,16 +88,14 @@ public class InviteRecordServiceImpl implements InviteRecordService {
                     baseInfo.setAdminName(user.getUserName());
                     baseInfo.setEnTel(user.getUserTel());
                 }
-                List<InvitationRecord> records = invitationRecordService.findbyVendName(e.getEnName());
-                if (!CollectionUtils.isEmpty(records)) {
-                    Enterprise enterprise = enterpriseService.findByEnUU(records.get(0).getEnuu());
-                    if (null == enterprise) {
-                        enterprise = enterpriseService.findByenBussinessCode(records.get(0).getBussinesscode());
-                    }
+                if (null != e.getInviteUU()) {
+                    Enterprise enterprise = enterpriseService.findByEnUU(e.getInviteUU());
                     String enName = enterprise != null ? enterprise.getEnName() : null;
                     baseInfo.setInviteEnName(enName);
-                    String userName = records.get(0).getUser() != null ? records.get(0).getUser().getUserName() : null;
-                    baseInfo.setInviteUserName(userName);
+                }
+                if (null != e.getInviteUserUU()) {
+                    User u = userDao.findOne(e.getInviteUserUU());
+                    baseInfo.setInviteUserName(u.getUserName());
                 }
                 baseInfoList.add(baseInfo);
             }
@@ -136,15 +127,12 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Override
     public ModelMap getInvationCount(Long userUU, Long enUU) {
         ModelMap map = new ModelMap();
-        Integer allNum = 0;
-        Integer todoNum = 0;
-        Integer doneNum = 0;
         String allSql = "select COALESCE(sum(count), 0) from v$invitation where useruu = " + userUU;
         String todoSql = "select COALESCE(sum(count), 0) from v$invitation where active = 0 and useruu = " + userUU;
         String doneSql = "select COALESCE(sum(count), 0) from v$invitation where active = 1 and useruu = " + userUU;
-        allNum = commonDao.queryForObject(allSql, Integer.class);
-        todoNum = commonDao.queryForObject(todoSql, Integer.class);
-        doneNum = commonDao.queryForObject(doneSql, Integer.class);
+        Integer allNum = commonDao.queryForObject(allSql, Integer.class);
+        Integer todoNum = commonDao.queryForObject(todoSql, Integer.class);
+        Integer doneNum = commonDao.queryForObject(doneSql, Integer.class);
         map.put("all", allNum);
         map.put("todo", todoNum);
         map.put("done", doneNum);
@@ -161,11 +149,11 @@ public class InviteRecordServiceImpl implements InviteRecordService {
      */
     @Override
     public List<Invitation> getCountGroupByDate(Long userUU, Long enUU, String year) {
-        String sql = "select substr(time, -2) month,in_enuu enUU,count(1) count from(" +
+        String sql = "select substr(time, -2) month, time, in_enuu enUU,count(1) count from(" +
                 "select to_char(in_date, 'yyyy-mm') time,COALESCE(in_active,0),in_enuu from invitationrecords where in_enuu = " + enUU + ")" +
                 "where time like '%" + year + "%' group by time,in_enuu order by time";
         List<Invitation> all = commonDao.query(sql, Invitation.class);
-        String sql1 = "select substr(time, -2) month,in_enuu enUU,count(1) count from(" +
+        String sql1 = "select substr(time, -2) month, time ,in_enuu enUU,count(1) count from(" +
                 "select to_char(in_date, 'yyyy-mm') time,COALESCE(in_active,0),in_enuu from invitationrecords where in_enuu = " + enUU + " and COALESCE(in_active,0) = 1)" +
                 "where time like '%" + year + "%' group by time,in_enuu order by time";
         List<Invitation> done = commonDao.query(sql1, Invitation.class);
@@ -456,7 +444,12 @@ public class InviteRecordServiceImpl implements InviteRecordService {
      */
     @Override
     public ModelMap inviteByBatch(Long enUU, Long userUU, List<InvitationRecord> records, String source) {
+        ModelMap map = new ModelMap();
         Enterprise ve = enterpriseService.findByEnUU(enUU);
+        int size = 0;
+        int fsize = 0;
+        StringBuffer successStr = new StringBuffer();
+        StringBuffer failStr = new StringBuffer();
         if (null == ve) {
             throw new IllegalOperatorException(enUU + "对应的企业不存在！");
         }
@@ -475,13 +468,32 @@ public class InviteRecordServiceImpl implements InviteRecordService {
             record.setActive(Constant.NO);
             record.setSource(source);
             record.setEnuu(enUU);
-            invite(record);
-            // 发送邮件
-            if (null != record.getVenduseremail() && record.getVenduseremail().contains("@")) {
-                sendEmail(record);
+            try {
+                invite(record);
+                // 发送邮件
+                if (null != record.getVenduseremail() && record.getVenduseremail().contains("@")) {
+                    sendEmail(record);
+                }
+                size++;
+                if (successStr.length() > 0) {
+                    successStr.append(";");
+                }
+                successStr.append(record.getVendname());
+            } catch (Exception e) {
+                fsize++;
+                if (failStr.length() > 0) {
+                    failStr.append(";");
+                }
+                failStr.append(record.getVendname());
             }
         }
-        return new ModelMap("success", "邀请已发送,共" + records.size() + "条");
+        if (size > 0) {
+            map.put("success", "发送成" + size + "条，" + successStr + "发送成功");
+        }
+        if (fsize > 0) {
+            map.put("error", "发送失败" + fsize + "条，" + failStr + "发送失败");
+        }
+        return map;
     }
 
     /**
@@ -513,4 +525,20 @@ public class InviteRecordServiceImpl implements InviteRecordService {
             }
         }).run();
     }
+
+    /**
+     * 更新邀请注册记录企业信息
+     *
+     * @param e 企业信息
+     */
+    @Override
+    public void updateVendName(EnterpriseBaseInfo e) {
+        List<InvitationRecord> recordList = invitationRecordService.findByVendUU(e.getUu());
+        if (!CollectionUtils.isEmpty(recordList)) {
+            for (InvitationRecord record : recordList) {
+                record.setVendname(e.getEnName());
+            }
+            invitationRecordDao.save(recordList);
+        }
+    }
 }