Merge branch 'developer' into 'master'

Developer

See merge request !89

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

@@ -122,4 +122,14 @@ public interface StaffClerkRelationApiService {
 	 * @return
 	 */
 	ServiceResponse<String> getClerkMemberChatConfig(String clerkId);
+	/**
+	 * 
+	* @Description 方法描述: TODO <pre>
+	* @return  返回值类型: <pre>  
+	* @author 作者: WQ <pre>
+	* @date 时间: 2020年12月24日 上午11:21:38 <pre> 
+	* @param wxEnterpriseId: <pre>
+	* @param pageInfo: <pre>
+	 */
+	public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
 }

haoban-manage3-service/pom.xml

@@ -159,11 +159,11 @@
             <artifactId>hutool-all</artifactId>
             <version>5.5.1</version>
         </dependency>
-<!--         <dependency> -->
-<!-- 			<groupId>com.gic</groupId> -->
-<!-- 			<artifactId>sql-check-sdk</artifactId> -->
-<!-- 			<version>4.0-SNAPSHOT</version> -->
-<!--         </dependency> -->
+        <dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>sql-check-sdk</artifactId>
+			<version>${sql-check-sdk}</version>
+        </dependency>
 		</dependencies>
     
     <build>

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

@@ -85,4 +85,6 @@ public interface TabHaobanStaffClerkRelationMapper {
 	TabHaobanStaffClerkRelation getByCodeAndStoreId(@Param("clerkCode")String clerkCode, @Param("storeId")String storeId);
 	
 	List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+
+	List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -3,6 +3,8 @@ package com.gic.haoban.manage.service.service;
 import java.util.List;
 import java.util.Set;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
@@ -81,5 +83,7 @@ public interface StaffClerkRelationService {
 	 */
 	List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId);
 
+	Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo);
+
 
 }

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

@@ -4,18 +4,23 @@ import java.util.*;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.ToolUtil;
+import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
 import com.gic.haoban.manage.service.entity.TabHaobanClerkMainStoreRelated;
+import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkBindLog;
 import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
 import com.gic.haoban.manage.service.service.ClerkMainStoreRelatedService;
 import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.StaffClerkBindLogService;
 import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.wechat.api.dto.qywx.QywxExternalcontactDTO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
 import javafx.scene.control.Tab;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -25,8 +30,11 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.service.StaffClerkRelationService;
@@ -229,4 +237,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
 	public List<TabHaobanStaffClerkRelation> listByWxEnterpriseId(String wxEnterpriseId) {
 		return mapper.listByWxEnterpriseId(wxEnterpriseId);
 	}
+
+	@Override
+	public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
+		PageHelper.startPage(pageInfo);
+        List<TabHaobanStaffClerkRelation> clerkBindList = mapper.pageByWxEnterpriseId(wxEnterpriseId);
+        Page<StaffClerkRelationDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(clerkBindList), StaffClerkRelationDTO.class);
+        return retPage;
+	}
 }

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

@@ -315,6 +315,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 		}
 		
 		TabHaobanExternalClerkRelated exsitDTO = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
+		String key = wxUserId+wxEnterpriseId+name+createTime;
+		if(exsitDTO == null){
+			RedisUtil.lock(key,1L);
+			exsitDTO = externalClerkRelatedService.getByParams(wxUserId, wxEnterpriseId,name,createTime);
+			RedisUtil.unlock(key);
+		}
 		if(exsitDTO == null){
 			TabHaobanExternalClerkRelated related = new TabHaobanExternalClerkRelated();
 			related.setAddCreateTime(createTime);

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

@@ -51,6 +51,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -209,11 +210,20 @@ public class StaffApiServiceImpl implements StaffApiService {
 		for (TabHaobanStaffDepartmentRelated tabHaobanStaffDepartmentRelated : list) {
 			staffIds.add(tabHaobanStaffDepartmentRelated.getStaffId());
 		}
+		Map<String,TabHaobanStaffDepartmentRelated> map = new HashMap<String, TabHaobanStaffDepartmentRelated>();
+		if(CollectionUtils.isNotEmpty(list)){
+			map = list.stream().collect(Collectors.toMap(TabHaobanStaffDepartmentRelated::getStaffId, Function.identity(), (s1, s2) -> s2));
+		}
 		if(staffIds.isEmpty()) {
 			return new Page<StaffDTO>();
 		}
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-		return  PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
+		Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
+		List<StaffDTO> staffList = page.getResult();
+		for (StaffDTO staffDTO : staffList) {
+			staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId());
+		}
+		return  page;
 	}
 
 	@Override

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

