Merge branch 'developer' into 'master'

Developer

See merge request !11

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

@@ -56,4 +56,6 @@ public interface StaffApiService {
 	public String insertUserLoginLog(UserLoginLogDTO userLoginLogDTO);
 
 	public int countByDepartmentIds(List<String> departmentIds);
+	
+	public List<StaffDTO> listByPhoneNumber(String phoneNumber);
 }

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

@@ -19,7 +19,7 @@ public interface WxEnterpriseApiService {
 	 * 运维后台获取微信企业id列表
 	 * @return
 	 */
-	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,Integer gicContactFlag,String version);
+	com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,List<String> enterpriseIds,Integer gicContactFlag,String version);
 	/**
 	 * 获取一个
 	 * @param wxEnterpriseId

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

@@ -16,4 +16,7 @@ public interface WxEnterpriseRelatedApiService {
 	EnterpriseDetailDTO getByEnterpriseId(String enterpriseId);
 
 	List<EnterpriseDetailDTO> queryAllHasGicEnterpriseId();
+	
+	List<EnterpriseDetailDTO> listEnterpriseByEnterpriseIds(List<String> enterpriseIds);
+
 }

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

@@ -17,7 +17,9 @@ import cn.hutool.core.collection.CollectionUtil;
 
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.GlobalVar;
+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.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
@@ -31,6 +33,7 @@ import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.EnterpriseDetailVo;
+import com.gic.haoban.operation.api.service.EnterpriseRelationService;
 
 @RestController
 public class EnterpriseController extends WebBaseController{
@@ -45,10 +48,19 @@ public class EnterpriseController extends WebBaseController{
 	private DepartmentApiService departmentApiService;
 	@Autowired
 	private StoreService storeService;
+	@Autowired
+	private EnterpriseService enterpriseService;
+//	@Autowired
+//	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
-	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,Integer gicContactHelper,String version) {
-		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,gicContactHelper,version);
+	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicEnterpriseName,Integer gicContactHelper,String version) {
+		List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(gicEnterpriseName);
+		List<String>enterpriseIds = enterpriseNames.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+		List<EnterpriseDetailDTO> wxEnterpriseIdDTOs = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
+		List<String> wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
+		
+		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,wxEnterpriseIds,gicContactHelper,version);
 		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
 		List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());
 		for(YwWxEnterpriseDTO dto : list){

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

@@ -32,4 +32,6 @@ public interface StaffMapper {
 	TabHaobanStaff selectByUserIdAndEnterpriseId(@Param("userId")String userId,@Param("wxEnterpriseId")String wxEnterpriseId);
 	
 	TabHaobanStaff selectSuperByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+
+	List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber")String phoneNumber);
 }
\ No newline at end of file

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

@@ -22,7 +22,7 @@ public interface WxEnterpriseMapper {
 
     int updateByPrimaryKey(TabHaobanWxEnterprise record);
     
-    Page<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("gicContactFlag") Integer gicContactFlag,@Param("version") String version);
+    Page<TabHaobanWxEnterprise> list(@Param("keyword") String keyword,@Param("enterpriseIds") List<String> enterpriseIds,@Param("gicContactFlag") Integer gicContactFlag,@Param("version") String version);
 
     List<TabHaobanWxEnterprise> listBycorpId(@Param("corpId") String corpId);
 

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

@@ -22,5 +22,7 @@ public interface WxEnterpriseRelatedMapper {
     TabHaobanWxEnterpriseRelated findOneByEnterpriseId(String enterpriseId);
 
 	List<TabHaobanWxEnterpriseRelated> queryAllHasGicEnterpriseId();
+	
+	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(List<String> enterpriseIds);
 
 }
\ No newline at end of file

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

@@ -91,7 +91,12 @@ public class StaffApiServiceImpl implements StaffApiService {
 		TabHaobanStaff staff = staffService.selectById(staffId);
 		return EntityUtil.changeEntityByJSON(StaffDTO.class, staff);
 	}
-
+	@Override
+	public List<StaffDTO> listByPhoneNumber(String phoneNumber) {
+		List<TabHaobanStaff> staffs = staffMapper.listByPhoneNumber(phoneNumber);
+		return EntityUtil.changeEntityListByJSON(StaffDTO.class, staffs);
+	}
+	
 	@Override
 	public StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId,String nationcode, String phoneNumber) {
 		TabHaobanStaff staff = staffService.selectByNationcodeAndPhoneNumber(wxEnterpriseId,nationcode,phoneNumber);

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

@@ -94,9 +94,9 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
 	}
 
 	@Override
-	public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,Integer gicContactFlag,String version) {
+	public com.gic.api.base.commons.Page<YwWxEnterpriseDTO> list(BasePageInfo pageInfo,String keyword,List<String> enterpriseIds,Integer gicContactFlag,String version) {
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-		Page<TabHaobanWxEnterprise>  page = wxEnterpriseMapper.list(keyword,gicContactFlag,version);
+		Page<TabHaobanWxEnterprise>  page = wxEnterpriseMapper.list(keyword,enterpriseIds,gicContactFlag,version);
 		return  PageUtil.changePageHelperToCurrentPage(page, YwWxEnterpriseDTO.class);
 	}
 	

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

@@ -142,4 +142,12 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		return result;
 	}
 
+	@Override
+	public List<EnterpriseDetailDTO> listEnterpriseByEnterpriseIds(
+			List<String> enterpriseIds) {
+		List<TabHaobanWxEnterpriseRelated> list= wxEnterpriseRelatedMapper.listEnterpriseByEnterpriseIds(enterpriseIds);
+		List<EnterpriseDetailDTO> details = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, list);
+		return details;	
+	}
+
 }

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

@@ -251,6 +251,14 @@
     and status_flag = 1
   </select>
   
+  <select id="listByPhoneNumber" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_staff
+    where phone_number = #{phoneNumber}
+    and status_flag = 1
+  </select>
+  
   <select id="pageStaff" resultMap="BaseResultMap" >
     select 
     <include refid="Base_Column_List" />

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

@@ -385,6 +385,12 @@
     	<if test="gicContactFlag != null">
     		and contact_flag = #{gicContactFlag,jdbcType=INTEGER}
     	</if>
+	    <if test="enterpriseIds != null and enterpriseIds.size() > 0">
+	    	and wx_enterprise_id IN 
+		    <foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
+		      #{id,jdbcType=VARCHAR}
+		    </foreach>
+	    </if>
   </select>
   <select id="listBycorpId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select

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

@@ -136,4 +136,17 @@
     from tab_haoban_wx_enterprise_related
     where status_flag = 1
   </select>
+    <select id="listEnterpriseByEnterpriseIds" resultMap="BaseResultMap" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_wx_enterprise_related
+    where status_flag = 1
+    	<if test="enterpriseIds != null and enterpriseIds.size() > 0">
+	    	and enterprise_id IN 
+	    <foreach collection="enterpriseIds" item="id" index="index" open="(" close=")" separator=",">
+	      #{id,jdbcType=VARCHAR}
+	    </foreach>
+	    </if>
+  </select>
+  
 </mapper>
\ No newline at end of file

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

 package com.gic.haoban.manage.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.collection.CollectionUtil;
+
 import com.alibaba.fastjson.JSON;
+import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.interceptor.WebInterceptor;
+import com.gic.haoban.manage.web.vo.AppStaffVo;
 import com.gic.haoban.manage.web.vo.InfoVo;
 import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
@@ -80,5 +92,26 @@ public class InfoController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1);
 		
 	}
-
+	
+	@RequestMapping("get-staff-info")
+	public HaobanResponse getStaffInfo(String phoneNumber) {
+        if (StringUtils.isBlank(phoneNumber)) {
+            return resultResponse(HaoBanErrCode.ERR_2);
+        }
+        List<StaffDTO> list = staffApiService.listByPhoneNumber(phoneNumber);
+        if(CollectionUtil.isNotEmpty(list)){
+        	List<AppStaffVo> staffs = EntityUtil.changeEntityListByJSON(AppStaffVo.class, list);
+        	Set<String> wxEnterpriseIds = list.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toSet());
+        	List<YwWxEnterpriseDTO> enterprises = wxEnterpriseApiService.listByIds(wxEnterpriseIds);
+        	Map<String,YwWxEnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterprises, "wxEnterpriseId");
+        	for(AppStaffVo vo:staffs){
+        		String wxEnterpriseId = vo.getWxEnterpriseId();
+        		String corpName = map.get(wxEnterpriseId) == null?"":map.get(wxEnterpriseId).getCorpName();
+        		vo.setWxEnterpriseName(corpName);
+        	}
+    		return resultResponse(HaoBanErrCode.ERR_1,staffs);
+        }
+		return resultResponse(HaoBanErrCode.ERR_1,new ArrayList<>());
+		
+	}
 }

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

@@ -146,7 +146,7 @@ public class StoreController extends WebBaseController{
 				}
 			}
 			if(CollectionUtil.isNotEmpty(imgList)){
-				VO.setStoreImg(imgList.get(0).getImageUrl());;
+				VO.setStoreImg(imgList.get(0).getQcloudImageUrl());;
 			}
 		}
 		if(CollectionUtils.isNotEmpty(resultList)){

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class AppStaffVo implements Serializable {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String staffId;
+    private String staffName;
+    private String nationCode;
+    private String phoneNumber;
+    private String wxEnterpriseId;
+    private String wxEnterpriseName;
+	public String getStaffId() {
+		return staffId;
+	}
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+	public String getStaffName() {
+		return staffName;
+	}
+	public void setStaffName(String staffName) {
+		this.staffName = staffName;
+	}
+	public String getNationCode() {
+		return nationCode;
+	}
+	public void setNationCode(String nationCode) {
+		this.nationCode = nationCode;
+	}
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	public String getWxEnterpriseName() {
+		return wxEnterpriseName;
+	}
+	public void setWxEnterpriseName(String wxEnterpriseName) {
+		this.wxEnterpriseName = wxEnterpriseName;
+	}
+
+
+}