Skip to content

H
haoban-manage3.0
Commit d827d514 by 徐高华
Options

运维

parent 253b5c86
Showing with 227 additions and 173 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/YwWxEnterpriseDTO.java
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
public class YwWxEnterpriseDTO implements Serializable {
private String wxEnterpriseId;
private String corpid;
private String corpName;
private String name;
private Integer bindFlag;
private Integer statusFlag;
//gic通讯录助手
private String contactFlag;
//订购状态
private String buyStatus;
//订购时间
private Date buyDate;
//版本号
private String version;
private String corpSquareLogoUrl;
//关联商户数量
private Integer relationCount=0;
/**
* 是否开启标签同步标记 1 是 0 否
*/
private Integer tagOpenFlag;
/**
* 转换状态：0:未转换；1:转换成功；2:转换中
*/
private Integer externalFlag;
/**
* 是否开启群发 true 开启 false 关闭
*/
private Boolean openMassFlag;
public static long getSerialversionuid() {
return serialVersionUID;
}
public Integer getRelationCount() {
return relationCount;
}
public void setRelationCount(Integer relationCount) {
this.relationCount = relationCount;
}
private static final long serialVersionUID = 1L;
public String getCorpSquareLogoUrl() {
return corpSquareLogoUrl;
}
public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
this.corpSquareLogoUrl = corpSquareLogoUrl;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getCorpName() {
return corpName;
}
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getBindFlag() {
return bindFlag;
}
public void setBindFlag(Integer bindFlag) {
this.bindFlag = bindFlag;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public String getContactFlag() {
return contactFlag;
}
public void setContactFlag(String contactFlag) {
this.contactFlag = contactFlag;
}
public String getBuyStatus() {
return buyStatus;
}
public void setBuyStatus(String buyStatus) {
this.buyStatus = buyStatus;
}
public Date getBuyDate() {
return buyDate;
}
public void setBuyDate(Date buyDate) {
this.buyDate = buyDate;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public Integer getTagOpenFlag() {
return tagOpenFlag;
}
public void setTagOpenFlag(Integer tagOpenFlag) {
this.tagOpenFlag = tagOpenFlag;
}
public Integer getExternalFlag() {
return externalFlag;
}
public void setExternalFlag(Integer externalFlag) {
this.externalFlag = externalFlag;
}
public Boolean getOpenMassFlag() {
return openMassFlag;
}
public void setOpenMassFlag(Boolean openMassFlag) {
this.openMassFlag = openMassFlag;
}
}
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
public class YwWxEnterpriseDTO implements Serializable {
private String wxEnterpriseId;
private String corpid;
private String corpName;
private String name;
private Integer bindFlag;
private Integer statusFlag;
//gic通讯录助手
private String contactFlag;
//订购状态
private String buyStatus;
//订购时间
private Date buyDate;
//版本号
private String version;
private String corpSquareLogoUrl;
//关联商户数量
private Integer relationCount=0;
/**
* 是否开启标签同步标记 1 是 0 否
*/
private Integer tagOpenFlag;
/**
* 转换状态：0:未转换；1:转换成功；2:转换中
*/
private Integer externalFlag;
/**
* 是否开启群发 true 开启 false 关闭
*/
private Boolean openMassFlag;
private List<EnterpriseDetailDTO> enList ;
public List<EnterpriseDetailDTO> getEnList() {
return enList;
}
public void setEnList(List<EnterpriseDetailDTO> enList) {
this.enList = enList;
}
public static long getSerialversionuid() {
return serialVersionUID;
}
public Integer getRelationCount() {
return relationCount;
}
public void setRelationCount(Integer relationCount) {
this.relationCount = relationCount;
}
private static final long serialVersionUID = 1L;
public String getCorpSquareLogoUrl() {
return corpSquareLogoUrl;
}
public void setCorpSquareLogoUrl(String corpSquareLogoUrl) {
this.corpSquareLogoUrl = corpSquareLogoUrl;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getCorpid() {
return corpid;
}
public void setCorpid(String corpid) {
this.corpid = corpid;
}
public String getCorpName() {
return corpName;
}
public void setCorpName(String corpName) {
this.corpName = corpName;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getBindFlag() {
return bindFlag;
}
public void setBindFlag(Integer bindFlag) {
this.bindFlag = bindFlag;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public String getContactFlag() {
return contactFlag;
}
public void setContactFlag(String contactFlag) {
this.contactFlag = contactFlag;
}
public String getBuyStatus() {
return buyStatus;
}
public void setBuyStatus(String buyStatus) {
this.buyStatus = buyStatus;
}
public Date getBuyDate() {
return buyDate;
}
public void setBuyDate(Date buyDate) {
this.buyDate = buyDate;
}
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
public Integer getTagOpenFlag() {
return tagOpenFlag;
}
public void setTagOpenFlag(Integer tagOpenFlag) {
this.tagOpenFlag = tagOpenFlag;
}
public Integer getExternalFlag() {
return externalFlag;
}
public void setExternalFlag(Integer externalFlag) {
this.externalFlag = externalFlag;
}
public Boolean getOpenMassFlag() {
return openMassFlag;
}
public void setOpenMassFlag(Boolean openMassFlag) {
this.openMassFlag = openMassFlag;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java
......@@ -19,6 +19,8 @@ public interface WxEnterpriseRelatedApiService {
List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId);
List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseIdList(List<String> wxEnterpriseIdList);
List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber);
String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java
......@@ -29,6 +29,8 @@ import com.gic.redis.data.util.RedisUtil;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -137,13 +139,22 @@ public class EnterpriseController extends WebBaseController {
}
doProcessOpenSendMass(page.getResult());
if(CollectionUtils.isNotEmpty(page.getResult())) {
List<String> idList = page.getResult().stream().map(dto->dto.getWxEnterpriseId()).collect(Collectors.toList()) ;
List<EnterpriseDetailDTO> enList = this.wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseIdList(idList);
if(CollectionUtils.isNotEmpty(enList)) {
Map<String, List<EnterpriseDetailDTO>> map = enList.stream().collect(Collectors.groupingBy(EnterpriseDetailDTO::getWxEnterpriseId)) ;
for(YwWxEnterpriseDTO item : page.getResult()) {
item.setEnList(map.get(item.getWxEnterpriseId()));
}
}
}
pageResult.setList(page.getResult());
pageResult.setPageNum(page.getCurrentPage());
pageResult.setPages(page.getPages());
pageResult.setPageSize(page.getPageSize());
pageResult.setTotal(page.getTotalCount());
return resultResponse(HaoBanErrCode.ERR_1, pageResult);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java
......@@ -20,6 +20,8 @@ public interface WxEnterpriseRelatedMapper {
int updateByPrimaryKey(TabHaobanWxEnterpriseRelated record);
List<TabHaobanWxEnterpriseRelated> listByWxenterpriseId(String wxEnterpriseId);
List<TabHaobanWxEnterpriseRelated> listByWxenterpriseIdList(@Param("wxEnterpriseIdList") List<String> wxEnterpriseIdList);
TabHaobanWxEnterpriseRelated findOneByEnterpriseId(String enterpriseId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
......@@ -125,6 +125,23 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
}
@Override
public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseIdList(List<String> wxEnterpriseIdList) {
List<TabHaobanWxEnterpriseRelated> relatedList = this.wxEnterpriseRelatedMapper.listByWxenterpriseIdList(wxEnterpriseIdList) ;
if(CollectionUtils.isNotEmpty(relatedList)) {
List<EnterpriseDetailDTO> list = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, relatedList);
for(EnterpriseDetailDTO item : list) {
String enterpriseId = item.getEnterpriseId() ;
EnterpriseDTO en = this.enterpriseService.getEnterpriseById(enterpriseId) ;
if(null != en) {
item.setEnterpriseName(en.getBrandName());
}
}
return list ;
}
return null;
}
@Override
public List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId, String phoneNumber) {
logger.info("listEnterpriseByWxEnterpriseId,wxeid={},phone={}",wxEnterpriseId,phoneNumber);
List<TabHaobanWxEnterpriseRelated> relatedList = wxEnterpriseRelatedMapper.listByWxenterpriseId(wxEnterpriseId);
......
haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
......@@ -178,6 +178,18 @@
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag = 1
</select>
<select id="listByWxenterpriseIdList" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_haoban_wx_enterprise_related
where wx_enterprise_id in
<foreach collection="wxEnterpriseIdList" item="id" index="index" open="(" close=")" separator=",">
#{id,jdbcType=VARCHAR}
</foreach>
and status_flag = 1
</select>
<select id="findOneByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >
select
<include refid="Base_Column_List" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment