门店信息包含总部还是代理信息111

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

@@ -93,7 +93,7 @@ public class StoreController extends WebBaseController{
 			logger.info("没有关联任何商户：{}", wxEnterpriseId);
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
-		Map<String, Integer> enterpriseTypeMap = enterpriseList.stream().collect(Collectors.toMap(dto -> dto.getEnterpriseId(), dto -> dto.getWxEnterpriseType()));
+		Map<String, EnterpriseDetailDTO> enterpriseTypeMap = enterpriseList.stream().collect(Collectors.toMap(dto -> dto.getEnterpriseId(), dto -> dto));
 
 		List<String> enterpriseIdList = enterpriseList.stream().map(EnterpriseDetailDTO::getEnterpriseId).collect(Collectors.toList());
 		List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCodeByStaffId(enterpriseIdList, staffId);
@@ -124,10 +124,13 @@ public class StoreController extends WebBaseController{
 				} else if (storeId.equals(store.getStoreId())) {
 					mainStoreFlag = 1;
 				}
+				EnterpriseDetailDTO enterpriseDetailDTO = enterpriseTypeMap.get(clerk.getEnterpriseId());
 				staffDepartmentRelatedApiService.listByStaffId(staffId);
 				StaffStoreVO vo = new StaffStoreVO();
 				vo.setClerkCode(clerk.getClerkCode());
-				vo.setWxEnterpriseType(enterpriseTypeMap.get(clerk.getEnterpriseId()));
+
+				vo.setWxEnterpriseType(enterpriseDetailDTO != null ? enterpriseDetailDTO.getWxEnterpriseType() : null);
+				vo.setMemberOpenCardFlag(enterpriseDetailDTO != null ? enterpriseDetailDTO.getMemberOpenCardFlag() : null);
 				vo.setClerkId(clerk.getClerkId());
 				vo.setClerkType(clerk.getClerkType());
 				vo.setEnterpriseId(clerk.getEnterpriseId());

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

@@ -24,6 +24,15 @@ public class StaffStoreVO implements Serializable {
     private String phoneNumber;
 	private int bindFlag;
     private String clerkName;
+	private Integer memberOpenCardFlag;
+
+	public Integer getMemberOpenCardFlag() {
+		return memberOpenCardFlag;
+	}
+
+	public void setMemberOpenCardFlag(Integer memberOpenCardFlag) {
+		this.memberOpenCardFlag = memberOpenCardFlag;
+	}
 
 	public Integer getWxEnterpriseType() {
 		return wxEnterpriseType;