fix

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

@@ -10,4 +10,6 @@ public interface MemberUnionidRelatedApiService {
 	
 	void delMemberUnionidRelated(MemberUnionidRelatedDTO dto);
 
+	MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId);
+
 }

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

@@ -9,4 +9,6 @@ public interface WxEnterpriseRelatedService {
 	TabHaobanWxEnterpriseRelated getByGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
 
 	TabHaobanWxEnterpriseRelated getEnterpriseByGicEnterpriseId(String gicEnterpriseId);
+
+	List<TabHaobanWxEnterpriseRelated> getByWxEnterpriseId(String wxEnterpriseId);
 }

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

@@ -27,4 +27,10 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
 		return tab;
 	}
 
+	@Override
+	public List<TabHaobanWxEnterpriseRelated> getByWxEnterpriseId(String wxEnterpriseId) {
+		List<TabHaobanWxEnterpriseRelated> list = mapper.listByWxenterpriseId(wxEnterpriseId);
+		return list;
+	}
+
 }

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

@@ -4,6 +4,9 @@ package com.gic.haoban.manage.service.service.out.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
+
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -11,10 +14,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 import com.gic.haoban.manage.service.service.MemberUnionRelatedService;
 import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.WxEnterpriseRelatedService;
+import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.MemberService;
 
 @Service
@@ -30,6 +40,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private com.gic.enterprise.api.service.StoreGroupService gicDepartmentService;
 	@Autowired
 	private MemberService memberService;
+	@Autowired
+	private WxEnterpriseRelatedService wxEnterpriseRelatedService;
+	@Autowired
+	private WxEnterpriseService wxEnterpriseService;
 
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
@@ -41,6 +55,22 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	}
 	@Override
 	public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+		String corpId = dto.getCorpid();
+		TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(corpId);
+		if(wxEnterprise == null){
+			return "";
+		}
+		List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
+		MemberDTO member = null;
+		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+			 member = memberService.getMemberByUnionid(dto.getUnionid(), tabHaobanWxEnterpriseRelated.getEnterpriseId());
+			 if(member != null){
+				 break;
+			 }
+		}
+		if(member != null){
+			dto.setMemberId(member.getMemberId());
+		}
 		this.getExternalUserUnionid(dto);
 		return memberUnionRelatedService.addMemberUnionidRelated(dto);
 	}
@@ -58,4 +88,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			dto.setUnionid(jsonObject.getString("unionid"));
 		}
 	}
+	@Override
+	public MemberUnionidRelatedDTO getByMemberId(String staffId, String memberId) {
+		
+		return null;
+	}
 }

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

@@ -27,6 +27,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.data.api.dto.HaobanDataDTO;
 import com.gic.haoban.data.api.service.HaobanDataApiService;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
@@ -105,6 +106,8 @@ public class StoreController extends WebBaseController{
 			//查gic门店
 			StoreDTO storeDTO = storeService.getStore(VO.getStoreId());
 			List<StorePhotoDTO> imgList = storeService.getStoreImages(VO.getStoreId());
+			EnterpriseDetailDTO detail = wxEnterpriseRelatedApiService.getByEnterpriseId(storeDTO.getEnterpriseId());
+			VO.setWxEnterpriseRelatedId(detail.getWxEnterpriseRelatedId());
 			//已经绑定的门店
 			if(VO.getBindFlag()==1){
 				String clerkCode = VO.getClerkCode();

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

@@ -21,6 +21,7 @@ public class StoreVO implements Serializable {
     private String clerkId;
     private String storeImg;
     private int clerkType;
+    private String wxEnterpriseRelatedId;
 
 	public String getClerkId() {
 		return clerkId;
@@ -95,6 +96,12 @@ public class StoreVO implements Serializable {
 	public void setStoreImg(String storeImg) {
 		this.storeImg = storeImg;
 	}
+	public String getWxEnterpriseRelatedId() {
+		return wxEnterpriseRelatedId;
+	}
+	public void setWxEnterpriseRelatedId(String wxEnterpriseRelatedId) {
+		this.wxEnterpriseRelatedId = wxEnterpriseRelatedId;
+	}
 
     
 }