Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java

@@ -76,6 +76,8 @@ public class WxEnterpriseDTO implements Serializable {
     private Date contactSecretLastTime;
     
     private Date memberSecretLastTime;
+    
+    private Integer storeTotal;
 
     private Date createTime;
 
@@ -389,6 +391,14 @@ public class WxEnterpriseDTO implements Serializable {
 		this.contactSecretFlag = contactSecretFlag;
 	}
 
+	public Integer getStoreTotal() {
+		return storeTotal;
+	}
+
+	public void setStoreTotal(Integer storeTotal) {
+		this.storeTotal = storeTotal;
+	}
+
 	
 	
     

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

@@ -164,5 +164,11 @@ public interface DepartmentApiService {
 	boolean isInitLocked(String wxEnterpriseId);
 	
 	void syncWxDepartmentByParentMQ(String res);
+	/**
+	 * 统计门店总数
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	Integer totalStoreCountByEnterpriseId(String wxEnterpriseId);
 
 }

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

@@ -69,7 +69,7 @@ public enum HaoBanErrCode {
     ERR_10005(10005,"成员已存在"),
     ERR_10006(10006,"字典key已存在"),
     ERR_10007(10007,"字典名称已存在"),
-
+    ERR_10008(10008,"title已存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -64,4 +64,6 @@ public interface DepartmentMapper {
 	List<TabHaobanDepartment> listByIds(@Param("departmentIds")List<String> departmentIds);
 
 	TabHaobanDepartment getTempFlagDepartment(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+	Integer totalStoreCountByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -54,4 +54,6 @@ public interface DepartmentService {
 	 */
 	DepartmentDTO getTempFlagDepartment(String wxEnterpriseId);
 
+	Integer totalStoreCountByEnterpriseId(String wxEnterpriseId);
+
 }

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

@@ -190,4 +190,9 @@ public class DepartmentServiceImpl implements DepartmentService {
 	public DepartmentDTO getTempFlagDepartment(String wxEnterpriseId) {
 		return EntityUtil.changeEntityByJSON(DepartmentDTO.class, mapper.getTempFlagDepartment(wxEnterpriseId));
 	}
+
+	@Override
+	public Integer totalStoreCountByEnterpriseId(String wxEnterpriseId) {
+		return mapper.totalStoreCountByEnterpriseId(wxEnterpriseId);
+	}
 }

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

@@ -753,4 +753,9 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		}
 		
 	}
+
+	@Override
+	public Integer totalStoreCountByEnterpriseId(String wxEnterpriseId) {
+		return departmentService.totalStoreCountByEnterpriseId(wxEnterpriseId);
+	}
 }

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

@@ -20,6 +20,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanDict;
 import com.gic.haoban.manage.service.entity.TabHaobanHelp;
 import com.github.pagehelper.PageHelper;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -35,6 +36,11 @@ public class HelpApiServiceImpl implements HelpApiService{
 			//空，则新增
 			dto.setHelpId(UuidUtil.randomUUID());
 			TabHaobanHelp tab = EntityUtil.changeEntity(TabHaobanHelp.class, dto);
+			tab.setStatusFlag(1);
+			tab.setCreateTime(new Date());
+			tab.setUpdateTime(new Date());
+			tab.setOpenFlag(1);
+			tab.setSort(1);
 			TabHaobanHelp tab1 = tabHaobanHelpMapper.selectByHelpTitle(dto.getHelpTitle());
 			if(tab1!=null){
 				return 8;
@@ -42,6 +48,7 @@ public class HelpApiServiceImpl implements HelpApiService{
 			tabHaobanHelpMapper.insert(tab);
 		}else{
 			TabHaobanHelp tab = EntityUtil.changeEntity(TabHaobanHelp.class, dto);
+			tab.setUpdateTime(new Date());
 			tabHaobanHelpMapper.updateByPrimaryKeySelective(tab);
 		}	
 		return 1;

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

@@ -24,6 +24,8 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.MD5Utils;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.util.StringUtil;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.contacts.manage.api.dto.SearchDataDTO;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.MemberStoreDTO;
@@ -37,10 +39,12 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
 import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
+import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
 import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
@@ -97,6 +101,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private StaffDepartmentRelatedService staffDepartmentRelatedService;
 	@Autowired
 	private ESDataDynamicOperationApiService eSDataDynamicOperationApiService;
+	@Autowired
+	private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
+	@Autowired
+	private StoreService storeService;
 	
 	@Autowired
 	private Config config;
@@ -249,15 +257,27 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
-		
-		
+		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, wxEnterprise.getWxEnterpriseId());
+		if(staff == null){
+			return "";
+		}
+		TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staff.getStaffId(),wxEnterprise.getWxEnterpriseId());
+		StoreDTO mainStore = null;
 		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+			if(r != null){
+				mainStore = storeService.getStore(r.getStoreId());
+				if(mainStore != null){
+					if(!tabHaobanWxEnterpriseRelated.getEnterpriseId().equals(mainStore.getEnterpriseId())){
+						continue;
+					}
+				}
+			}
 			String key = "external" + tabHaobanWxEnterpriseRelated.getEnterpriseId() + "_"+ userId1 + "_" + name + "_" + createTime;
 			RedisUtil.lock(key,2l);
 			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			dto.setEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
