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

haoban-manage3-service/pom.xml

@@ -115,6 +115,13 @@
             <version>3.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-thirdparty-api</artifactId>
+            <version>${gic-thirdparty-api}</version>
+        </dependency>
+
 		</dependencies>
     
     <build>

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

@@ -479,7 +479,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             TabHaobanPreDealLog dealLog = new TabHaobanPreDealLog();
             dealLog.setDataId(dto.getId().toString());
             dealLog.setpDataId(dto.getParentid().toString());
-            dealLog.setDataType(1);
+            dealLog.setDataType(0);
             dealLog.setStatusFlag(0);
             dealLog.setTaskId(taskId);
             dealLog.setDataContent(JSONObject.toJSONString(dto));

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

@@ -485,27 +485,6 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 
 	@Override
 	public void initwxDepartment(String corpid, String contactSecret, String wxEnterpriseId) {
-//		List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listDepartment(corpid, suiteid, null);
-		logger.info("【同步企业微信】wxEnterpriseId={}",wxEnterpriseId);
-//		
-//		com.gic.wechat.api.dto.qywx.DepartmentDTO rootDepartment = null;
-//		for (com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO : list) {
-//			if("0".equals(departmentDTO.getParentid())){
-//				rootDepartment = departmentDTO;
-//				break;
-//			}
-//		}
-//		
-//		String parentId = addDepartment(rootDepartment, wxEnterpriseId, null,corpid,suiteid);
-//		List<com.gic.wechat.api.dto.qywx.DepartmentDTO> subList = new ArrayList<>();
-//		for (com.gic.wechat.api.dto.qywx.DepartmentDTO departmentDTO : list) {
-//			if(rootDepartment.getId().equals(departmentDTO.getParentid())){
-//				subList.add(departmentDTO);
-//			}
-//		}
-//		
-//		DepartmentDTO parent = EntityUtil.changeEntityByJSON(DepartmentDTO.class,departmentService.selectById(parentId));
-//		this.addSon(subList, wxEnterpriseId, parent,corpid,suiteid);
 		logger.info("【同步企业微信】wxEnterpriseId={}","init-enterprise-" + wxEnterpriseId);
 		String key = "init-enterprise-" + wxEnterpriseId;
 		if(RedisUtil.getCache(key) == null){
@@ -519,9 +498,14 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		}else{
 			RedisUtil.delCache(key);
 		}
-		//RedisUtil.lock("init_enterprise_" + wxEnterpriseId,60 * 60L);
-		//insertMQ(0,wxEnterpriseId, corpid,contactSecret,taskId);
-		//RedisUtil.unlock("init_enterprise_" + wxEnterpriseId);
+		
+//		String taskId = StringUtil.randomUUID();
+//		List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list = this.qywxDepartmentApiService.listSelfDepartment(corpid, contactSecret, null);
+//		logger.info("企业所有部门数据：{}", JSON.toJSONString(list));
+//		if(CollectionUtils.isNotEmpty(list)){
+//			this.addAllDepartment(list, 0, wxEnterpriseId, corpid, contactSecret,taskId);
+//		}
+
 	}
 	
 	
@@ -628,7 +612,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	
 	@Override
 	public boolean isInitLocked(String wxEnterpriseId){
-		return RedisUtil.isLocked("init_enterprise_" + wxEnterpriseId);
+		return RedisUtil.isLocked("init-enterprise-" + wxEnterpriseId);
 		
 	}
 	
@@ -765,8 +749,6 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		if(enterpriseDTO != null){
 			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null){
 				this.initwxDepartment(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
-				enterpriseDTO.setContactFlag(1);
-				this.wxEnterpriseService.update(enterpriseDTO);
 			}
 		}
 		

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

 package com.gic.haoban.manage.service.service.out.impl;
 
