企业注册增加邀请人信息记录

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/service/impl/InvitationRecordServiceImpl.java

@@ -211,7 +211,6 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
                         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());
 						record.setProductNum(productDao.countByEnUU(enters.get(0).getUu()));
                     } else {

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);