|
|
@@ -1,7 +1,6 @@
|
|
|
package com.uas.platform.b2b.controller;
|
|
|
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
-import java.net.URLDecoder;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -9,12 +8,15 @@ import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.HttpStatus;
|
|
|
+import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
@@ -23,10 +25,13 @@ import org.springframework.web.bind.annotation.ResponseStatus;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2b.core.util.SearchKeyUtils;
|
|
|
+import com.uas.platform.b2b.model.Attach;
|
|
|
import com.uas.platform.b2b.model.Enterprise;
|
|
|
+import com.uas.platform.b2b.model.FileUpload;
|
|
|
import com.uas.platform.b2b.model.QueriableMember;
|
|
|
import com.uas.platform.b2b.model.QueriableUser;
|
|
|
import com.uas.platform.b2b.model.User;
|
|
|
+import com.uas.platform.b2b.service.AttachService;
|
|
|
import com.uas.platform.b2b.service.EnterpriseService;
|
|
|
import com.uas.platform.b2b.service.MonthProdioService;
|
|
|
import com.uas.platform.b2b.service.UserService;
|
|
|
@@ -53,6 +58,9 @@ public class PublicQueryController {
|
|
|
|
|
|
@Autowired
|
|
|
private MonthProdioService monthProdIoService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private AttachService attachService;
|
|
|
|
|
|
/**
|
|
|
* 按企业名称、简称、UU号等查找企业信息
|
|
|
@@ -171,4 +179,42 @@ public class PublicQueryController {
|
|
|
vendor, date);
|
|
|
return json;
|
|
|
}
|
|
|
+ /**
|
|
|
+ * 验证ERP注册信息
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/Validation", method = RequestMethod.POST)
|
|
|
+ @ResponseBody
|
|
|
+ public ModelMap validation(@RequestBody String enterprise) {
|
|
|
+ Enterprise enter = FlexJsonUtils.fromJson(enterprise, Enterprise.class);// 需要把字符串转成Object
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ map.put("tel", userService.isTelUseable(enter.getEnAdminTel()));
|
|
|
+ map.put("email", userService.isEmailUseable(enter.getEnAdminEmail()));
|
|
|
+ map.put("bussinessCode", enterpriseService.bussinessCodeEnable(enter.getEnBussinessCode()));
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 注册新企业用户
|
|
|
+ */
|
|
|
+ @RequestMapping(value="/erpRegister", method = RequestMethod.POST)
|
|
|
+ public @ResponseBody ResponseEntity<ModelMap> register(String enterprise, FileUpload uploadItem, Boolean isSaas) {
|
|
|
+ HttpHeaders headers = new HttpHeaders();
|
|
|
+ headers.add("Content-Type", "application/json; charset=utf-8");
|
|
|
+ ModelMap map = new ModelMap();
|
|
|
+ Enterprise newEnterprise = FlexJsonUtils.fromJson(enterprise, Enterprise.class);// 需要把字符串转成Object
|
|
|
+ Attach attach = attachService.upload(uploadItem, "bussinessCodeImg", "客户营业执照复印件或照片");// 先保存上传到文件
|
|
|
+ if (attach == null) {// 文件过大
|
|
|
+ map.put("error", "文件过大");
|
|
|
+ return new ResponseEntity<ModelMap>(map, headers, HttpStatus.FORBIDDEN);
|
|
|
+ } else {// 上传成功
|
|
|
+ newEnterprise.setEnBussinessCodeAttach(attach);
|
|
|
+ Enterprise regEnterprise = enterpriseService.registerEnterprise(newEnterprise, isSaas);
|
|
|
+ if (regEnterprise == null) {// 营业执照码验证
|
|
|
+ map.put("error", "操作失败");
|
|
|
+ return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
|
|
|
+ }
|
|
|
+ map.put("uu", regEnterprise.getUu());
|
|
|
+ return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|