+import java.io.InputStream;
+import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -11,15 +12,16 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
-import com.gic.commons.util.ToolUtil;
-import com.gic.haoban.base.api.common.Constant;
+import com.gic.commons.util.GlobalInfo;
+import com.gic.commons.util.GlobalVar;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
-import com.gic.haoban.manage.service.util.EmojiFilterUtil;
+import com.gic.thirdparty.api.dto.PicUploadResDTO;
+import com.gic.thirdparty.api.service.QQCloudPicService;
 import com.vdurmont.emoji.EmojiParser;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.hibernate.hql.internal.CollectionSubqueryFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +100,9 @@ public class StaffApiServiceImpl implements StaffApiService {
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	@Autowired
 	private SyncErrorLogService syncErrorLogService;
+
+	@Autowired
+	private QQCloudPicService qqCloudPicService;
 	
 	@Override
 	public StaffDTO selectById(String staffId) {
@@ -936,7 +941,8 @@ public class StaffApiServiceImpl implements StaffApiService {
 				}
 				//修改
 			} else {
-				staff.setHeadImg(clerkDTO.getHeadImgUrl());
+				String url = changeHeaderImageUrl(clerkDTO.getHeadImgUrl());
+				staff.setHeadImg(url);
 				staff.setSex(clerkDTO.getClerkGender());
 				//staff.setPostion(postion);
 //	    		staff.setStaffName(staffName);
@@ -978,6 +984,19 @@ public class StaffApiServiceImpl implements StaffApiService {
 		return response;
 	}
 
+	private String changeHeaderImageUrl(String headImgUrl) {
+		try {
+			InputStream in = new URL(headImgUrl).openStream();
+			byte[] data = IOUtils.toByteArray(in);
+			PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
+			logger.info("腾讯云万象优图返回" + JSON.toJSONString(uploadPic));
+			return uploadPic.downloadUrl;
+		}catch (Exception e){
+			logger.info("上传腾讯云万象优图返回失败了：", e);
+			return headImgUrl;
+		}
+	}
+
 	/**
 	 * 删除企业微信
 	 *

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

@@ -98,7 +98,7 @@ public class QywxGroupSyncOperation implements BaseSyncOperation {
         TabHaobanDepartment department = departmentService.getByWxId(dealParamMqDTO.getData(), dataPre.getWxEnterpriseId());
         if (department != null) {
             logger.info("已经同步过了:{}", dataPre.getDataId());
-            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门不存在");
+            dealException(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dataPre.getEnterpriseId(), dealParamMqDTO.getData() + ":该部门存在");
             return;
         }
 

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

@@ -56,6 +56,8 @@
         
         <dubbo:reference interface="com.gic.member.api.service.MemberOpenCardBusinessService" id="memberOpenCardBusinessService"/>
         <dubbo:reference id="eSDataDynamicOperationApiService" interface="com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService" timeout="10000"/>
-        
-        
+
+
+    <dubbo:reference id="qqCloudPicService" interface="com.gic.thirdparty.api.service.QQCloudPicService" timeout="10000" retries="0" check="false" />
+
 </beans>
\ No newline at end of file

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

@@ -109,7 +109,9 @@ public class ApplicationController extends WebBaseController{
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
 			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null && enterpriseDTO.getContactFlag() == 0){
-				
+//				this.departmentApiService.initwxDepartmentMQ(enterpriseDTO.getWxEnterpriseId());
+//				enterpriseDTO.setContactFlag(1);
+//				wxEnterpriseApiService.update(enterpriseDTO);
 				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
 		        try {
 					GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, wxEnterpriseId,
@@ -130,7 +132,7 @@ public class ApplicationController extends WebBaseController{
 		WxEnterpriseDTO enterpriseDTO = this.wxEnterpriseApiService.getOne(wxEnterpriseId);
 		if(enterpriseDTO != null){
 			if(StringUtils.isNotBlank(enterpriseDTO.getContactSecret()) && enterpriseDTO.getContactFlag() != null){
-				
+//				
 				log.info("【初始化部门调用】{},{},{}",RouterConstant.INIT_WX_DEPARTMENT_SERVICENAME,RouterConstant.INIT_WX_DEPARTMENT_METHODNAME,wxEnterpriseId);
 		        try {
 					GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, wxEnterpriseId,
@@ -138,9 +140,7 @@ public class ApplicationController extends WebBaseController{
 				} catch (Exception e) {
 					log.info(e.getMessage(),e);
 				}
-				//this.departmentApiService.initwxDepartmentMQ(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
-//				enterpriseDTO.setContactFlag(1);
-//				wxEnterpriseApiService.update(enterpriseDTO);
+//				this.departmentApiService.initwxDepartment(enterpriseDTO.getCorpid(), enterpriseDTO.getContactSecret(), enterpriseDTO.getWxEnterpriseId());
 			}
 		}
 		

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

@@ -16,12 +16,15 @@ import org.springframework.web.bind.annotation.RestController;
 import cn.hutool.core.collection.CollectionUtil;
 
 import com.alibaba.csp.sentinel.util.StringUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -30,17 +33,20 @@ import com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
+import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.BindApiService;
 import com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
 import com.gic.haoban.manage.web.vo.ClerkVo;
 import com.gic.haoban.manage.web.vo.StoreVO;
 import com.gic.redis.data.util.RedisUtil;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 
 @RestController
 public class ClerkController extends WebBaseController{
@@ -64,6 +70,10 @@ public class ClerkController extends WebBaseController{
 	private ClerkMainStoreRelatedApiService clerkMainStoreRelatedApiService;
 	@Autowired
 	private DistributeApiService distributeApiService;
+	@Autowired
+	private QywxUserApiService qywxUserApiService;
+	@Autowired
+	private WxEnterpriseApiService wxEnterpriseApiService;
 	
 	//导购列表
 	@RequestMapping("/clerk-list")
@@ -331,13 +341,18 @@ public class ClerkController extends WebBaseController{
 		if(staff == null){
 			return resultResponse(HaoBanErrCode.ERR_10006);
 		}
-		String key = "haoban_set_main_store_" + yyyyMM + staffId;
-		Object hasSet = RedisUtil.getCache(key);
-		if(hasSet == null){
-			RedisUtil.setCache(key,true,31 * 24 * 60 * 60l);
-			clerkMainStoreRelatedApiService.setMainStore(staffId,storeId,wxEnterpriseId);
+		String key = "haoban_fresh_wx_friend" + yyyyMM + staffId;
+		Integer count =  RedisUtil.getCache(key) == null ? 0 : (Integer)RedisUtil.getCache(key);
+		if(count == null || count < 4){
+			WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
+			RedisUtil.setCache(key,count + 1,31 * 24 * 60 * 60l);
+			String res = qywxUserApiService.listSelfExternalUserid(enterprise.getCorpid(), enterprise.getWxSecretKey(), staff.getWxUserId());
+			JSONObject json = JSON.parseObject(res);
+			if("0".equals(json.getString("errcode"))){
+				
+			}
 		}else{
-			return resultResponse(HaoBanErrCode.ERR_10007);
+			return resultResponse(HaoBanErrCode.ERR_10011);
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}

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

@@ -193,6 +193,7 @@ public enum HaoBanErrCode {
     
     ERR_10009(10009,"门店不存在"),
     ERR_10010(10010,"gic新增失败"),
+    ERR_10011(10011,"每月最多可刷新4次"),
 
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),