-			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			//TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){
 				continue;
 			}
@@ -271,7 +291,13 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 					if(depart != null && tabHaobanWxEnterpriseRelated != null && depart.getEnterpriseId() != null && tabHaobanWxEnterpriseRelated.getEnterpriseId() != null){
 						log.info("【部门list】enterpriseId={},enterpriseId2={}",depart.getEnterpriseId(),tabHaobanWxEnterpriseRelated.getEnterpriseId());
 						if(depart.getEnterpriseId().equals(tabHaobanWxEnterpriseRelated.getEnterpriseId())){
-							rList.add(staffDepartmentRelatedDTO);
+							if(mainStore != null){
+								if(depart.getRelatedId().equals(mainStore.getStoreId())){
+									rList.add(staffDepartmentRelatedDTO);
+								}
+							}else{
+								rList.add(staffDepartmentRelatedDTO);
+							}
 						}
 					}
 				}
@@ -432,14 +458,16 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
-		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getSuiteId(), userId1);
+		log.info("新增外部联系人】corpid={},suiteId={},userId1={}",wxEnterprise.getCorpid(),config.getWxSuiteid(),userId1);
+		String wxRes = qywxUserApiService.listExternalUserid(wxEnterprise.getCorpid(), config.getWxSuiteid(), userId1);
 		MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
 		String externalUserId = "";
+		log.info("【新增外部联系人】wxRes={}",wxRes);
 		if(StringUtils.isNotBlank(wxRes)){
 			JSONArray jsonArr = JSON.parseArray(wxRes);
 			String wxName = "";
 			for (Object externalUserid : jsonArr) {
-				String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getSuiteId(), externalUserid.toString());
+				String uJ = qywxUserApiService.getExternalUseridInfo(wxEnterprise.getCorpid(), config.getWxSuiteid(), externalUserid.toString());
 				
 				if(StringUtils.isNotBlank(uJ)){
 					JSONObject jo = JSON.parseObject(unionIdJson);
@@ -457,8 +485,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 							String followJson = JSON.toJSONString(object);
 							JSONObject follow = JSON.parseObject(followJson);
 							uj_userId = follow.getString("userid");
+							log.info("【新增外部联系人】createTime={},name={},followCreateTime={},wxName={}",createTime,name,follow.getString("createtime"),wxName);
 							if(uj_userId.equals(userId1) && createTime.equals(follow.getString("createtime")) && name.equals(wxName)){
 								dto.setExternalUserid(externalUserId);
+								break;
 							}
 						}
 					}
@@ -466,15 +496,28 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			}
 		}
 		
