Merge branch 'developer' into 'master'

Developer

See merge request !8

haoban-manage3-api/pom.xml

@@ -52,11 +52,6 @@
             <artifactId>haoban-base-api</artifactId>
             <version>${haoban-base-api}</version>
         </dependency>
-        <dependency>
-        <groupId>com.gic</groupId>
-        <artifactId>haoban-common</artifactId>
-        <version>${haoban-common}</version>
-    </dependency>
     </dependencies>
 
     <build>

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

 package com.gic.haoban.manage.api.dto;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class DictDTO implements Serializable {
     private String dictId;
@@ -15,8 +16,47 @@ public class DictDTO implements Serializable {
 
     private String dictContent;
 
+    private String optUserId;
+
+    private String optUserName;
+
+    private Date createTime;
+    private Date updateTime;
+
     private static final long serialVersionUID = 1L;
 
+    public String getOptUserId() {
+        return optUserId;
+    }
+
+    public void setOptUserId(String optUserId) {
+        this.optUserId = optUserId;
+    }
+
+    public String getOptUserName() {
+        return optUserName;
+    }
+
+    public void setOptUserName(String optUserName) {
+        this.optUserName = optUserName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     public String getDictId() {
         return dictId;
     }

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

+package com.gic.haoban.manage.api.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class GicClerkDTO implements Serializable {
+
+    private String storeId;
+
+    private String clerkCode;
+
+    private String clerkName;
+
+    private String phoneNumber;
+
+    private String nationcode;
+
+    private Integer clerkGender;
+
+    private String headImgUrl;
+
+    private String postionName;
+
+    private String enterpriseId;
+
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    private static final long serialVersionUID = 1L;
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    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 Integer getClerkGender() {
+        return clerkGender;
+    }
+
+    public void setClerkGender(Integer clerkGender) {
+        this.clerkGender = clerkGender;
+    }
+
+    public String getHeadImgUrl() {
+        return headImgUrl;
+    }
+
+    public void setHeadImgUrl(String headImgUrl) {
+        this.headImgUrl = headImgUrl;
+    }
+
+    public String getPostionName() {
+        return postionName;
+    }
+
+    public void setPostionName(String postionName) {
+        this.postionName = postionName;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+}

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

@@ -22,6 +22,12 @@ public class MemberUnionidRelatedDTO implements Serializable{
     private String externalUserid;
 
     private String wxUserId;
+    
+    private String selfExternalUserid;
+    
+    private String externalName;
+    
+    private String addCreateTime;
 
     private Date createTime;
 
@@ -116,4 +122,30 @@ public class MemberUnionidRelatedDTO implements Serializable{
     public void setSuiteid(String suiteid) {
         this.suiteid = suiteid;
     }
+
+	public String getSelfExternalUserid() {
+		return selfExternalUserid;
+	}
+
+	public void setSelfExternalUserid(String selfExternalUserid) {
+		this.selfExternalUserid = selfExternalUserid;
+	}
+
+	public String getExternalName() {
+		return externalName;
+	}
+
+	public void setExternalName(String externalName) {
+		this.externalName = externalName;
+	}
+
+	public String getAddCreateTime() {
+		return addCreateTime;
+	}
+
+	public void setAddCreateTime(String addCreateTime) {
+		this.addCreateTime = addCreateTime;
+	}
+
+    
 }

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

 package com.gic.haoban.manage.api.dto;
 
-import javax.persistence.criteria.CriteriaBuilder;
 import java.io.Serializable;
 
 /**

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

@@ -56,6 +56,8 @@ public class WxEnterpriseDTO implements Serializable {
     private Integer statusFlag;
     
     private Integer contactFlag;
+    
+    private String wxSecretKey;
 
     private Date createTime;
 
@@ -287,5 +289,14 @@ public class WxEnterpriseDTO implements Serializable {
 		this.contactFlag = contactFlag;
 	}
 
+	public String getWxSecretKey() {
+		return wxSecretKey;
+	}
+
+	public void setWxSecretKey(String wxSecretKey) {
+		this.wxSecretKey = wxSecretKey;
+	}
+
+	
     
 }

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

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 
 public interface DepartmentApiService {
@@ -47,19 +47,19 @@ public interface DepartmentApiService {
 	 * @param department
 	 * @return
 	 */
-	HaobanResponse add(DepartmentDTO department);
+	ServiceResponse add(DepartmentDTO department);
 	/**
 	 * 修改部门
 	 * @param department
 	 * @return
 	 */
-	HaobanResponse edit(DepartmentDTO department);
+	ServiceResponse edit(DepartmentDTO department);
 	/**
 	 * 删除部门
 	 * @param departmentId
 	 * @return
 	 */
-	HaobanResponse del(String departmentId);
+	ServiceResponse del(String departmentId);
 	/**
 	 * 根据关联id 获取部门
 	 * @param departId
@@ -71,7 +71,7 @@ public interface DepartmentApiService {
 	 * @param departmentId
 	 * @return
 	 */
-	HaobanResponse recycle(String departmentId);
+	ServiceResponse recycle(String departmentId);
 	
 	/**
 	 * 根据参数查询
@@ -88,7 +88,7 @@ public interface DepartmentApiService {
 	 * 回收站恢复
 	 * @param departmentId
 	 */
-	HaobanResponse repairRecycle(String departmentId,String parentId);
+	ServiceResponse repairRecycle(String departmentId,String parentId);
 	/**
 	 * 获取根节点
 	 * @param wxEnterpriseId
@@ -132,13 +132,13 @@ public interface DepartmentApiService {
 	 * @param departmentId
 	 * @return
 	 */
-	HaobanResponse wxCallBackDel(String departmentId);
+	ServiceResponse wxCallBackDel(String departmentId);
 	/**
 	 * 微信回调放回收站
 	 * @param departmentId
 	 * @return
 	 */
-	HaobanResponse wxCallBackrecycle(String departmentId);
+	ServiceResponse wxCallBackrecycle(String departmentId);
 	/**
 	 * 判断节点下面有没有子节点
 	 * @param departmentId
@@ -149,6 +149,6 @@ public interface DepartmentApiService {
 	 * gic回调删除部门
 	 * @param departmentId
 	 */
-	HaobanResponse gicDel(String departmentId);
+	ServiceResponse gicDel(String departmentId);
 	
 }

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

@@ -4,6 +4,8 @@ import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.DictDTO;
 
+import java.util.List;
+
 /**
  * Created by tgs on 2020/2/9.
  */
@@ -15,4 +17,12 @@ public interface DictApiService {
 	Page<DictDTO> pageList(BasePageInfo pageInfo);
 	
 	void deleteOne(String dictId);
+
+	/**
+	 * 根据key 获取列表
+	 *
+	 * @param dictKeys
+	 * @return
+	 */
+	List<DictDTO> queryList(List<String> dictKeys);
 }

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

@@ -4,7 +4,8 @@ import java.util.List;
 
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.manage.api.dto.GicClerkDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.dto.UserLoginLogDTO;
@@ -20,7 +21,7 @@ public interface StaffApiService {
 	
 	public StaffDTO selectByNationcodeAndPhoneNumber(String wxEnterpriseId,String nationcode, String phoneNumber);
 
-	public HaobanResponse add(StaffDTO staff, String departmentIds);
+	public ServiceResponse add(StaffDTO staff, String departmentIds);
 
 	public List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
@@ -42,6 +43,8 @@ public interface StaffApiService {
 
 	public void syncGicClerk(String fieldListString);
 
+	public void addGicClerk(GicClerkDTO clerkDTO);
+
 	StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
 
 	void initWxUser(String corpid, String suiteid, String wxEnterpriseId, Integer wxDepartmentId);

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

@@ -7,7 +7,6 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
-import com.github.pagehelper.Page;
 
 public interface WxEnterpriseApiService {
 

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

@@ -2,6 +2,9 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import com.gic.haoban.manage.service.entity.TabHaobanDict;
 import com.github.pagehelper.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface DictMapper {
     int deleteByPrimaryKey(String dictId);
@@ -18,4 +21,6 @@ public interface DictMapper {
     
     Page<TabHaobanDict> pageList();
 
+    List<TabHaobanDict> queryList(@Param("keys") List<String> keys);
+
 }
\ No newline at end of file

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

@@ -22,7 +22,10 @@ public interface MemberUnionidRelatedMapper {
 
     MemberUnionidRelated getByUnionId(@Param("wxUserId")String wxUserId, @Param("unionid")String unionid);
 
-	void deleteByUnionidAndUserId(@Param("unionid")String unionid,@Param("wxUserId") String wxUserId);
+	void deleteByUnionidAndUserId(@Param("externalUserid")String externalUserid,@Param("wxUserId") String wxUserId);
 
 	List<MemberUnionidRelated> getByWxUserIdAndWxEnterpriseId(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId);
+
+	MemberUnionidRelatedDTO getByParams(@Param("wxUserId")String wxUserId, @Param("wxEnterpriseId")String wxEnterpriseId, 
+			@Param("externalName")String name, @Param("addCreateTime")String createTime);
 }
\ No newline at end of file

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

@@ -21,6 +21,12 @@ public class MemberUnionidRelated implements Serializable {
     private Date createTime;
 
     private Date updateTime;
+    
+    private String selfExternalUserid;
+    
+    private String externalName;
+    
+    private String addCreateTime;
 
     private static final long serialVersionUID = 1L;
 
@@ -95,4 +101,31 @@ public class MemberUnionidRelated implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+	public String getSelfExternalUserid() {
+		return selfExternalUserid;
+	}
+
+	public void setSelfExternalUserid(String selfExternalUserid) {
+		this.selfExternalUserid = selfExternalUserid;
+	}
+
+	public String getExternalName() {
+		return externalName;
+	}
+
+	public void setExternalName(String externalName) {
+		this.externalName = externalName;
+	}
+
+	public String getAddCreateTime() {
+		return addCreateTime;
+	}
+
+	public void setAddCreateTime(String addCreateTime) {
+		this.addCreateTime = addCreateTime;
+	}
+
+    
+    
 }
\ No newline at end of file

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

 package com.gic.haoban.manage.service.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 public class TabHaobanDict implements Serializable {
     private String dictId;
@@ -15,6 +16,45 @@ public class TabHaobanDict implements Serializable {
 
     private String dictContent;
 
+    private String optUserId;
+
+    private String optUserName;
+
+    private Date createTime;
+    private Date updateTime;
+
+    public String getOptUserId() {
+        return optUserId;
+    }
+
+    public void setOptUserId(String optUserId) {
+        this.optUserId = optUserId;
+    }
+
+    public String getOptUserName() {
+        return optUserName;
+    }
+
+    public void setOptUserName(String optUserName) {
+        this.optUserName = optUserName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public String getDictId() {

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

@@ -55,6 +55,8 @@ public class TabHaobanWxEnterprise implements Serializable {
     private Integer statusFlag;
     
     private Integer contactFlag;
+    
+    private String wxSecretKey;
 
     private Date createTime;
 
@@ -285,6 +287,15 @@ public class TabHaobanWxEnterprise implements Serializable {
 	public void setContactFlag(Integer contactFlag) {
 		this.contactFlag = contactFlag;
 	}
+
+	public String getWxSecretKey() {
+		return wxSecretKey;
+	}
+
+	public void setWxSecretKey(String wxSecretKey) {
+		this.wxSecretKey = wxSecretKey;
+	}
+
     
     
 }
\ No newline at end of file

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

@@ -14,4 +14,8 @@ public interface MemberUnionRelatedService {
 
 	List<MemberUnionidRelatedDTO> getByWxUserIdAndWxEnterpriseId(String wxUserId, String wxEnterpriseId);
 
+	MemberUnionidRelatedDTO getByParams(String wxUserId, String wxEnterpriseId, String name, String createTime);
+
+	void update(MemberUnionidRelatedDTO exsitDTO);
+
 }

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

@@ -37,7 +37,7 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 
 	@Override
 	public void delMemberUnionidRelated(MemberUnionidRelatedDTO dto) {
-		mapper.deleteByUnionidAndUserId(dto.getUnionid(),dto.getWxUserId());
+		mapper.deleteByUnionidAndUserId(dto.getExternalUserid(),dto.getWxUserId());
 	}
 
 	@Override
@@ -45,4 +45,15 @@ public class MemberUnionRelatedServiceImpl implements MemberUnionRelatedService
 		return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class, mapper.getByWxUserIdAndWxEnterpriseId(wxUserId,wxEnterpriseId));
 	}
 
+	@Override
+	public MemberUnionidRelatedDTO getByParams(String wxUserId, String wxEnterpriseId, String name, String createTime) {
+		return mapper.getByParams(wxUserId,wxEnterpriseId,name,createTime);
+	}
+
+	@Override
+	public void update(MemberUnionidRelatedDTO exsitDTO) {
+		mapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(MemberUnionidRelated.class, exsitDTO));
+		
+	}
+
 }

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

@@ -16,6 +16,8 @@ import com.gic.haoban.manage.service.dao.mapper.DictMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanDict;
 import com.github.pagehelper.PageHelper;
 
+import java.util.List;
+
 /**
  * Created by tgs on 2020/2/9.
  */
@@ -32,7 +34,7 @@ public class DictApiServiceImpl implements DictApiService{
 			dictMapper.insert(tab);
 		}else{
 			TabHaobanDict tab = EntityUtil.changeEntity(TabHaobanDict.class, dto);
-			dictMapper.updateByPrimaryKey(tab);
+			dictMapper.updateByPrimaryKeySelective(tab);
 		}		
 	}
 
@@ -56,4 +58,10 @@ public class DictApiServiceImpl implements DictApiService{
 	public void deleteOne(String dictId) {
 		dictMapper.deleteByPrimaryKey(dictId);		
 	}
+
+	@Override
+	public List<DictDTO> queryList(List<String> dictKeys) {
+		List<TabHaobanDict> list = dictMapper.queryList(dictKeys);
+		return EntityUtil.changeEntityListByJSON(DictDTO.class, list);
+	}
 }

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

@@ -26,6 +26,8 @@ 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;
+import com.gic.redis.data.anno.RedisLock;
+import com.gic.redis.data.util.RedisUtil;
 
 @Service
 public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService{
@@ -44,6 +46,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	private WxEnterpriseRelatedService wxEnterpriseRelatedService;
 	@Autowired
 	private WxEnterpriseService wxEnterpriseService;
+	
+	private static final String SELF_APP = "selfSuiteId";
+
 
 	@Override
 	public MemberUnionidRelatedDTO getByUnionId(String staffId, String unionid) {
@@ -63,43 +68,89 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 			return "";
 		}
 		List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
+		String suiteid = dto.getSuiteid();		
+		String unionIdJson = "";
+		if(SELF_APP.equals(suiteid)){
+			unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecretKey(), dto.getExternalUserid());
+		}else{
+			unionIdJson = qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
+		}
 		
-		String unionIdJson = qywxUserApiService.getExternalUseridInfo(dto.getCorpid(), dto.getSuiteid(), dto.getExternalUserid());
 		log.info("【新增外部联系人回调】unionIdJson={}",JSON.toJSONString(unionIdJson));
 		String unionId = "";
+		String name = "";
+		String follow_user = "";
+		String createTime  = "";
+		String userId = "";
 		if(StringUtils.isNotBlank(unionIdJson)){
 			JSONObject jo = JSON.parseObject(unionIdJson);
 			unionId = jo.getString("unionid");
+			name = jo.getString("name");
+			follow_user = jo.getString("follow_user");
+			if(StringUtils.isNotBlank(follow_user)){
+				JSONObject j = JSON.parseObject(follow_user);
+				createTime = j.getString("createtime");
+				userId = j.getString("userid");
+			}
+		}
+		
+		String key = "external" + userId + "_" + name + "_" + createTime;
+		RedisUtil.lock(key,2l);
+		
+		if(SELF_APP.equals(suiteid)){
+			MemberDTO member = null;
+			for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
+				 member = memberService.getMemberByUnionid(unionId, tabHaobanWxEnterpriseRelated.getEnterpriseId());
+				 if(member != null){
+					 break;
+				 }
+			}
+			if(member != null){
+				dto.setMemberId(member.getMemberId());
+			}
+			dto.setSelfExternalUserid(dto.getExternalUserid());
+			dto.setUnionid(unionId);
 		}
 		
+		dto.setExternalName(name);
+		dto.setAddCreateTime(createTime);
 		if(StringUtils.isBlank(unionId)){
 			return "";
 		}
 		
-		MemberDTO member = null;
-		for (TabHaobanWxEnterpriseRelated tabHaobanWxEnterpriseRelated : list) {
-			 member = memberService.getMemberByUnionid(unionId, tabHaobanWxEnterpriseRelated.getEnterpriseId());
-			 if(member != null){
-				 break;
-			 }
-		}
-		if(member != null){
-			dto.setMemberId(member.getMemberId());
-		}
 		dto.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
-		dto.setUnionid(unionId);
-		//this.getExternalUserUnionid(dto);
-		return memberUnionRelatedService.addMemberUnionidRelated(dto);
+		dto.setSuiteid(wxEnterprise.getWxSecretKey());
+		
+		MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(dto.getWxUserId(), wxEnterprise.getWxEnterpriseId(),name,createTime);
+		String uuid = "";
+		if(exsitDTO == null){
+			uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
+		}else{
+			//如果是自建更新uuid
+			if(SELF_APP.equals(suiteid)){
+				exsitDTO.setUnionid(unionId);
+				exsitDTO.setMemberId(dto.getMemberId());
+			}else{
+				//更新对外联系人id
+				exsitDTO.setExternalUserid(dto.getExternalUserid());
+			}
+			memberUnionRelatedService.update(exsitDTO);
+			uuid = exsitDTO.getMemberUnionidRelatedId();
+		}
+		return uuid;
 	}
 	@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());
+		TabHaobanWxEnterprise wxEnterprise = wxEnterpriseService.getEnterpriseBycorpId(dto.getCorpid());
+		if(wxEnterprise == null){
+			return ;
+		}
+		String externalUseridInfo = this.qywxUserApiService.getCorpSelfExternalUseridInfo(dto.getCorpid(), wxEnterprise.getWxSecretKey(), dto.getExternalUserid());
 		if(StringUtils.isNotBlank(externalUseridInfo)){
 			JSONObject jsonObject = JSON.parseObject(externalUseridInfo);
 			dto.setUnionid(jsonObject.getString("unionid"));

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.base.api.common.Constant;
-import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.GicMessageDTO;
 import com.gic.haoban.manage.api.dto.QywxCallBackDTO;
@@ -105,12 +105,12 @@ public class MessageApiServiceImpl implements MessageApiService {
             }
             departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
             if(dto.getChangeType() == GicEditType.ADD.getCode()){
-                HaobanResponse response = this.departmentApiService.add(departmentDTO);
+                ServiceResponse response = this.departmentApiService.add(departmentDTO);
                 log.info("添加结果：{}", JSON.toJSONString(response));
             }else if(dto.getChangeType() == GicEditType.UPDATE.getCode()){
                 TabHaobanDepartment department = this.departmentService.selectByRelatedId(dto.getId());
                 if(department == null){
-                    HaobanResponse response = this.departmentApiService.add(departmentDTO);
+                    ServiceResponse response = this.departmentApiService.add(departmentDTO);
                     log.info("添加结果：{}", JSON.toJSONString(response));
                 }else {
                     departmentDTO.setDepartmentId(department.getDepartmentId());

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

@@ -7,10 +7,14 @@
     <result column="dict_key" property="dictKey" jdbcType="VARCHAR" />
     <result column="dict_title" property="dictTitle" jdbcType="VARCHAR" />
     <result column="dict_desc" property="dictDesc" jdbcType="VARCHAR" />
-    <result column="dict_content" property="dictContent" jdbcType="VARCHAR" />
+    <result column="dict_content" property="dictContent" jdbcType="VARCHAR"/>
+    <result column="opt_user_name" property="optUserName" jdbcType="VARCHAR"/>
+    <result column="opt_user_id" property="optUserId" jdbcType="VARCHAR"/>
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
   </resultMap>
   <sql id="Base_Column_List" >
-    dict_id, dict_name, dict_key, dict_title, dict_desc, dict_content
+    dict_id, dict_name, dict_key, dict_title, dict_desc, dict_content,opt_user_name,opt_user_id,create_time,update_time
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -23,11 +27,12 @@
     where dict_id = #{dictId,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanDict" >
-    insert into tab_haoban_dict (dict_id, dict_name, dict_key, 
-      dict_title, dict_desc, dict_content
+    insert into tab_haoban_dict (dict_id, dict_name, dict_key,
+    dict_title, dict_desc, dict_content,opt_user_name,opt_user_id,create_time,update_time
       )
     values (#{dictId,jdbcType=VARCHAR}, #{dictName,jdbcType=VARCHAR}, #{dictKey,jdbcType=VARCHAR}, 
       #{dictTitle,jdbcType=VARCHAR}, #{dictDesc,jdbcType=VARCHAR}, #{dictContent,jdbcType=VARCHAR}
+    ,#{optUserId,jdbcType=VARCHAR}, #{optUserName,jdbcType=VARCHAR},now(),now()
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanDict" >
@@ -91,6 +96,13 @@
       <if test="dictContent != null" >
         dict_content = #{dictContent,jdbcType=VARCHAR},
       </if>
+      <if test="optUserId != null">
+        opt_user_id = #{optUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="optUserName != null">
+        opt_user_name = #{optUserName,jdbcType=VARCHAR},
+      </if>
+      update_time = now()
     </set>
     where dict_id = #{dictId,jdbcType=VARCHAR}
   </update>
@@ -109,4 +121,16 @@
     <include refid="Base_Column_List" />
     from tab_haoban_dict
   </select>
+
+  <select id="queryList" resultMap="BaseResultMap" parameterType="java.lang.String">
+    select
+    <include refid="Base_Column_List"/>
+    from tab_haoban_dict
+    WHERE
+    status_flag = 1
+    AND dict_key in
+    <foreach collection="keys" separator="," open="(" close=")" item="item">
+      #{item}
+    </foreach>
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -9,12 +9,15 @@
     <result column="status_flag" property="statusFlag" jdbcType="INTEGER" />
     <result column="external_userid" property="externalUserid" jdbcType="VARCHAR" />
     <result column="wx_user_id" property="wxUserId" jdbcType="VARCHAR" />
+    <result column="self_external_userid" property="selfExternalUserid" jdbcType="VARCHAR" />
+    <result column="add_create_time" property="addCreateTime" jdbcType="VARCHAR" />
+    <result column="external_name" property="externalName" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
     member_unionid_related_id, member_id, unionid, wx_enterprise_id, status_flag, external_userid, 
-    wx_user_id, create_time, update_time
+    wx_user_id, create_time, update_time,add_create_time,self_external_userid,external_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -30,11 +33,11 @@
     insert into tab_haoban_member_unionid_related (member_unionid_related_id, member_id, 
       unionid, wx_enterprise_id, status_flag, 
       external_userid, wx_user_id, create_time, 
-      update_time)
+      update_time,add_create_time,self_external_userid,external_name)
     values (#{memberUnionidRelatedId,jdbcType=VARCHAR}, #{memberId,jdbcType=VARCHAR}, 
       #{unionid,jdbcType=VARCHAR}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{statusFlag,jdbcType=INTEGER}, 
       #{externalUserid,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{updateTime,jdbcType=TIMESTAMP},#{addCreateTime},#{selfExternalUserid},#{externalName})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
     insert into tab_haoban_member_unionid_related
@@ -66,6 +69,15 @@
       <if test="updateTime != null" >
         update_time,
       </if>
+      <if test="addCreateTime != null" >
+        add_create_time,
+      </if>
+      <if test="selfExternalUserid != null" >
+        self_external_userid,
+      </if>
+      <if test="externalName != null" >
+        external_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="memberUnionidRelatedId != null" >
@@ -95,6 +107,15 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="addCreateTime != null" >
+        #{addCreateTime},
+      </if>
+      <if test="selfExternalUserid != null" >
+        #{selfExternalUserid},
+      </if>
+      <if test="externalName != null" >
+        #{externalName},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
@@ -118,6 +139,15 @@
       <if test="wxUserId != null" >
         wx_user_id = #{wxUserId,jdbcType=VARCHAR},
       </if>
+      <if test="addCreateTime != null" >
+        add_create_time = #{addCreateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="selfExternalUserid != null" >
+        self_external_userid = #{selfExternalUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="externalName != null" >
+        external_name = #{externalName,jdbcType=VARCHAR},
+      </if>
       <if test="createTime != null" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -136,7 +166,10 @@
       external_userid = #{externalUserid,jdbcType=VARCHAR},
       wx_user_id = #{wxUserId,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_time = #{updateTime,jdbcType=TIMESTAMP}
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      self_external_userid = #{selfExternalUserid,jdbcType=VARCHAR},
+      external_name = #{externalName,jdbcType=VARCHAR},
+      add_create_time = #{addCreateTime,jdbcType=VARCHAR}
     where member_unionid_related_id = #{memberUnionidRelatedId,jdbcType=VARCHAR}
   </update>
   
@@ -152,7 +185,7 @@
   <update id="deleteByUnionidAndUserId" parameterType="com.gic.haoban.manage.service.entity.MemberUnionidRelated" >
     update tab_haoban_member_unionid_related
     set status_flag = 0 
-    where unionid = #{unionid,jdbcType=VARCHAR}
+    where external_userid = #{externalUserid,jdbcType=VARCHAR}
     and wx_user_id = #{wxUserId}
   </update>
   
@@ -164,4 +197,15 @@
     and status_flag = 1
     and wx_enterprise_id = #{wxEnterpriseId}
   </select>
+  
+  <select id="getByParams" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_member_unionid_related
+    where wx_user_id = #{wxUserId}
+    and status_flag = 1
+    and wx_enterprise_id = #{wxEnterpriseId}
+    and external_name = #{externalName}
+    and add_create_time = #{addCreateTime}
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -24,6 +24,7 @@
     <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="square_logo_url" property="squareLogoUrl" jdbcType="VARCHAR" />
     <result column="round_logo_url" property="roundLogoUrl" jdbcType="VARCHAR" />
+    <result column="wx_secret_key" property="wxSecretKey" jdbcType="VARCHAR" />
     <result column="level" property="level" jdbcType="INTEGER" />
     <result column="contact_flag" property="contactFlag" jdbcType="INTEGER" />
     <result column="bind_flag" property="bindFlag" jdbcType="INTEGER" />
@@ -35,7 +36,7 @@
     wx_enterprise_id, corpid, permanent_code, corp_name, corp_type, corp_square_logo_url, 
     corp_user_max, corp_full_name, subject_type, verified_end_time, corp_wxqrcode, corp_scale, 
     corp_industry, corp_sub_industry, location, auth_info, agent, agentid, appid, name, 
-    square_logo_url, round_logo_url, level, bind_flag, status_flag, create_time, update_time,contact_flag
+    square_logo_url, round_logo_url, level, bind_flag, status_flag, create_time, update_time,contact_flag,wx_secret_key
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -56,7 +57,7 @@
       auth_info, agent, agentid, 
       appid, name, square_logo_url, 
       round_logo_url, level, bind_flag, 
-      status_flag, create_time, update_time,contact_flag
+      status_flag, create_time, update_time,contact_flag,wx_secret_key
       )
     values (#{wxEnterpriseId,jdbcType=VARCHAR}, #{corpid,jdbcType=VARCHAR}, #{permanentCode,jdbcType=VARCHAR}, 
       #{corpName,jdbcType=VARCHAR}, #{corpType,jdbcType=VARCHAR}, #{corpSquareLogoUrl,jdbcType=VARCHAR}, 
@@ -66,7 +67,7 @@
       #{authInfo,jdbcType=VARCHAR}, #{agent,jdbcType=VARCHAR}, #{agentid,jdbcType=VARCHAR}, 
       #{appid,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{squareLogoUrl,jdbcType=VARCHAR}, 
       #{roundLogoUrl,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, #{bindFlag,jdbcType=INTEGER}, 
-      #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{contactFlag}
+      #{statusFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},#{contactFlag},#{wxSecretKey}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise" >
@@ -156,6 +157,9 @@
       <if test="updateTime != null" >
         update_time,
       </if>
+      <if test="wxSecretKey != null" >
+        wx_secret_key,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="wxEnterpriseId != null" >
@@ -242,6 +246,9 @@
       <if test="updateTime != null" >
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="wxSecretKey != null" >
+        #{wxSecretKey,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise" >
@@ -328,6 +335,9 @@
       <if test="updateTime != null" >
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="wxSecretKey != null" >
+        wx_secret_key = #{wxSecretKey,jdbcType=VARCHAR},
+      </if>
     </set>
     where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
   </update>
@@ -359,6 +369,7 @@
       status_flag = #{statusFlag,jdbcType=INTEGER},
       contact_flag = #{contactFlag,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
+      wx_secret_key = #{wxSecretKey,jdbcType=VARCHAR},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
   </update>

haoban-manage3-service/src/test/java/ServiceTest.java

+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +13,21 @@ import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 public class ServiceTest {
 	@Autowired
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
-	 	@Test
-	    public void test() {
-	 		wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
-	    }
+
+	@Autowired
+	private QywxUserApiService qywxUserApiService;
+
+	@Test
+	public void test() {
+		wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId("073e89a37eb14acabf258e59a57359b6");
+	}
+
+
+	@Test
+	public void test1() {
+		String corpSelfExternalUseridInfo = qywxUserApiService.getCorpSelfExternalUseridInfo("ww50d418adce14b4a9"
+				, "1azg6LG5Vj_YKFO-X27to4S4x_y-f6APR0fwE9YnQd8", "wm-0J8CQAAbGIhtnLd51B97OO_0gf3zw");
+		System.out.println(corpSelfExternalUseridInfo);
+	}
 
 }

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

@@ -34,6 +34,7 @@ import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
@@ -185,8 +186,8 @@ public class DepartmentContoller extends WebBaseController{
 		department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
 		department.setIsStore(0);
 		department.setLevel(dto.getLevel() + 1);
-		HaobanResponse hr = departmentApiService.add(department);
-		if(hr.getErrorCode() != 1){
+		ServiceResponse hr = departmentApiService.add(department);
+		if(hr.getCode() != 1){
 			return resultResponse(HaoBanErrCode.ERR_DEFINE, hr.getMessage(), null, hr.getMessage());
 		}
 	
@@ -236,14 +237,14 @@ public class DepartmentContoller extends WebBaseController{
 		if(dto == null || dto.getStatusFlag() == 0) {
 			return resultResponse(HaoBanErrCode.ERR_10003);
 		}
-		HaobanResponse hr;
+		ServiceResponse hr;
 		if(StringUtils.isBlank(dto.getRelatedId())) {
 			hr = departmentApiService.del(departmentId);
 		}else {
 			hr =  departmentApiService.recycle(departmentId);
 		}
 		
-		if(hr.getErrorCode() == 0) {
+		if(hr.getCode() == 0) {
 			return resultResponse(HaoBanErrCode.ERR_0, hr.getMessage(),null,hr.getMessage());
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
@@ -432,8 +433,8 @@ public class DepartmentContoller extends WebBaseController{
 				department.setRelatedId(departmentAddQO.getRelatedId());
 				department.setRelatedCode(storeCode);
 				department.setSort(maxSort - sort);
-				HaobanResponse hr = departmentApiService.add(department);
-				if(hr.getErrorCode() != 1) {
+				ServiceResponse hr = departmentApiService.add(department);
+				if(hr.getCode() != 1) {
 					continue;
 				}
 				DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
@@ -473,7 +474,7 @@ public class DepartmentContoller extends WebBaseController{
 				logger.info("【部门修改】department={}",JSON.toJSONString(department));
 				
 				handerSonDepartment(departmentQO.getCurrDepartment());
-				HaobanResponse hr = departmentApiService.edit(department);
+				ServiceResponse hr = departmentApiService.edit(department);
 				
 				String sonDepartment = departmentQO.getChildren();
 				handler(sonDepartment,department.getDepartmentId());
@@ -636,8 +637,8 @@ public class DepartmentContoller extends WebBaseController{
 					}
 					department.setRelatedId(departmentAddQO.getRelatedId());
 					department.setRelatedCode(storeCode);
-					HaobanResponse hr = departmentApiService.add(department);
-					if(hr.getErrorCode() != 1) {
+					ServiceResponse hr = departmentApiService.add(department);
+					if(hr.getCode() != 1) {
 						continue;
 					}
 					DepartmentDTO departmentAdd = (DepartmentDTO) hr.getResult();
@@ -657,8 +658,8 @@ public class DepartmentContoller extends WebBaseController{
 					department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
 					department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
 					department.setSort(departmentAddQO.getSort());
-					HaobanResponse hr = departmentApiService.edit(department);
-					if(hr.getErrorCode() != 1) {
+					ServiceResponse hr = departmentApiService.edit(department);
+					if(hr.getCode() != 1) {
 						continue;
 					}
 					DepartmentDTO departmentEdit = (DepartmentDTO) hr.getResult();
@@ -711,8 +712,8 @@ public class DepartmentContoller extends WebBaseController{
 					}
 					staff.setSyncPostionFlag(1);
 					
-					HaobanResponse hr = staffApiService.add(staff, departmentId);
-					if(hr.getErrorCode() == 1){
+					ServiceResponse hr = staffApiService.add(staff, departmentId);
+					if(hr.getCode() == 1){
 						StaffDepartmentRelatedDTO staffRelated = staffApiService.getDepartmentIdAndStaffId(departmentId, hr.getResult().toString());
 						StaffDepartmentRelatedDTO isCodeExist = staffApiService.getDepartmentIdAndCode(departmentId,clerkCode);
 						if(staffRelated != null && isCodeExist == null){
@@ -766,7 +767,7 @@ public class DepartmentContoller extends WebBaseController{
 	public HaobanResponse departmentBatchDel(String departmentIds) {
 		String[] departmentIdArr = departmentIds.split(",");
 		for (String departmentId : departmentIdArr) {
-			HaobanResponse hr;
+			ServiceResponse hr;
 			hr = departmentApiService.del(departmentId);
 			
 		}

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

@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
@@ -64,9 +65,9 @@ public class StaffController extends WebBaseController{
 		if(staff != null) {
 			return resultResponse(HaoBanErrCode.ERR_10005);
 		}
-		HaobanResponse hr = staffApiService.add(staffDTO,departmentIds);
-		if(hr.getErrorCode() == 0){
-			return  resultResponse(HaoBanErrCode.ERR_DEFINE, hr.getDetailError(), null, hr.getDetailError());
+		ServiceResponse hr = staffApiService.add(staffDTO,departmentIds);
+		if(hr.getCode() == 0){
+			return  resultResponse(HaoBanErrCode.ERR_DEFINE, hr.getMessage(), null, hr.getMessage());
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}

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

+package com.gic.haoban.manage.web.controller;
+
+import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.DictDTO;
+import com.gic.haoban.manage.api.service.DictApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.DictVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created 2020/3/26.
+ *
+ * @author hua
+ */
+@Controller
+public class DictController extends WebBaseController {
+
+    @Autowired
+    private DictApiService dictApiService;
+
+    @RequestMapping("/dict-list")
+    @ResponseBody
+    public HaobanResponse queryDictList(String dictKeys) {
+        if (StringUtils.isBlank(dictKeys)) {
+            return resultResponse(HaoBanErrCode.ERR_5);
+        }
+        String[] split = dictKeys.split(",");
+        List<DictDTO> ret = dictApiService.queryList(Arrays.asList(split));
+        return resultResponse(HaoBanErrCode.ERR_1, EntityUtil.changeEntityListByOrika(DictVo.class, ret));
+    }
+}

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

@@ -96,6 +96,7 @@ public class StoreController extends WebBaseController{
 					StoreDTO storeDTO = storeService.getStore(dto.getRelatedId());
 					if(storeDTO != null ){
 						VO.setEnterpriseId(storeDTO.getEnterpriseId());
+						VO.setStoreImg(storeDTO.getImageUrl());//先置空
 					}
 				}
 				VO.setCreateTime(dto.getCreateTime());

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class DictVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String dictName;
+
+    private String dictKey;
+
+    private String dictTitle;
+
+
+    private String dictContent;
+
+    public String getDictName() {
+        return dictName;
+    }
+
+    public void setDictName(String dictName) {
+        this.dictName = dictName;
+    }
+
+    public String getDictKey() {
+        return dictKey;
+    }
+
+    public void setDictKey(String dictKey) {
+        this.dictKey = dictKey;
+    }
+
+    public String getDictTitle() {
+        return dictTitle;
+    }
+
+    public void setDictTitle(String dictTitle) {
+        this.dictTitle = dictTitle;
+    }
+
+    public String getDictContent() {
+        return dictContent;
+    }
+
+    public void setDictContent(String dictContent) {
+        this.dictContent = dictContent;
+    }
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -38,4 +38,6 @@
 	
 	<dubbo:reference interface="com.gic.thirdparty.api.service.QQCloudPicService" id="qqCloudPicServiceImpl"/>
 
+	<dubbo:reference interface="com.gic.haoban.manage.api.service.DictApiService" id="dictApiService"/>
+
 </beans>