@@ -452,4 +452,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 		response.setResult(clerkChatConfig.getConfigId());
 		return response;
 	}
+
+	@Override
+	public Page<StaffClerkRelationDTO> pageByWxEnterpriseId(String wxEnterpriseId, BasePageInfo pageInfo) {
+		return staffClerkRelatinService.pageByWxEnterpriseId(wxEnterpriseId,pageInfo);
+	}
 }

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

@@ -37,7 +37,7 @@
                         </value>
                     </property>
                 </bean>
-<!--                 <bean class="com.gic.sql.interceptor.MybatisSqlInterceptor"/> -->
+                <bean class="com.gic.sql.interceptor.MybatisSqlInterceptor"/>
             </array>
         </property>
     </bean>

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

@@ -368,4 +368,12 @@
     group by wx_user_id
   </select>
   
+  <select id="pageByWxEnterpriseId"  resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff_clerk_relation
+    where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+    and status_flag =1
+  </select>
+  
 </mapper>
\ No newline at end of file

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

@@ -7,6 +7,8 @@ import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.DateUtil;
+import com.gic.commons.util.ExcelUtils;
 import com.gic.enterprise.api.dto.*;
 import com.gic.enterprise.api.service.*;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -25,6 +27,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.StaffEditJsonQO;
 import com.gic.haoban.manage.web.vo.ClerkInfoVo;
 import com.gic.haoban.manage.web.vo.LoginVO;
+import com.gic.haoban.manage.web.vo.StaffExportVO;
 import com.gic.haoban.manage.web.vo.StaffVO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -37,10 +40,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 
 @RestController
 public class StaffController extends WebBaseController{
@@ -431,5 +440,127 @@ public class StaffController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,page);
 	}
 