-		
+		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, wxEnterprise.getWxEnterpriseId());
+		if(staff == null){
+			return "";
+		}
+		TabHaobanClerkMainStoreRelated r = clerkMainStoreRelatedService.selectByWxEnterpriseIdAndStoreId(staff.getStaffId(),wxEnterprise.getWxEnterpriseId());
+		StoreDTO mainStore = null;
 		
 		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+			if(r != null){
+				mainStore = storeService.getStore(r.getStoreId());
+				if(mainStore != null){
+					if(!tabHaobanWxEnterpriseRelated.getEnterpriseId().equals(mainStore.getEnterpriseId())){
+						continue;
+					}
+				}
+			}
 			String key = "external" + tabHaobanWxEnterpriseRelated.getEnterpriseId() + "_"+ userId1 + "_" + name + "_" + createTime;
 			RedisUtil.lock(key,2l);
 			dto.setWxEnterpriseId(tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			dto.setEnterpriseId(tabHaobanWxEnterpriseRelated.getEnterpriseId());
 			MemberDTO member = null;
-			TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
+			//TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId1, tabHaobanWxEnterpriseRelated.getWxEnterpriseId());
 			if(staff == null){
 				continue;
 			}
@@ -486,7 +529,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 				log.info("【部门list】depart={},deparmentId={}",JSON.toJSONString(depart),staffDepartmentRelatedDTO.getDepartmentId());
 				if(depart != null && tabHaobanWxEnterpriseRelated != null && depart.getEnterpriseId() != null && tabHaobanWxEnterpriseRelated.getEnterpriseId() != null){
 					log.info("【部门list】enterpriseId={},enterpriseId2={}",depart.getEnterpriseId(),tabHaobanWxEnterpriseRelated.getEnterpriseId());
-					if(depart.getEnterpriseId().equals(tabHaobanWxEnterpriseRelated.getEnterpriseId())){
+					if(mainStore != null){
+						if(depart.getRelatedId().equals(mainStore.getStoreId())){
+							rList.add(staffDepartmentRelatedDTO);
+						}
+					}else{
 						rList.add(staffDepartmentRelatedDTO);
 					}
 				}
@@ -512,11 +559,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			if(member != null){
 				dto.setMemberId(member.getMemberId());
 			}
-			dto.setExternalUserid(externalUserId);
 			dto.setUnionid(unionId);
 			
 			dto.setExternalName(name);
 			dto.setAddCreateTime(createTime);
+			dto.setWxUserId(userId1);
+			
 			if(StringUtils.isBlank(unionId)){
 				return "";
 			}

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

@@ -154,7 +154,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
 			return false;
 		}
 		if(content.length()>30){
-			content.substring(0, 26);
+			content = content.substring(0, 26);
 			content = content+"...";
 		}
 		//先发送下，试试

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

@@ -488,5 +488,14 @@
     and status_flag = 1
     and temp_flag = 1
   </select>
-
+  
+  <select id="totalStoreCountByEnterpriseId" resultType="java.lang.Integer" parameterType="java.lang.String" >
+    select 
+    count(1)
+    from tab_haoban_department
+    where wx_enterprise_id = #{wxEnterpriseId}
+    and status_flag = 1
+    and recycle_flag != 1
+    and is_store = 1
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -217,7 +217,7 @@ public class StaffController extends WebBaseController{
 			staffVO.setStaffName(clerk.getClerkName());
 			staffVO.setNationCode(clerk.getNationcode());
 			staffVO.setPhoneNumber(clerk.getPhoneNumber());
-			staffVO.setPostion(clerk.getPositionName());
+			staffVO.setPosition(clerk.getPositionName());
 			staffVO.setHeadImg(clerk.getHeadImgUrl());
 			staffVO.setDepartmentName(storeDTO==null?"":storeDTO.getStoreName());
 		}
@@ -234,7 +234,7 @@ public class StaffController extends WebBaseController{
 			staffVO.setStaffName(staff.getStaffName());
 			staffVO.setNationCode(staff.getNationCode());
 			staffVO.setPhoneNumber(staff.getPhoneNumber());
-			staffVO.setPostion(staff.getPostion());
+			staffVO.setPosition(staff.getPostion());
 			staffVO.setHeadImg(staff.getHeadImg());
 			if(CollectionUtil.isNotEmpty(list)){
 				String departmentId = list.get(0).getDepartmentId();

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

@@ -102,6 +102,7 @@ public class WxEnterpriseController extends WebBaseController{
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		
 		wxEnterpriseDTO.setSmallVersion("免费版");
+		wxEnterpriseDTO.setStoreTotal(departmentApiService.totalStoreCountByEnterpriseId(wxEnterpriseId));
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);
 	}
 	
@@ -116,7 +117,7 @@ public class WxEnterpriseController extends WebBaseController{
 		if(wxEnterpriseDTO == null){
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
-		QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(wxEnterpriseDTO.getCorpid(), config.getSuiteId());
+		QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid());
 		Long verifiedEndTime = dto.getVerifiedEndTime();
 		if(dto == null){
 			return resultResponse(HaoBanErrCode.ERR_10012);
@@ -245,11 +246,15 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
 		UserDTO user = qywxUserApiService.getSelfWorkWxUser(wxEnterprise.getCorpid(), contactSecret, login.getStaffDTO().getWxUserId());
+		logger.info("【保存联系人key】user={}",JSON.toJSONString(user));
 		if(user != null){
 			wxEnterprise.setContactSecret(contactSecret);
 			wxEnterprise.setContactSecretLastTime(new Date());
+			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,true);
 		}else{
+			wxEnterprise.setContactSecretLastTime(new Date());
+			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
  
@@ -270,17 +275,16 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_10012);
 		}
 		String res = qywxUserApiService.listSelfExternalUserid(wxEnterprise.getCorpid(), wxSecretKey, login.getStaffDTO().getWxUserId());
+		logger.info("【保存联系人key】res={}",res);
 		if(org.apache.commons.lang3.StringUtils.isBlank(res)){
+			wxEnterprise.setWxSecretKeyLastTime(new Date());
+			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,false);
-		}
-		JSONObject json = JSON.parseObject(res);
-		if("0".equals(json.getString("errcode"))){
+		}else{
 			wxEnterprise.setWxSecretKey(wxSecretKey);
 			wxEnterprise.setWxSecretKeyLastTime(new Date());
 			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,true);
-		}else{
-			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
  
 	}
@@ -306,6 +310,8 @@ public class WxEnterpriseController extends WebBaseController{
 			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,true);
 		}else{
+			wxEnterprise.setMemberSecretLastTime(new Date());
+			wxEnterpriseApiService.update(wxEnterprise);
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
 	}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java

@@ -17,7 +17,7 @@ public class StaffVO implements Serializable{
 
 	private String nationCode;
 
-	private String postion;
+	private String position;
 
 	private String departmentName;
 
@@ -55,12 +55,13 @@ public class StaffVO implements Serializable{
 		this.nationCode = nationCode;
 	}
 
-	public String getPostion() {
-		return postion;
+
+	public String getPosition() {
+		return position;
 	}
 
-	public void setPostion(String postion) {
-		this.postion = postion;
+	public void setPosition(String position) {
+		this.position = position;
 	}
 
 	public String getDepartmentName() {