fix

virgo.core/src/main/java/com/bosshand/virgo/core/controller/UserContextController.java

@@ -237,10 +237,4 @@ public class UserContextController {
 		return Response.ok(jsonObject);
 	}
 
-	@ApiOperation(value = "企业三要素验证V2", notes = "企业三要素验证V2")
-	@RequestMapping(value = "/companyCheck", method = RequestMethod.POST)
-	public Response companyCheck(@RequestBody CompanyCheck companyCheck) {
-		return Response.ok(mgrUserService.companyCheck(companyCheck));
-	}
-
 }

virgo.core/src/main/java/com/bosshand/virgo/core/dao/MgrOrganizationDao.java

@@ -1,11 +1,10 @@
 package com.bosshand.virgo.core.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.bosshand.virgo.core.model.MgrOrganization;
 import org.apache.ibatis.annotations.Mapper;
 
-import com.bosshand.virgo.core.model.MgrOrganization;
+import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MgrOrganizationDao {
@@ -32,6 +31,8 @@ public interface MgrOrganizationDao {
 
 	public int updateStatus(MgrOrganization mgrOrganization);
 
+	public int updateCertificationStatus(MgrOrganization mgrOrganization);
+
 	public List<MgrOrganization> organizationByIds(List<Long> ids);
 
 	public int setOrganizedDataCenter(MgrOrganization mgrOrganization);

virgo.core/src/main/java/com/bosshand/virgo/core/model/CompanyCheck.java

@@ -1,44 +0,0 @@
-package com.bosshand.virgo.core.model;
-
-/**
- * 企业三要素验证V2
- */
-public class CompanyCheck {
-
-    /**
-     * 公司名称
-     */
-    private String companyName;
-    /**
-     * 统一社会信用代码
-     */
-    private String creditNo;
-    /**
-     * 法人姓名
-     */
-    private String legalPerson;
-
-    public String getCompanyName() {
-        return companyName;
-    }
-
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
-    }
-
-    public String getCreditNo() {
-        return creditNo;
-    }
-
-    public void setCreditNo(String creditNo) {
-        this.creditNo = creditNo;
-    }
-
-    public String getLegalPerson() {
-        return legalPerson;
-    }
-
-    public void setLegalPerson(String legalPerson) {
-        this.legalPerson = legalPerson;
-    }
-}

virgo.core/src/main/java/com/bosshand/virgo/core/model/MgrOrganization.java

@@ -61,6 +61,19 @@ public class MgrOrganization implements BaseModel {
      */
     private Integer facilitator;
 
+    /**
+     * 统一社会信用代码
+     */
+    private String creditNo;
+    /**
+     * 法人姓名
+     */
+    private String legalPerson;
+    /**
+     * 认证状态
+     */
+    private int certificationStatus;
+
     public long getId() {
         return id;
     }
@@ -180,4 +193,28 @@ public class MgrOrganization implements BaseModel {
     public void setFacilitator(Integer facilitator) {
         this.facilitator = facilitator;
     }
+
+    public String getCreditNo() {
+        return creditNo;
+    }
+
+    public void setCreditNo(String creditNo) {
+        this.creditNo = creditNo;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public int getCertificationStatus() {
+        return certificationStatus;
+    }
+
+    public void setCertificationStatus(int certificationStatus) {
+        this.certificationStatus = certificationStatus;
+    }
 }

virgo.core/src/main/java/com/bosshand/virgo/core/service/MgrUserService.java

@@ -548,35 +548,4 @@ public class MgrUserService {
 
 	}
 
-	/**
-	 * 企业三要素验证V2
-	 */
-	public JSONObject companyCheck(CompanyCheck companyCheck) {
-		String appid = "vSkTV1F17aS72hx4rM8eJKTzIDvTBoLm";
-		String app_security = "ZblFsh41FLQmbbAAyjdqufSXHmmOOtJW";
-		String timestamp = String.valueOf(System.currentTimeMillis());
-		String sign = DigestUtils.md5Hex(appid + "&" + timestamp + "&" + app_security);
-		String companyName = "";
-		String legalPerson = "";
-		try {
-			companyName = URLEncoder.encode(companyCheck.getCompanyName(), "utf-8");
-			legalPerson = URLEncoder.encode(companyCheck.getLegalPerson(), "utf-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		String url = "https://api.shumaidata.com/v4/company-three/check/v2?companyName="
-				+ companyName
-				+ "&creditNo="
-				+ companyCheck.getCreditNo()
-				+ "&legalPerson="
-				+ legalPerson
-				+ "&appid="
-				+ appid
-				+ "&timestamp="
-				+ timestamp
-				+ "&sign=" + sign;
-		String str = WeChatUtil.httpRequest(url, "GET", null);
-		return JSONObject.parseObject(str).getJSONObject("data");
-	}
-
 }

virgo.core/src/main/resources/mapper/MgrOrganizationMapper.xml

@@ -18,6 +18,9 @@
 	<result column="organizedDataCenter" property="organizedDataCenter"/>
 	<result column="organizationCode" property="organizationCode"/>
 	<result column="facilitator" property="facilitator"/>
+	<result column="creditNo" property="creditNo"/>
+	<result column="legalPerson" property="legalPerson"/>
+	<result column="certificationStatus" property="certificationStatus"/>
 </resultMap>
 
 <select id="getById" resultMap="MgrOrganizationResult">
@@ -93,8 +96,8 @@
 </select>
 
 <insert id="insert" parameterType="com.bosshand.virgo.core.model.MgrOrganization" useGeneratedKeys="true" keyProperty="id">
-	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode, facilitator)
-	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode}, #{facilitator})
+	INSERT into mgr_organization(logo, name, contact, contactTel, address, businessLicense, introduction, registerDate, status, organizationCode, facilitator, creditNo, legalPerson)
+	values(#{logo}, #{name}, #{contact}, #{contactTel}, #{address}, #{businessLicense}, #{introduction}, now(), #{status}, #{organizationCode}, #{facilitator}, #{creditNo}, #{legalPerson})
 </insert>
 
 <update id="update" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
@@ -111,6 +114,8 @@
 		<if test="registerDate!=null">registerDate=#{registerDate},</if>
 		<if test="organizedDataCenter!=0">organizedDataCenter=#{organizedDataCenter},</if>
 		<if test="facilitator!=null">facilitator=#{facilitator},</if>
+		<if test="creditNo!=null">creditNo=#{creditNo},</if>
+		<if test="legalPerson!=null">legalPerson=#{legalPerson},</if>
 	</trim>
 	WHERE id=#{id}
 </update>
@@ -118,12 +123,19 @@
 <update id="updateStatus" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
 	UPDATE mgr_organization
 	<trim prefix="set" suffixOverrides=",">
-		<if test="id!=null">id=#{id},</if>
 		<if test="status == 0 or status == 1">status=#{status},</if>
 	</trim>
 	WHERE id=#{id}
 </update>
 
+<update id="updateCertificationStatus" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
+	UPDATE mgr_organization
+	<trim prefix="set" suffixOverrides=",">
+		<if test="certificationStatus == 0 or certificationStatus == 1">certificationStatus=#{certificationStatus},</if>
+	</trim>
+	WHERE id=#{id}
+</update>
+
 <update id="setOrganizedDataCenter" parameterType="com.bosshand.virgo.core.model.MgrOrganization">
 	UPDATE mgr_organization set organizedDataCenter = #{organizedDataCenter} WHERE id=#{id}
 </update>

virgo.manager/src/main/java/com/bosshand/virgo/controller/OrganizationController.java

@@ -78,4 +78,10 @@ public class OrganizationController {
 		return Response.ok(mgrOrganization);
 	}
 
+	@ApiOperation(value = "企业三要素验证V2", notes = "企业三要素验证V2")
+	@RequestMapping(value = "/companyCheck/{id}", method = RequestMethod.GET)
+	public Response companyCheck(@PathVariable long id) {
+		return Response.ok(organizationService.companyCheck(id));
+	}
+
 }

virgo.manager/src/main/java/com/bosshand/virgo/service/OrganizationService.java

@@ -3,9 +3,13 @@ package com.bosshand.virgo.service;
 import com.alibaba.fastjson.JSONObject;
 import com.bosshand.virgo.core.dao.MgrOrganizationDao;
 import com.bosshand.virgo.core.model.MgrOrganization;
+import com.bosshand.virgo.core.utils.WeChatUtil;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -82,4 +86,45 @@ public class OrganizationService {
 		return mgrOrganizationDao.getTotalCount(data);
 	}
 
+	/**
+	 * 企业三要素验证V2
+	 */
+	public JSONObject companyCheck(long id) {
+
+		MgrOrganization mgrOrganization = mgrOrganizationDao.get(id);
+
+		String appid = "vSkTV1F17aS72hx4rM8eJKTzIDvTBoLm";
+		String app_security = "ZblFsh41FLQmbbAAyjdqufSXHmmOOtJW";
+		String timestamp = String.valueOf(System.currentTimeMillis());
+		String sign = DigestUtils.md5Hex(appid + "&" + timestamp + "&" + app_security);
+		String companyName = "";
+		String legalPerson = "";
+		try {
+			companyName = URLEncoder.encode(mgrOrganization.getName(), "utf-8");
+			legalPerson = URLEncoder.encode(mgrOrganization.getLegalPerson(), "utf-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		String url = "https://api.shumaidata.com/v4/company-three/check/v2?companyName="
+				+ companyName
+				+ "&creditNo="
+				+ mgrOrganization.getCreditNo()
+				+ "&legalPerson="
+				+ legalPerson
+				+ "&appid="
+				+ appid
+				+ "&timestamp="
+				+ timestamp
+				+ "&sign=" + sign;
+		String str = WeChatUtil.httpRequest(url, "GET", null);
+		JSONObject data = JSONObject.parseObject(str).getJSONObject("data");
+		int result = data.getIntValue("result");
+		if (result == 1) {
+			mgrOrganization.setCertificationStatus(1);
+			mgrOrganizationDao.updateCertificationStatus(mgrOrganization);
+		}
+		return data;
+	}
+
+
 }