Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -4,7 +4,11 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class MemberUnionidRelatedDTO implements Serializable{
-	
+
+    private String corpid;
+
+    private String suiteid;
+
 	private String memberUnionidRelatedId;
 
     private String memberId;
@@ -97,4 +101,19 @@ public class MemberUnionidRelatedDTO implements Serializable{
         this.updateTime = updateTime;
     }
 
+    public String getCorpid() {
+        return corpid;
+    }
+
+    public void setCorpid(String corpid) {
+        this.corpid = corpid;
+    }
+
+    public String getSuiteid() {
+        return suiteid;
+    }
+
+    public void setSuiteid(String suiteid) {
+        this.suiteid = suiteid;
+    }
 }

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

 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 org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -12,14 +18,16 @@ import com.gic.haoban.manage.service.service.StaffService;
 
 @Service
 public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService{
-
+	private static final Logger log = LogManager.getLogger(MemberUnionidRelatedApiServiceImpl.class);
 	@Autowired
 	private MemberUnionRelatedService memberUnionRelatedService;
 	@Autowired
 	private StaffService staffService;
-	
+	@Autowired
+	private QywxUserApiService qywxUserApiService;
 	@Autowired
 	private com.gic.enterprise.api.service.StoreGroupService gicDepartmentService;
+
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
 		TabHaobanStaff staff = staffService.selectById(staffId);
@@ -30,12 +38,21 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	}
 	@Override
 	public String addMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+		this.getExternalUserUnionid(dto);
 		return memberUnionRelatedService.addMemberUnionidRelated(dto);
 	}
 	@Override
 	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
+		this.getExternalUserUnionid(dto);
 		memberUnionRelatedService.delMemberUnionidRelated(dto);
 		
 	}
 
+	private void getExternalUserUnionid(MemberUnionidRelatedDTO dto){
+		String externalUseridInfo = this.qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
+		if(StringUtils.isNotBlank(externalUseridInfo)){
+			JSONObject jsonObject = JSON.parseObject(externalUseridInfo);
+			dto.setUnionid(jsonObject.getString("unionid"));
+		}
+	}
 }