简化注册流程： 表单数据修改

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -1,6 +1,9 @@
 package com.uas.platform.b2c.common.account.controller;
 
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
+import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
@@ -68,7 +71,7 @@ public class EnterpriseController {
 	 * @return
 	 */
 	@RequestMapping(value = "/register", method = RequestMethod.POST)
-	public ResultMap registerEnterprise(@RequestBody Enterprise enterprise, String filePath) {
+	public ResultMap registerEnterprise(@RequestBody FormEnterprise enterprise, String filePath) {
 		return enterpriseService.registerEnterprise(enterprise,filePath,SystemSession.getUser());
 	}
 
@@ -90,25 +93,4 @@ public class EnterpriseController {
 		return enterpriseService.validBusinessCode(businessCode);
 	}
 
-
-	/**
-	 * 开通企业卖家功能
-	 *
-	 * @param enUU
-	 */
-	@RequestMapping(value = "/openVendor/{enUU}", method = RequestMethod.POST)
-	public void openVendor(@PathVariable("enUU") long enUU) {
-		 enterpriseService.openVendor(enUU,true);
-	}
-
-	/**
-	 * 设置卖家中心预开通状态
-	 *
-	 * @param enUU
-	 */
-	@RequestMapping(value = "/openVendorSetRead/{enUU}", method = RequestMethod.POST)
-	public void getOpenVendor(@PathVariable("enUU") long enUU) {
-		 enterpriseService.openVendor(enUU,false);
-	}
-
 }

src/main/java/com/uas/platform/b2c/common/account/model/FormEnterprise.java

@@ -0,0 +1,125 @@
+package com.uas.platform.b2c.common.account.model;
+
+/**
+ * Created by wangdy on 2017-09-13.
+ */
+public class FormEnterprise {
+
+    private String name;
+    private String lawPerson;
+    private String url;
+    private String licenceId;
+    private String address;
+    private String linkman;
+    private String phone;
+    private String email;
+    private String fax;
+    private String website;
+    private String profession;
+    private String logoUrl;
+    private String[] tagsData;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLawPerson() {
+        return lawPerson;
+    }
+
+    public void setLawPerson(String lawPerson) {
+        this.lawPerson = lawPerson;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getLicenceId() {
+        return licenceId;
+    }
+
+    public void setLicenceId(String licenceId) {
+        this.licenceId = licenceId;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getProfession() {
+        return profession;
+    }
+
+    public void setProfession(String profession) {
+        this.profession = profession;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public String[] getTagsData() {
+        return tagsData;
+    }
+
+    public void setTagsData(String[] tagsData) {
+        this.tagsData = tagsData;
+    }
+}

src/main/java/com/uas/platform/b2c/common/account/model/UserCacheEnterprise.java

@@ -15,41 +15,46 @@ public class UserCacheEnterprise {
     @Column(name = "user_uu")
     private Long userUU;
 
-    /**
-     * 公司名称
-     */
-    @Column(name = "en_name")
-    private String enName;
-    /**
-     * 简称
-     */
-    @Column(name = "en_shortname")
-    private String enShortname;
 
-    /**
-     * 商业认证图
-     */
-    @Column(name = "en_businesscodeimage")
-    private String enBussinessCodeImage;
 
-    /**
-    /**
-     * 商业登记证号
-     */
-    @Column(name = "en_businesscode")
-    private String enBussinessCode;
+    @Column(name = "name")
+    private String name;
 
-    /**
-     * 注册地址
-     */
-    @Column(name = "en_address")
-    private String enAddress;
+    @Column(name = "lawPerson")
+    private String lawPerson;
 
-    /**
-     * 公司主页地址
-     */
-    @Column(name = "en_url")
-    private String enUrl;
+    @Column(name = "url")
+    private String url;
+
+    @Column(name = "licenceId")
+    private String licenceId;
+
+    @Column(name = "address")
+    private String address;
+
+    @Column(name = "linkman")
+    private String linkman;
+
+    @Column(name = "phone")
+    private String phone;
+
+    @Column(name = "email")
+    private String email;
+
+    @Column(name = "fax")
+    private String fax;
+
+    @Column(name = "website")
+    private String website;
+
+    @Column(name = "profession")
+    private String profession;
+
+    @Column(name = "logoUrl")
+    private String logoUrl;
+
+    @Column(name = "tagsData")
+    private String[] tagsData;
 
 
     /**
@@ -59,7 +64,6 @@ public class UserCacheEnterprise {
     private boolean enIsRead;
 
 
-
     public Long getUserUU() {
         return userUU;
     }
@@ -68,60 +72,115 @@ public class UserCacheEnterprise {
         this.userUU = userUU;
     }
 
-    public String getEnName() {
-        return enName;
+    public String getName() {
+        return name;
     }
 
-    public void setEnName(String enName) {
-        this.enName = enName;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getEnShortname() {
-        return enShortname;
+    public String getLawPerson() {
+        return lawPerson;
     }
 
-    public void setEnShortname(String enShortname) {
-        this.enShortname = enShortname;
+    public void setLawPerson(String lawPerson) {
+        this.lawPerson = lawPerson;
     }
 
-    public String getEnBussinessCode() {
-        return enBussinessCode;
+    public String getUrl() {
+        return url;
     }
 
-    public void setEnBussinessCode(String enBussinessCode) {
-        this.enBussinessCode = enBussinessCode;
+    public void setUrl(String url) {
+        this.url = url;
     }
 
-    public String getEnAddress() {
-        return enAddress;
+    public String getLicenceId() {
+        return licenceId;
     }
 
-    public void setEnAddress(String enAddress) {
-        this.enAddress = enAddress;
+    public void setLicenceId(String licenceId) {
+        this.licenceId = licenceId;
     }
 
-    public String getEnUrl() {
-        return enUrl;
+    public String getAddress() {
+        return address;
     }
 
-    public void setEnUrl(String enUrl) {
-        this.enUrl = enUrl;
+    public void setAddress(String address) {
+        this.address = address;
     }
 
-    public boolean isEnIsRead() {
-        return enIsRead;
+    public String getLinkman() {
+        return linkman;
     }
 
-    public void setEnIsRead(boolean enIsRead) {
-        this.enIsRead = enIsRead;
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
     }
 
+    public String getPhone() {
+        return phone;
+    }
 
-    public String getEnBussinessCodeImage() {
-        return enBussinessCodeImage;
+    public void setPhone(String phone) {
+        this.phone = phone;
     }
 
-    public void setEnBussinessCodeImage(String enBussinessCodeImage) {
-        this.enBussinessCodeImage = enBussinessCodeImage;
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public String getProfession() {
+        return profession;
+    }
+
+    public void setProfession(String profession) {
+        this.profession = profession;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public String[] getTagsData() {
+        return tagsData;
+    }
+
+    public void setTagsData(String[] tagsData) {
+        this.tagsData = tagsData;
+    }
+
+    public boolean isEnIsRead() {
+        return enIsRead;
+    }
+
+    public void setEnIsRead(boolean enIsRead) {
+        this.enIsRead = enIsRead;
     }
 }

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -1,6 +1,8 @@
 package com.uas.platform.b2c.common.account.service;
 
+import com.uas.platform.b2c.common.account.controller.EnterpriseController;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.trade.support.ResultMap;
 
@@ -29,7 +31,7 @@ public interface EnterpriseService {
 	 * 个人用户注册企业信息
 	 * @return 店铺信息
 	 */
-	ResultMap registerEnterprise(Enterprise enterprise, String filePath,User user);
+	ResultMap registerEnterprise(FormEnterprise enterprise, String filepath, User user);
 
 	/**
 	 * 个人用户注册企业信息(验证名称)

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -6,6 +6,7 @@ import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserBaseInfoDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
@@ -118,18 +119,26 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	}
 
 	@Override
-	public ResultMap registerEnterprise(Enterprise enterprise, String filePath, User user) {
+	public ResultMap registerEnterprise(FormEnterprise enterprise, String filePath,  User user) {
 		UserSpaceDetail detail = new UserSpaceDetail();
-		detail.setName(enterprise.getEnName());
-		detail.setShortName(enterprise.getEnShortname());
-		detail.setBusinessCode(enterprise.getEnBussinessCode());
-		detail.setBusinessCodeImage(filePath);
-		if (null == detail.getName()|| null == detail.getShortName() || null==detail.getBusinessCode() || null==detail.getBusinessCodeImage()){
+		detail.setName(enterprise.getName());
+		detail.setShortName(null);
+		detail.setBusinessCode(enterprise.getLicenceId());
+		detail.setBusinessCodeImage(enterprise.getUrl());
+		if (null == detail.getName()|| null==detail.getBusinessCode() || null==detail.getBusinessCodeImage()){
 			return new ResultMap(CodeType.SYSTEM_NOT_EXIST, "参数不能为空");
 		}
 		detail.setArea("中国大陆");
-		detail.setAddress(enterprise.getEnAddress());
-		detail.setUrl(enterprise.getEnUrl());
+		detail.setCorporation(enterprise.getLawPerson());
+		detail.setAddress(enterprise.getAddress());
+		detail.setUrl(enterprise.getWebsite());
+		detail.setContactMan(enterprise.getLinkman());
+		detail.setContactTel(enterprise.getPhone());
+		detail.setContactEmail(enterprise.getEmail());
+		detail.setFax(enterprise.getFax());
+        detail.setLogoImage(enterprise.getLogoUrl());
+		detail.setProfession(enterprise.getProfession());
+		detail.setTags(enterprise.getTagsData().toString());
 		detail.setAdminName(user.getUserName());
 		detail.setAdminEmail(user.getUserEmail());
 		detail.setAdminTel(user.getUserTel());