111

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -7,7 +7,7 @@ import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 public interface WxEnterpriseRelatedApiService {
 	List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
 	
-	void wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version);
+	int  wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version);
 	
 	String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -33,11 +33,12 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		return result;
 	}
 	@Override
-	public void wxEnterpriseBind(String enterpriseId, String wxEnterpriseId,
+	public int wxEnterpriseBind(String enterpriseId, String wxEnterpriseId,
 			String version) {
 		TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedMapper.findOneByEnterpriseId(enterpriseId);
 		if(tab!= null){
 			logger.info("该gicEnterpriseId已经绑定过了");
+			return 1;
 		}else{
 			 tab = new TabHaobanWxEnterpriseRelated();
 			 tab.setEnterpriseId(enterpriseId);
@@ -49,6 +50,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 			 tab.setWxEnterpriseRelatedId(UuidUtil.randomUUID());
 			 wxEnterpriseRelatedMapper.insertSelective(tab);
 		}
+		return 0;
 	}
 	@Override
 	public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -38,7 +38,10 @@ public class WxEnterpriseController extends WebBaseController{
 	//微信企业绑定接口
 	@RequestMapping("wx-enterprise-bind")
 	public HaobanResponse wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version) {
-		wxEnterpriseRelatedApiService.wxEnterpriseBind(enterpriseId,wxEnterpriseId,version);
+		int i = wxEnterpriseRelatedApiService.wxEnterpriseBind(enterpriseId,wxEnterpriseId,version);
+		if(i==1){
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1);
  
 	}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -67,7 +67,7 @@ public enum HaoBanErrCode {
     
     ERR_10004(10004,"成员名称不能为空"),
     ERR_10005(10005,"成员已存在"),
-
+    ERR_10006(10006,"该企业已经绑定过了"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");