Merge branch 'master-xgh-好办停用' into 'developer'

商户停用

See merge request !225

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

@@ -165,5 +165,7 @@ public interface WxEnterpriseRelatedApiService {
 	 * @return
 	 */
 	com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> queryEnterpriseDetail(String wxEnterpriseId, String enterpriseId);
+	
+	public int getRelationCount(String enterpriseId) ;
 
 }

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

@@ -35,4 +35,6 @@ public interface WxEnterpriseRelatedService {
 	 * @return
 	 */
 	void setClerkEdit(String id, int clerkEditFlag);
+	
+	int getRelationCount(String enterpriseId) ;
 }

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

@@ -68,6 +68,11 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
         record.setWxEnterpriseRelatedId(id);
         record.setUpdateTime(new Date());
         mapper.updateByPrimaryKeySelective(record);
-
+    }
+    
+    @Override
+    public int getRelationCount(String enterpriseId) {
+        List<TabHaobanWxEnterpriseRelated> list = this.mapper.listByEnterpriseId(enterpriseId) ;
+        return list.size();
     }
 }

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

@@ -92,6 +92,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
     @Override
     public EnterpriseDetailDTO getByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
         TabHaobanWxEnterpriseRelated entity = wxEnterpriseRelatedService.getByEnterpriseId(wxEnterpriseId, enterpriseId);
+        if(null == entity) {
+            return null ;
+        }
         EnterpriseDetailDTO dto = EntityUtil.changeEntityByJSON(EnterpriseDetailDTO.class, entity);
         return dto;
     }
@@ -698,4 +701,9 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         enterpriseDetailDTO.setCustomerPhone(enterprise.getCustomerPhone());
         return com.gic.api.base.commons.ServiceResponse.success(enterpriseDetailDTO);
     }
+    
+    @Override
+    public int getRelationCount(String enterpriseId) {
+        return this.wxEnterpriseRelatedService.getRelationCount(enterpriseId);
+    }
 }