-
+	/**
+	 * 
+	* @Description 会员导出
+	* @return  返回值类型: <pre>  
+	* @author 作者: qwm
+	* @date 时间: 2020年12月18日 上午11:11:35 <pre> 
+	 */
+	@RequestMapping("staff-export")
+	public HaobanResponse staffExport(HttpServletResponse response, HttpServletRequest request){
+		BasePageInfo pageInfo = new BasePageInfo();
+		int pageSize = 1000;
+		int pageNum = 1;
+		pageInfo.setPageNum(pageNum);
+		pageInfo.setPageSize(pageSize);
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
+		String wxEnterpriseName = "";
+		if(enterprise != null){
+			wxEnterpriseName = enterprise.getCorpName();
+		}
+		List<DepartmentShortDTO> relationList = departmentApiService.listAllDepartment(wxEnterpriseId);
+		Map<String,DepartmentShortDTO> departmentMap = relationList.stream().collect(Collectors.toMap(DepartmentShortDTO::getDepartmentId, s -> s));
+		List<String> departmentIds = relationList.stream().map(DepartmentShortDTO::getDepartmentId).collect(Collectors.toList());
+		Page<StaffDTO> page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
+		List<StaffDTO> list = page.getResult();
+		List<StaffExportVO> voList = new ArrayList<>();
+		for (StaffDTO staffDTO : list) {
+			StaffExportVO vo = new StaffExportVO();
+			vo.setStaffId(staffDTO.getStaffId());
+			vo.setPhoneNumber(staffDTO.getPhoneNumber());
+			vo.setStaffName(staffDTO.getStaffName());
+			vo.setPosition(staffDTO.getPostion());
+			vo.setDepartmentName(departmentMap.get(staffDTO.getDepartmentIds()) == null?null:departmentMap.get(staffDTO.getDepartmentIds()).getDepartmentName());
+			String active = "是";
+			if(staffDTO.getActiveFlag() == null || staffDTO.getActiveFlag() == 0){
+				active = "否";
+			}
+			vo.setActiveFlag(active);
+			voList.add(vo);
+		}
+		while(page.getPages() < page.getTotalPage()){
+			pageNum ++ ;
+			pageInfo.setPageNum(pageNum);
+			page = staffApiService.pageStaff(departmentIds,null,null,pageInfo);
+			List<StaffDTO> sonList = page.getResult();
+			if(CollectionUtils.isNotEmpty(sonList)){
+				list.addAll(sonList);
+			}
+		}
+		//拼接导购信息
+		mergeClerkInfo(voList, wxEnterpriseId);
+		String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
+		List<String> fileList = new ArrayList<>();
+		List<String> titleList = new ArrayList<>();
+		titleList.add("姓名");
+		titleList.add("职务");
+		titleList.add("部门");
+		titleList.add("手机号");
+		titleList.add("使用状态");
+		titleList.add("关联导购");
+		fileList.add("staffName");
+		fileList.add("position");
+		fileList.add("departmentName");
+		fileList.add("phoneNumber");
+		fileList.add("activeFlag");
+		fileList.add("clerkName");
+		try {
+			ExcelUtils.csv(response, request, fileName, voList, fileList, titleList);
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.info("导出失败");
+		}
+        return null;
+	}
+	
+	private void mergeClerkInfo(List<StaffExportVO> list,String wxEnterpriseId){
+		BasePageInfo pageInfoRelation = new BasePageInfo();
+		int pageSizeRelation = 1000;
+		int pageNumRelation = 1;
+		pageInfoRelation.setPageNum(pageNumRelation);
+		pageInfoRelation.setPageSize(pageSizeRelation);
+		Page<StaffClerkRelationDTO> bindPage = staffClerkRelationApiService.pageByWxEnterpriseId(wxEnterpriseId,pageInfoRelation);
+		List<StaffClerkRelationDTO> bindList = bindPage.getResult();
+		Set<String> clerkIdList = bindList.stream().map(StaffClerkRelationDTO::getClerkId).collect(Collectors.toSet());
+		List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIdList);
+		while(bindPage.getPages() < bindPage.getTotalPage()){
+			pageNumRelation ++ ;
+			pageInfoRelation.setPageNum(pageNumRelation);
+			bindPage = staffClerkRelationApiService.pageByWxEnterpriseId(wxEnterpriseId,pageInfoRelation);
+			List<StaffClerkRelationDTO> sonList = bindPage.getResult();
+			Set<String> clerkSonIdList = sonList.stream().map(StaffClerkRelationDTO::getClerkId).collect(Collectors.toSet());
+			List<ClerkDTO> sonClerkList = clerkService.getClerkByClerkIds(clerkSonIdList);
+			if(CollectionUtils.isNotEmpty(sonClerkList)){
+				clerkList.addAll(sonClerkList);
+			}
+			if(CollectionUtils.isNotEmpty(sonList)){
+				bindList.addAll(sonList);
+			}
+		}
+		
+		Map<String,List<StaffClerkRelationDTO>> bindMap = bindList.stream().collect(Collectors.groupingBy(StaffClerkRelationDTO::getStaffId));
+		Map<String,ClerkDTO> clerkMap = clerkList.stream().collect(Collectors.toMap(ClerkDTO::getClerkId, s -> s, (v1, v2) -> v2));
+		for (StaffExportVO staffDTO : list) {
+			List<StaffClerkRelationDTO> relationList = bindMap.get(staffDTO.getStaffId());
+			if(CollectionUtils.isNotEmpty(relationList)){
+				String clerkName = "";
+				for (StaffClerkRelationDTO staffClerkRelationDTO : relationList) {
+					ClerkDTO clerk = clerkMap.get(staffClerkRelationDTO.getClerkId());
+					if(clerk != null){
+						clerkName += clerk.getClerkName() + ",";
+					}
+				}
+				if(StringUtils.isNoneBlank(clerkName)){
+					clerkName = clerkName.substring(0,clerkName.length() - 1);
+				}
+				staffDTO.setClerkName(clerkName);
+			}
+		}
+		
+	}
+	
+	
 }

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

