Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -37,4 +37,6 @@ public interface WxEnterpriseApiService {
 	List<YwWxEnterpriseDTO> listAll();
 	
 	List<YwWxEnterpriseDTO> listByIds(Set<String> enterpriseIds);
+	
+	boolean enterpriseIsOver(String enterpriseId);
 }

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
 import com.alibaba.fastjson.JSON;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
-import com.gic.haoban.manage.service.service.DepartmentService;
-import com.gic.wechat.api.dto.qywx.DepartmentDTO;
-import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
@@ -48,6 +42,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	@Autowired
 	private WxApplicationService wxApplicationService;
 	
+	@Autowired
+	private EnterpriseService enterpriseService;
+	
 	@Override
 	public void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto) {
 		log.info("企业微信授权信息：{}", JSON.toJSONString(dto));
@@ -127,4 +124,20 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 		wxEnterpriseService.update(enterpriseDTO);
 		
 	}
+	
+	@Override
+	public boolean enterpriseIsOver(String enterpriseId) {
+		if(StringUtils.isEmpty(enterpriseId)){
+			return true;
+		}
+		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
+		if(enterprise == null || enterprise.getExpireTime() == null){
+			return true;
+		}
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
+			return false;
+		}
+		return true;
+		
+	}
 }

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -65,5 +65,7 @@
     <dubbo:reference id="qqCloudPicService" interface="com.gic.thirdparty.api.service.QQCloudPicService" timeout="10000" retries="0" check="false" />
     
     <dubbo:reference id="innerApiService" interface="com.gic.haoban.app.customer.service.api.service.InnerApiService" timeout="10000" retries="0" check="false" />
+    
+    <dubbo:reference id="enterpriseService" interface="com.gic.enterprise.api.service.EnterpriseService" timeout="10000" retries="0" check="false" />
 
 </beans>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaterialMapper.xml

@@ -228,6 +228,7 @@
     from tab_haoban_material
     where category_id = #{categoryId,jdbcType=VARCHAR}
     and status_flag = 1
+    order by update_time desc 
   </select>
   
   <select id="listMaterial" resultMap="BaseResultMap" >
@@ -245,5 +246,7 @@
       <if test="categoryId != null">
    	and category_id = #{categoryId}
     </if> 
+    
+    order by update_time desc
   </select>
 </mapper>
\ No newline at end of file