From 8a502afe1bb17561437d4b34dbdfdcd1e1233862 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Fri, 28 Feb 2020 21:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BB=A3=E7=A0=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApiCustomEnterpriseController.java    | 12 ++++++------
 .../service/impl/CustomEnterpriseServiceImpl.java    |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
index 1a01f4f52..dd521cb61 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomEnterpriseController.java
@@ -3,11 +3,9 @@ package com.elink.esua.epdc.controller;
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
-import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
-import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.service.CustomEnterpriseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +31,9 @@ public class ApiCustomEnterpriseController {
      * @Date 2020/2/28
      * @Param [enterpriseInfoDTO]
      **/
-    @GetMapping("completeSelectiveInfo")
-    public Result completeEnterpriseInfo(EnterpriseInfoFormDTO enterpriseInfoFormDTO) {
+    @PostMapping("completeSelectiveInfo")
+    public Result completeEnterpriseInfo(@RequestBody EnterpriseInfoFormDTO enterpriseInfoFormDTO) {
+        ValidatorUtils.validateEntity(enterpriseInfoFormDTO);
         return customEnterpriseService.completeEnterpriseInfo(enterpriseInfoFormDTO);
     }
 
@@ -60,7 +59,8 @@ public class ApiCustomEnterpriseController {
      * @date 2020/2/28 13:34
      */
     @PostMapping("completeRequisiteInfo")
-    public Result completeRequisiteInfo(@LoginUser TokenDto tokenDto, CompleteRequisiteInfoDTO fromDto) {
+    public Result completeRequisiteInfo(@LoginUser TokenDto tokenDto, @RequestBody CompleteRequisiteInfoDTO fromDto) {
+        ValidatorUtils.validateEntity(fromDto);
         return customEnterpriseService.completeRequisiteInfo(fromDto, tokenDto);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
index 9a022eaff..b08b8f45c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomEnterpriseServiceImpl.java
@@ -55,7 +55,11 @@ public class CustomEnterpriseServiceImpl implements CustomEnterpriseService {
         this.checkSmsCode(formDto.getMobile(), formDto.getSmsCode());
         formDto.setUserId(tokenDto.getUserId());
         formDto.setWxUnionId(getWxUnionId(formDto.getWxCode(), formDto.getIv(), formDto.getEncryptedData()));
-        formDto.setUniformSocialCreditCode((ModuleUtils.replaceIllegalCharacter(formDto.getUniformSocialCreditCode())).toUpperCase());
+        String uniformSocialCreditCode = ModuleUtils.replaceIllegalCharacter(formDto.getUniformSocialCreditCode());
+        if (StringUtils.isBlank(uniformSocialCreditCode)) {
+            return new Result().error("请填写正确的统一社会信用代码");
+        }
+        formDto.setUniformSocialCreditCode(uniformSocialCreditCode.toUpperCase());
         return customFeignClient.completeRequisiteInfo(formDto);
     }