@@ -504,10 +504,10 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
-		if(enterprise == null || enterprise.getExpireTime() == null){
-			return resultResponse(HaoBanErrCode.ERR_1,false);
-		}
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
+		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
+            return resultResponse(HaoBanErrCode.ERR_1, false);
+        }
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return resultResponse(HaoBanErrCode.ERR_1,false);
 		}
 		if(enterprise.getEnabledState() == null || enterprise.getEnabledState() != 1){

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

@@ -45,7 +45,7 @@ public class GlobalExceptionHandler extends WebBaseController {
         } else {
             message = HaoBanErrCode.ERR_3.getMsg();
         }
-        res.setMessage(message);
+        res.setMessage("系统异常");
         return res;
     }
 
@@ -69,7 +69,8 @@ public class GlobalExceptionHandler extends WebBaseController {
         }
 
         // 输出详细错误信息，便于调试
-        return resultResponse(errCode, null, sb.toString());
+//        return resultResponse(errCode, null, sb.toString());
+        return resultResponse(HaoBanErrCode.ERR_3);
     }
 
 

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class StaffExportVO implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+
+	private String staffId;
+	
+	private String staffName;
+	
+	private String phoneNumber;
+
+	private String nationCode;
+
+	private String position;
+
+	private String departmentName;
+
+	private String activeFlag;
+
+	private String clerkName;
+
+	public String getActiveFlag() {
+		return activeFlag;
+	}
+
+	public void setActiveFlag(String activeFlag) {
+		this.activeFlag = activeFlag;
+	}
+
+	public String getStaffName() {
+		return staffName;
+	}
+
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+
+	public String getNationCode() {
+		return nationCode;
+	}
+
+	public void setNationCode(String nationCode) {
+		this.nationCode = nationCode;
+	}
+
+
+	public String getPosition() {
+		return position;
+	}
+
+	public void setPosition(String position) {
+		this.position = position;
+	}
+
+	public String getDepartmentName() {
+		return departmentName;
+	}
+
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getClerkName() {
+		return clerkName;
+	}
+
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
+
+	
+}

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

@@ -847,8 +847,11 @@ public class ClerkController extends WebBaseController{
 		}else if (fieldType == 3) {
 			clerk.setHeadImgUrl(fieldValue);
 		}
-		clerkService.updateClerk(clerk);
+		String res = clerkService.updateClerk(clerk);
+		if(StringUtils.isBlank(res)){
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
+		return resultResponse(HaoBanErrCode.ERR_0,res,null,res);
 
-		return resultResponse(HaoBanErrCode.ERR_1);
 	}
 }

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

@@ -415,14 +415,13 @@ public class StoreController extends WebBaseController{
 			return true;
 		}
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(store.getEnterpriseId());
-		if(enterprise == null || enterprise.getExpireTime() == null){
+		if(enterprise == null || enterprise.getExpireTime() == null || enterprise.getEnabledState() == null){
 			return false;
-		}
-		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis()){
+        }
+		if(enterprise.getExpireTime().getTime() > System.currentTimeMillis() && enterprise.getEnabledState() == 1){
 			return false;
 		}
 		return true;
-		
 	}
 	
 	

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/exception/GlobalExceptionHandler.java

@@ -76,7 +76,8 @@ public class GlobalExceptionHandler extends WebBaseController {
         }
 
         // 输出详细错误信息，便于调试
-        return resultResponse(errCode, null, sb.toString());
+//        return resultResponse(errCode, null, sb.toString());
+        return resultResponse(HaoBanErrCode.ERR_3);
     }