Skip to content

H
haoban-manage3.0
Commit aa925a7c by 墨竹
Options

Merge branch 'developer' into feature-qywx-fee 

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml
parents 74b96f1d 250deac0
Showing with 415 additions and 237 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/WxEnterpriseDTO.java
......@@ -106,6 +106,8 @@ public class WxEnterpriseDTO implements Serializable {
private Integer useridFlag;
private Integer autoActiveFlag;
private String enterpriseId;
public String getMemberSecret() {
return memberSecret;
}
......@@ -457,4 +459,12 @@ public class WxEnterpriseDTO implements Serializable {
public void setAutoActiveFlag(Integer autoActiveFlag) {
this.autoActiveFlag = autoActiveFlag;
}
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/WxEnterpriseQwDTO.java
......@@ -12,27 +12,35 @@ public class WxEnterpriseQwDTO implements Serializable {
private String corpid;
// 好办 助手
private String dkCorpid;
private String dkSuiteId ;
// 会员小程序dk
private String memberCorpid;
private String memberSuiteId ;
// 第三方
private String thirdCorpid;
// 自建
private String selfCorpid;
public String getDkSuiteId() {
return dkSuiteId;
}
public int getWxSecurityType() {
return wxSecurityType;
public String getMemberSuiteId() {
return memberSuiteId;
}
public void setWxSecurityType(int wxSecurityType) {
this.wxSecurityType = wxSecurityType;
public void setDkSuiteId(String dkSuiteId) {
this.dkSuiteId = dkSuiteId;
}
public String getSelfCorpid() {
return selfCorpid;
public void setMemberSuiteId(String memberSuiteId) {
this.memberSuiteId = memberSuiteId;
}
public void setSelfCorpid(String selfCorpid) {
this.selfCorpid = selfCorpid;
public int getWxSecurityType() {
return wxSecurityType;
}
public void setWxSecurityType(int wxSecurityType) {
this.wxSecurityType = wxSecurityType;
}
public String getWxEnterpriseId() {
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmClerkRelationApiService.java 0 → 100644
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
import java.util.List;
/**
* 多人活码
*
* @author mozhu
* @date 2022-08-05 17:02:54
*/
public interface HmClerkRelationApiService {
/**
* 导购解绑作废
*
* @param clerkId
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param invokingType 调用类型
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-07-22 15:14:51
*/
ServiceResponse delByClerkId(String clerkId,String enterpriseId,String wxEnterpriseId,Integer invokingType);
/**
* 根据导购信息获取hmid
*
* @param basePageInfo 基本信息页
* @param hmId hm id
* @return {@link List }<{@link HmClerkRelationDTO }>
* @author mozhu
* @date 2022-07-15 14:31:03
*/
Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId);
/**
* 根据活码id和导购id查询数据
*
* @param hmId hm id
* @param clerkId 职员id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:36:29
*/
HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId, String clerkId);
/**
* 根据活码id随机找一个
*
* @param hmId hm id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:48:42
*/
HmClerkRelationDTO getOneHmClerkByHmId(Long hmId);
/**
* 根据活码id和staffId随机找一个
*
* @param hmId hm id
* @param staffId 员工id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 17:24:01
*/
HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId,String staffId);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmGroupApiService.java
......@@ -61,5 +61,5 @@ public interface HmGroupApiService {
* @param enterpriseId
* @return
*/
ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String enterpriseId, String groupName);
ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String wxEnterpriseId, String enterpriseId, String groupName);
}
\ No newline at end of file
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java
package com.gic.haoban.manage.api.service.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeStoreDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
......@@ -81,19 +78,6 @@ public interface HmQrcodeApiService {
*/
ServiceResponse delById(Long hmId, Integer invokingType, WebLoginDTO loginDTO);
/**
* 导购解绑作废
*
* @param clerkId
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param invokingType 调用类型
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-07-22 15:14:51
*/
ServiceResponse delByClerkId(String clerkId,String enterpriseId,String wxEnterpriseId,Integer invokingType);
/**
* 通过id添加num
......@@ -158,17 +142,6 @@ public interface HmQrcodeApiService {
*/
List<String> getHmStoreForWxa(String wxEnterpriseId ,String enterpriseId) ;
/**
* 根据导购信息获取hmid
*
* @param basePageInfo 基本信息页
* @param hmId hm id
* @return {@link List }<{@link HmClerkRelationDTO }>
* @author mozhu
* @date 2022-07-15 14:31:03
*/
Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId);
/**
* 批量修改活码分组
......@@ -180,40 +153,6 @@ public interface HmQrcodeApiService {
/**
* 根据活码id和导购id查询数据
*
* @param hmId hm id
* @param clerkId 职员id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:36:29
*/
HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId,String clerkId);
/**
* 根据活码id随机找一个
*
* @param hmId hm id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 16:48:42
*/
HmClerkRelationDTO getOneHmClerkByHmId(Long hmId);
/**
* 根据活码id和staffId随机找一个
*
* @param hmId hm id
* @param staffId 员工id
* @return {@link HmClerkRelationDTO }
* @author mozhu
* @date 2022-07-15 17:24:01
*/
HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId,String staffId);
/**
*
* @Title: listHmIdForIndex
* @Description: 返回活码id列表,用于首页列表查询
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseMapper.java
package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
import com.github.pagehelper.Page;
import org.apache.ibatis.annotations.Param;
......@@ -83,4 +84,13 @@ public interface WxEnterpriseMapper {
* @date 2022-08-03 17:27:13
*/
int updateAutoActiveFlagById(@Param("autoActiveFlag") Integer autoActiveFlag, @Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 列出所有wx企业（与gic关联）
*
* @return {@link List }<{@link WxEnterpriseDTO }>
* @author mozhu
* @date 2022-08-08 13:45:30
*/
List<WxEnterpriseDTO> listAllWxEnterprise();
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmGroupSettingMapper.java
......@@ -40,6 +40,6 @@ public interface TabHaobanHmGroupSettingMapper {
* @param enterpriseId
* @return
*/
List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName);
List<TabHaobanHmGroupSetting> queryHmGroupSettingByName(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("groupName") String groupName);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/TabHaobanHmQrcodeMapper.java
......@@ -147,7 +147,6 @@ public interface TabHaobanHmQrcodeMapper {
*/
TabHaobanHmQrcode queryByClerkIdAndOverFlag(@Param("clerkId") String clerkId,
@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("overFlag") Integer overFlag,
@Param("hmType") Integer hmType);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/qo/WelcomeRelationQO.java
......@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.pojo.qo;
import com.gic.haoban.base.api.common.BasePageInfo;
import java.util.List;
/**
* @Author MUSI
* @Date 2022/7/4 10:54 AM
......@@ -17,6 +19,8 @@ public class WelcomeRelationQO extends BasePageInfo {
private String searchContent;
private List<Integer> statusList;
public String getWelcomeId() {
return welcomeId;
}
......@@ -40,4 +44,12 @@ public class WelcomeRelationQO extends BasePageInfo {
public void setSearchContent(String searchContent) {
this.searchContent = searchContent;
}
public List<Integer> getStatusList() {
return statusList;
}
public void setStatusList(List<Integer> statusList) {
this.statusList = statusList;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseService.java
......@@ -57,6 +57,16 @@ public interface WxEnterpriseService {
*/
List<TabHaobanWxEnterprise> listAll();
/**
* 列出所有wx企业(已关联gic企业)
*
* @return {@link List }<{@link WxEnterpriseDTO }>
* @author mozhu
* @date 2022-08-08 13:38:31
*/
List<WxEnterpriseDTO> listAllWxEnterprise();
/**
* 更新userid
*
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmGroupService.java
......@@ -59,6 +59,6 @@ public interface HmGroupService {
* @param enterpriseId
* @return
*/
List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName);
List<HmGroupSettingBO> queryGroupSettingByName(String wxEnterpriseId, String enterpriseId, String groupName);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmQrcodeService.java
......@@ -123,7 +123,7 @@ public interface HmQrcodeService {
* @author mozhu
* @date 2022-07-27 14:52:40
*/
HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag,Integer hmType);
HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer hmType);
/**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmGroupServiceImpl.java
......@@ -136,8 +136,8 @@ public class HmGroupServiceImpl implements HmGroupService {
}
}
public List<HmGroupSettingBO> queryGroupSettingByName(String enterpriseId, String groupName){
List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(enterpriseId, groupName);
public List<HmGroupSettingBO> queryGroupSettingByName(String wxEnterpriseId, String enterpriseId, String groupName){
List<TabHaobanHmGroupSetting> tabHaobanHmGroupSettings = haobanHmGroupSettingMapper.queryHmGroupSettingByName(wxEnterpriseId, enterpriseId, groupName);
if (CollectionUtils.isEmpty(tabHaobanHmGroupSettings)){
return Collections.emptyList();
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmQrcodeServiceImpl.java
......@@ -109,9 +109,9 @@ public class HmQrcodeServiceImpl implements HmQrcodeService {
}
@Override
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer overFlag, Integer hmType) {
public HmQrcodeBO queryByClerkId(String clerkId, String wxEnterpriseId, Integer hmType) {
return EntityUtil.changeEntity(HmQrcodeBO.class,
tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId, overFlag, hmType));
tabHaobanHmQrcodeMapper.queryByClerkIdAndOverFlag(clerkId, wxEnterpriseId, hmType));
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WelcomeRelationServiceImpl.java
......@@ -161,7 +161,10 @@ public class WelcomeRelationServiceImpl implements WelcomeRelationService {
return Boolean.TRUE;
}
welcomeTemplateRelation.setUpdateTime(new Date());
welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
welcomeTemplateRelation.setStatus(hmWelcomeRelationBO.getStatus());
if (welcomeTemplateRelation.getStatus() == null){
welcomeTemplateRelation.setStatus(WelcomeRelationStatusEnum.DISABLE.getCode());
}
welcomeTemplateRelationMapper.updateByPrimaryKeySelective(welcomeTemplateRelation);
// 定义
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
......@@ -11,6 +11,7 @@ import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
import com.gic.haoban.manage.api.enums.BindTypeEnum;
import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanMemberClerkChatConfigMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
......@@ -54,6 +55,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
private HmQrcodeApiService hmQrcodeApiService;
@Autowired
private StaffService staffService;
@Autowired
private HmClerkRelationApiService hmClerkRelationApiService;
@Override
public List<StaffClerkRelationDTO> listBindCode(String enterpriseId, Set<String> clerkCodeList) {
......@@ -82,7 +85,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
staffClerkBindLogService.pushToMq(clerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), chanelCode, clerkRelation.getStaffClerkRelationId());
//废弃活码
hmQrcodeApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(),clerkRelation.getWxEnterpriseId(),chanelCode);
hmClerkRelationApiService.delByClerkId(clerkId, clerkRelation.getEnterpriseId(),clerkRelation.getWxEnterpriseId(),chanelCode);
}
return b;
}
......@@ -97,14 +100,21 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if (CollectionUtils.isEmpty(needUnbind)) {
logger.info("没有门店绑定了需要解绑的：{}", wxEnterpriseId);
}
//清除绑定
mapper.delByStoreIds(storeIds);
//删除主门店
clerkMainStoreRelatedService.delMainStoreByStoreIds(storeIds);
List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
//放入队列
staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), chanelCode, need);
for (TabHaobanStaffClerkRelation clerkRelation : needUnbind) {
//废弃活码
hmClerkRelationApiService.delByClerkId(clerkRelation.getClerkId(), clerkRelation.getEnterpriseId(),clerkRelation.getWxEnterpriseId(),chanelCode);
}
return true;
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java
......@@ -142,6 +142,12 @@ public class WelcomeServiceImpl implements WelcomeService {
// 校验欢迎语数量、适用部门、适用员工数量
long count = welcomeMapper.countByWxEnterpriseId(bo.getWxEnterpriseId(), bo.getType());
if (count >= WELCOME_LIMIT) {
if (HmWelcomeType.NORMAL.getCode().equals(bo.getType())){
return "普通欢迎语最多可创建50条";
}
if (HmWelcomeType.SPECIAL.getCode().equals(bo.getType())){
return "特殊欢迎语最多可创建50条";
}
return "欢迎语条目超过限制";
}
List<WelcomeSuitDepartmentBO> suitDepartmentList = bo.getSuitDepartmentAddList();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WxEnterpriseServiceImpl.java
......@@ -71,13 +71,13 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
qw.setThirdCorpid(app.getCorpid());
}else if(appType.equals(3)) {
qw.setDkCorpid(app.getCorpid());
qw.setDkSuiteId(app.getSiteId());
}else if(appType.equals(4)) {
qw.setMemberCorpid(app.getCorpid());
qw.setMemberSuiteId(app.getSiteId());
}
});
}
qw.setSelfCorpid(wxEnterprise.getCorpid());
logger.info("企微所有corpid信息={}",JSON.toJSON(qw));
return qw;
}
......@@ -132,6 +132,10 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
return mapper.listAll();
}
@Override
public List<WxEnterpriseDTO> listAllWxEnterprise() {
return mapper.listAllWxEnterprise();
}
@Override
public int updateUseridFlagById(Integer useridFlag, String corpid, String wxEnterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -42,6 +42,7 @@ import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
import com.gic.haoban.manage.api.service.MaterialApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
......@@ -170,6 +171,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
private HmLinkService hmLinkService;
@Autowired
private MemberService memberService;
@Autowired
private HmClerkRelationApiService hmClerkRelationApiService;
@Override
public void dealQywxExternalUser(String params) {
......@@ -371,15 +374,15 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
if (mainStoreRelated != null) {
StaffClerkRelationDTO relationDTO = staffClerkRelationService.getOneBindByStoreId(staffId, mainStoreRelated.getStoreId());
hmClerkRelationDTO = hmQrcodeApiService.getHmClerkByHmIdAndClerkId(hmId, relationDTO.getClerkId());
hmClerkRelationDTO = hmClerkRelationApiService.getHmClerkByHmIdAndClerkId(hmId, relationDTO.getClerkId());
if (hmClerkRelationDTO == null) {
hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmIdAndStaffId(hmId, staffId);
hmClerkRelationDTO = hmClerkRelationApiService.getOneHmClerkByHmIdAndStaffId(hmId, staffId);
if (hmClerkRelationDTO == null) {
hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(hmId);
hmClerkRelationDTO = hmClerkRelationApiService.getOneHmClerkByHmId(hmId);
}
}
} else {
hmClerkRelationDTO = hmQrcodeApiService.getOneHmClerkByHmId(hmId);
hmClerkRelationDTO = hmClerkRelationApiService.getOneHmClerkByHmId(hmId);
}
staffClerkRelationDTO = staffClerkRelationService.getBindByClerkId(hmClerkRelationDTO.getClerkId(), wxEnterpriseId);
}
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -323,8 +323,10 @@ public class StaffApiServiceImpl implements StaffApiService {
user = qywxUserApiService.getWorkWxUser(corpid, config.getWxSuiteid(), userId);
logger.info("成员详情(第三方)={}",JSON.toJSONString(user)) ;
UserDTO userSelf = qywxUserApiService.getSelfWorkWxUser(wxInfo.getDkCorpid(), secretSetting.getSecretVal(), user.getOpen_userid());
logger.info("成员详情(代开)={}",JSON.toJSONString(user)) ;
if (user != null && userSelf != null) {
user.setName(userSelf.getName());
user.setPosition(userSelf.getPosition());
}
} else {
user = qywxUserApiService.getSelfWorkWxUser(corpid, secretSetting.getSecretVal(), userId);
......@@ -351,6 +353,10 @@ public class StaffApiServiceImpl implements StaffApiService {
}
staff = (staff == null ? new TabHaobanStaff() : staff);
staff.setWxUserId(userId);
String openUserid = getOpenUserid(userId, corpid);
if (StringUtils.isNotBlank(openUserid)) {
staff.setWxOpenUseId(openUserid);
}
staff.setUpdateTime(new Date());
staff.setStatusFlag(1);
staff.setWxEnterpriseId(wxEnterpriseId);
......@@ -374,10 +380,6 @@ public class StaffApiServiceImpl implements StaffApiService {
if (StringUtils.isNotBlank(qr_code)) {
staff.setQrCode(qr_code);
}
String openUserid = getOpenUserid(userId, corpid);
if (StringUtils.isNotBlank(openUserid)) {
staff.setWxOpenUseId(openUserid);
}
//成员更改或更新
if (StringUtils.isBlank(staff.getStaffId())) {
logger.info("新增成员");
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -22,7 +22,7 @@ import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.AuditApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
import com.gic.haoban.manage.service.entity.TabHaobanStaff;
......@@ -76,7 +76,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
@Autowired
private WxEnterpriseService wxEnterpriseService;
@Autowired
private HmQrcodeApiService hmQrcodeApiService;
private HmClerkRelationApiService hmClerkRelationApiService;
@Autowired
private HmQrcodeService hmQrcodeService ;
......@@ -142,48 +142,23 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
return null;
}
List<StaffClerkInfoDTO> infoDTOS = EntityUtil.changeEntityListByJSON(StaffClerkInfoDTO.class, list);
Map<String, String> nameMap = new HashMap<>();
infoDTOS.forEach(infoDTO -> {
//企业
if (!nameMap.containsKey(infoDTO.getEnterpriseId())) {
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
if (null != enterpriseDTO) {
nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName() + "_" + enterpriseDTO.getBrandName());
} else {
nameMap.put(infoDTO.getEnterpriseId(), "未知商户");
}
}
//门店店员名称
if (!nameMap.containsKey(infoDTO.getClerkId())) {
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(infoDTO.getClerkId());
if (null != clerkDTO) {
nameMap.put(infoDTO.getClerkId(), clerkDTO.getClerkName());
nameMap.put(infoDTO.getStoreId(), clerkDTO.getStoreName());
infoDTO.setClerkPhoneNumber(clerkDTO.getPhoneNumber());
} else {
nameMap.put(infoDTO.getClerkId(), "未知店员");
}
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
if (enterpriseDTO != null) {
infoDTO.setBrandName(enterpriseDTO.getBrandName());
infoDTO.setEnterpriseName(enterpriseDTO.getEnterpriseName());
}
//门店店员名称
if (!nameMap.containsKey(infoDTO.getStoreId())) {
StoreDTO storeDTO = storeService.getStore(infoDTO.getStoreId());
if (null != storeDTO) {
nameMap.put(infoDTO.getStoreId(), storeDTO.getStoreName());
} else {
nameMap.put(infoDTO.getStoreId(), "未知门店");
}
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(infoDTO.getClerkId(),-1);
if (null != clerkDTO) {
infoDTO.setClerkPhoneNumber(clerkDTO.getPhoneNumber());
infoDTO.setClerkName(clerkDTO.getClerkName());
infoDTO.setClerkCode(clerkDTO.getClerkCode());
}
infoDTO.setClerkName(nameMap.get(infoDTO.getClerkId()));
infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
if ((nameMap.get(infoDTO.getEnterpriseId())) != null) {
String enterpriseAndBrandName = nameMap.get(infoDTO.getEnterpriseId());
String[] split = enterpriseAndBrandName.split("_");
infoDTO.setEnterpriseName(split[0]);
if (split[1] != null) {
infoDTO.setBrandName(split[1]);
}
StoreDTO storeDTO = storeService.getStore(infoDTO.getStoreId());
if (null != storeDTO) {
infoDTO.setStoreName(storeDTO.getStoreName());
}
});
return infoDTOS;
......@@ -396,7 +371,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
//删除主门店
clerkMainStoreRelatedService.delMainStore(staffId, staffClerkRelation.getStoreId(), wxEnterpriseId);
//废弃活码
hmQrcodeApiService.delByClerkId(clerkId,staffClerkRelation.getEnterpriseId(),wxEnterpriseId,channelCode);
hmClerkRelationApiService.delByClerkId(clerkId,staffClerkRelation.getEnterpriseId(),wxEnterpriseId,channelCode);
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java
......@@ -13,6 +13,7 @@ import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveFriendSettingQDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.SaveWelcomeQDTO;
import com.gic.haoban.manage.api.service.out.WelcomeApiService;
import com.gic.haoban.manage.service.errorcode.HaoBanErrCode;
import com.gic.haoban.manage.service.pojo.bo.welcome.FriendSettingDetailBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.SaveFriendSettingBO;
import com.gic.haoban.manage.service.pojo.bo.welcome.SaveWelcomeBO;
......@@ -67,8 +68,13 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
saveWelcomeBO.setSuitDepartmentAddList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentBO.class, qdto.getSuitDepartmentAddList()));
// 使用部门删除列表
saveWelcomeBO.setSuitDepartmentDeleteList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentBO.class, qdto.getSuitDepartmentDeleteList()));
Boolean saveWelcome = welcomeService.saveWelcome(saveWelcomeBO);
return ServiceResponse.success(saveWelcome);
try {
Boolean saveWelcome = welcomeService.saveWelcome(saveWelcomeBO);
return ServiceResponse.success(saveWelcome);
}catch (RuntimeException ex){
String message = ex.getMessage();
return ServiceResponse.failure(HaoBanErrCode.ERR_OTHER.getCode(), message);
}
}
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java
......@@ -18,12 +18,9 @@ import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.EnterpriseUsingPermissionDto;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.EnterpriseUseForbidService;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.MiniprogramSettingDTO;
......@@ -75,8 +72,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@Autowired
private Config config;
@Autowired
private EnterpriseUseForbidService enterpriseUseForbidService;
@Autowired
private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
@Override
......@@ -263,7 +258,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
log.info("企微关联数={}，{}" ,count ,JSON.toJSONString(list));
String msg = "好办服务已到期" ;
if (count == 1) {
List<EnterpriseUsingPermissionDto> enList = this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
/* List<EnterpriseUsingPermissionDto> enList = this.enterpriseUseForbidService.selectEnterprisePermissionByEnterpriseId(list.get(0).getEnterpriseId()) ;
log.info("企微商户状态={}",JSON.toJSONString(list));
if(CollectionUtils.isNotEmpty(list)) {
for(EnterpriseUsingPermissionDto dto : enList) {
......@@ -272,7 +267,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
break ;
}
}
}
}*/
return ServiceResponse.failure("2000", msg);
} else {
return ServiceResponse.failure("3000", msg);
......@@ -286,7 +281,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
@Override
public boolean enterpriseIsOver(String enterpriseId) {
try {
/* try {
log.info("是否停用查询={}", enterpriseId);
Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterpriseId, "haoban-3");
log.info("是否停用={},{}", enterpriseId, code);
......@@ -296,7 +291,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
}
} catch (Exception e) {
e.printStackTrace();
}
}*/
EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
if (enterprise == null || enterprise.getStatus() != 1) {
return true;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmClerkRelationApiServiceImpl.java 0 → 100644
package com.gic.haoban.manage.service.service.out.impl.hm;
import com.gic.api.base.commons.BasePageInfo;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmClerkRelationDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.service.pojo.bo.hm.HmClerkRelationBO;
import com.gic.haoban.manage.service.pojo.bo.hm.HmQrcodeBO;
import com.gic.haoban.manage.service.service.hm.HmClerkRelationService;
import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("hmClerkRelationApiService")
public class HmClerkRelationApiServiceImpl implements HmClerkRelationApiService {
private static Logger logger = LoggerFactory.getLogger(HmClerkRelationApiServiceImpl.class);
@Autowired
private HmQrcodeApiService hmQrcodeApiService;
@Autowired
private HmQrcodeService hmQrcodeService;
@Autowired
private HmClerkRelationService hmClerkRelationService;
@Override
public ServiceResponse delByClerkId(String clerkId, String enterpriseId, String wxEnterpriseId, Integer invokingType) {
// 单人活码 直接废弃，多人活码，更新
HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
if (hmQrcodeBO != null) {
hmQrcodeApiService.delById(hmQrcodeBO.getHmId(), invokingType, null);
}
// 多人活码逻辑
List<HmClerkRelationBO> hmClerkRelationBOS = hmClerkRelationService.queryByClerkId(clerkId, enterpriseId);
if (CollectionUtils.isEmpty(hmClerkRelationBOS)) {
logger.info("无多人活码");
return ServiceResponse.success();
}
for (HmClerkRelationBO hmClerkRelationBO : hmClerkRelationBOS) {
Long hmId = hmClerkRelationBO.getHmId();
List<String> clerkIds = hmClerkRelationService.getClerkIdByHmId(hmId);
hmClerkRelationService.updateStatusById(0, hmClerkRelationBO.getRelationId());
clerkIds.remove(clerkId);
if (CollectionUtils.isNotEmpty(clerkIds)) {
// 更新活码
HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
hmQrcodeQDTO.setHmId(hmId);
hmQrcodeQDTO.setClerkIdList(clerkIds);
hmQrcodeApiService.update(hmQrcodeQDTO);
} else {
hmQrcodeApiService.delById(hmId, invokingType, null);
}
}
return ServiceResponse.success();
}
@Override
public Page<HmClerkRelationDTO> getHmClerkByHmId(BasePageInfo basePageInfo, Long hmId) {
Page<HmClerkRelationBO> hmClerkByHmId = hmClerkRelationService.getHmClerkByHmId(basePageInfo, hmId);
return PageUtil.changeToCurrentPage(hmClerkByHmId, HmClerkRelationDTO.class);
}
@Override
public HmClerkRelationDTO getHmClerkByHmIdAndClerkId(Long hmId, String clerkId) {
return EntityUtil.changeEntityNew(HmClerkRelationDTO.class, hmClerkRelationService.queryByHmIdAndClerkId(hmId, clerkId));
}
@Override
public HmClerkRelationDTO getOneHmClerkByHmId(Long hmId) {
HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.getHmClerkByHmId(hmId).get(0);
return EntityUtil.changeEntityNew(HmClerkRelationDTO.class, hmClerkRelationBO);
}
@Override
public HmClerkRelationDTO getOneHmClerkByHmIdAndStaffId(Long hmId, String staffId) {
return EntityUtil.changeEntityNew(HmClerkRelationDTO.class, hmClerkRelationService.getHmClerkByHmIdAndStaffId(hmId, staffId));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmGroupApiServiceImpl.java
......@@ -69,7 +69,7 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
if (StringUtils.equals(DEFAULT_GROUP_NAME, hmGroupDTO.getGroupName())) {
return ServiceResponse.failure(HaoBanErrCodeCommon.ERR_9.getCode() + "", "分组名称不能重复");
}
List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getEnterpriseId(), hmGroupDTO.getGroupName());
List<HmGroupSettingBO> groupSettingBos = groupService.queryGroupSettingByName(hmGroupDTO.getWxEnterpriseId(), hmGroupDTO.getEnterpriseId(), hmGroupDTO.getGroupName());
if (hmGroupDTO.getGroupId() == null) {
// insert
// check groupName unique
......@@ -240,8 +240,8 @@ public class HmGroupApiServiceImpl implements HmGroupApiService {
* @return
*/
@Override
public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String enterpriseId, String groupName) {
List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(enterpriseId, groupName);
public ServiceResponse<List<HmGroupDTO>> queryGroupListByName(String wxEnterpriseId, String enterpriseId, String groupName) {
List<HmGroupSettingBO> hmGroupSettingBos = groupService.queryGroupSettingByName(wxEnterpriseId, enterpriseId, groupName);
return ServiceResponse.success(EntityUtil.changeEntityListByOrika(HmGroupDTO.class, hmGroupSettingBos));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmWelcomeRelationApiServiceImpl.java
......@@ -7,13 +7,18 @@ import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
/**
* @Author MUSI
* @Date 2022/7/4 10:52 AM
......@@ -39,12 +44,22 @@ public class HmWelcomeRelationApiServiceImpl implements HmWelcomeRelationApiServ
}
WelcomeRelationQO welcomeRelationQo = new WelcomeRelationQO();
welcomeRelationQo.setWelcomeId(queryWelcomeRelationQdto.getWelcomeId());
welcomeRelationQo.setStatus(WelcomeRelationStatusEnum.ENABLE.getCode());
welcomeRelationQo.setStatusList(Arrays.asList(WelcomeRelationStatusEnum.ENABLE.getCode(), WelcomeRelationStatusEnum.DEPRECATED.getCode()));
welcomeRelationQo.setSearchContent(queryWelcomeRelationQdto.getSearchContent());
welcomeRelationQo.setPageNum(queryWelcomeRelationQdto.getPageNum());
welcomeRelationQo.setPageSize(queryWelcomeRelationQdto.getPageSize());
Page<HmWelcomeRelationBO> welcomeRelationPage = welcomeRelationService.queryWelcomeRelationPage(welcomeRelationQo);
Page<HmWelcomeRelationDTO> welcomeRelationDTOPage = PageUtil.changeToCurrentPage(welcomeRelationPage, HmWelcomeRelationDTO.class);
List<HmWelcomeRelationDTO> result = welcomeRelationDTOPage.getResult();
if (!CollectionUtils.isEmpty(result)){
for (HmWelcomeRelationDTO welcomeRelationBO : result) {
if (HmWelcomeReferType.LINK.getCode().equals(welcomeRelationBO.getType())){
// 链接状态不展示
welcomeRelationBO.setStatus(null);
}
}
}
welcomeRelationDTOPage.setResult(result);
return ServiceResponse.success(welcomeRelationDTOPage);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java
......@@ -74,7 +74,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
return;
}
BinlogBasePojo pojo = binlogChange(record.value());
logger.info("binlog数据：{}", JSONObject.toJSONString(pojo));
logger.info("binlog数据接收：{}", JSONObject.toJSONString(pojo));
if (pojo == null) {
logger.error("binlog数据为空");
return;
......@@ -87,6 +87,9 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
//门店
dealStore((StoreSyncPojo) pojo);
}
else if (record.value().getTableName().equals(CLERK)) {
logger.info("导购binlog无需监听");
}
}
private void dealClerk(ClerkSyncPojo syncPojo) {
......@@ -204,6 +207,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
logger.error("门店处理为空");
return;
}
logger.info("门店binlog监听:{}", JSONObject.toJSONString(syncPojo));
if (syncPojo.getRecordType() == GicRecordType.UPDATE.value()
&& (!syncPojo.getStoreName().equals(syncPojo.getOldStoreName()))) {
logger.info("门店名称变更:{}", JSONObject.toJSONString(syncPojo));
......@@ -244,6 +248,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
* @param syncPojo
*/
private void dealStoreGroup(GroupSyncPojo syncPojo) {
logger.info("门店分组变更binlog监听:{}", JSONObject.toJSONString(syncPojo));
//删除 同步绑定门店
if (syncPojo!= null && syncPojo.getOldStatus() == 1 && syncPojo.getStatus() == 0) {
logger.info("门店分组变更，同步绑定门店：{}", JSONObject.toJSONString(syncPojo));
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/QywxDeptSyncOperation.java
......@@ -175,10 +175,10 @@ public class QywxDeptSyncOperation implements BaseSyncOperation {
WxEnterpriseQwDTO wxInfo = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
if(wxInfo.getWxSecurityType()==4) {
list = this.qywxUserApiService.listDepartmentUser(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), dataId, 1) ;
logger.info("通讯录(第三方)={}",JSON.toJSONString(list)) ;
logger.info("从(第三方)获取通讯录={}",JSON.toJSONString(list)) ;
}else {
list = this.qywxUserApiService.listSelfDepartmentUser(wxEnterpriseDTO.getCorpid(), secretSetting.getSecretVal(), dataId, 1);
logger.info("通讯录(代开)={}",JSON.toJSONString(list)) ;
logger.info("从(代开)获取通讯录={}",JSON.toJSONString(list)) ;
}
if (null == list) {
logger.info("微信获取部门成员异常：{},{}", taskId, dataId);
......
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
......@@ -127,7 +127,10 @@
<dubbo:service interface="com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService" ref="haobanQywxFeeApiService"
timeout="10000"/>
<dubbo:service interface="com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService"
ref="hmClerkRelationApiService" timeout="10000" />
<dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="gicDepartmentService"/>
<dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxDepartmentApiService"
id="qywxDepartmentApiService"/>
......@@ -184,7 +187,6 @@
<dubbo:reference id="storeWidgetService"
interface="com.gic.enterprise.api.service.StoreWidgetService" timeout="10000"
retries="0" check="false"/>
<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
<dubbo:reference id="memberTagOpenApiService" interface="com.gic.member.tag.api.service.MemberTagOpenApiService" timeout="10000" retries="0" check="false"/>
<dubbo:reference id="memberClerkApiService" interface="com.gic.member.api.service.MemberClerkApiService" timeout="10000" retries="0" check="false"/>
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanWelcomeTemplateRelationMapper.xml
......@@ -180,6 +180,12 @@
<if test="searchContent != null and searchContent != ''">
and (refer_code = #{searchContent} or refer_name like CONCAT('%', #{searchContent}, '%') )
</if>
<if test="statusList != null and statusList.size > 0">
and `status` in
<foreach collection="statusList" item="status" open="(" close=")" separator=",">
#{status}
</foreach>
</if>
</where>
</select>
......
haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml
......@@ -499,4 +499,16 @@
where wx_enterprise_id = #{wxEnterpriseId}
</update>
<select id="listAllWxEnterprise" resultType="com.gic.haoban.manage.api.dto.WxEnterpriseDTO" >
select
a.wx_enterprise_id wxEnterpriseId,
a.corpid corpid,
a.corp_name corpName,
b.enterprise_id enterpriseId
from tab_haoban_wx_enterprise a
join tab_haoban_wx_enterprise_related b on a.wx_enterprise_id = b.wx_enterprise_id
where a.status_flag = 1 and b.status_flag = 1
group by a.wx_enterprise_id
</select>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmGroupSettingMapper.xml
......@@ -210,6 +210,7 @@
from tab_haoban_hm_group_setting
where group_name = #{groupName}
and enterprise_id = #{enterpriseId}
and wx_enterprise_id = #{wxEnterpriseId}
and `status` = 1
</select>
</mapper>
\ No newline at end of file
haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmQrcodeMapper.xml
......@@ -177,13 +177,13 @@
<if test="updateTime != null">
update_time = #{updateTime},
</if>
<if test="memberLabelId != null and memberLabelId != ''">
<if test="memberLabelId != null">
member_label_id = #{memberLabelId},
</if>
<if test="passFlag != null">
pass_flag = #{passFlag},
</if>
<if test="welcomeId != null and welcomeId != ''">
<if test="welcomeId != null">
welcome_id = #{welcomeId},
</if>
<if test="statusFlag != null">
......@@ -311,7 +311,6 @@
from tab_haoban_hm_qrcode
where clerk_id = #{clerkId} and status_flag = 1
and wx_enterprise_id = #{wxEnterpriseId}
and over_flag = #{overFlag}
<if test="hmType != null">
and hm_type = #{hmType}
</if>
......
haoban-manage3-service/src/test/java/HmPageServiceTest.java
......@@ -129,7 +129,7 @@ public class HmPageServiceTest {
@Test
public void welcomeTest(){
QueryWelcomeRelationQDTO qdto = new QueryWelcomeRelationQDTO();
qdto.setWelcomeId("04af9e55515d4352be0b2a3119005ce9");
qdto.setWelcomeId("7f12bdab4fb543e8977f96e30fc8eddb");
//qdto.setSearchContent("测试");
ServiceResponse<Page<HmWelcomeRelationDTO>> serviceResponse = welcomeRelationApiService.queryWelcomeRelation(qdto);
System.out.println(JSON.toJSONString(serviceResponse));
......@@ -137,7 +137,7 @@ public class HmPageServiceTest {
@Test
public void groupNameCheckTest(){
ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("ff8080815dacd3a2015dacd3ef5c0000", "测试006");
ServiceResponse<List<HmGroupDTO>> ms = groupService.queryGroupListByName("", "ff8080815dacd3a2015dacd3ef5c0000", "测试006");
System.out.println(JSON.toJSONString(ms));
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java
......@@ -139,6 +139,7 @@ public class WelcomeController extends WebBaseController {
ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
if (!response.isSuccess()){
GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure(response.getCode(), response.getMessage());
}
return RestResponse.successResult(response.getResult());
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmGroupController.java
......@@ -143,7 +143,7 @@ public class HmGroupController extends WebBaseController {
if (StringUtils.isBlank(groupSettingVO.getGroupName())){
return RestResponse.successResult(Collections.emptyList());
}
ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(loginUser.getEnterpriseId(), groupSettingVO.getGroupName());
ServiceResponse<List<HmGroupDTO>> serviceResponse = groupApiService.queryGroupListByName(loginUser.getWxEnterpriseId(), loginUser.getEnterpriseId(), groupSettingVO.getGroupName());
if (serviceResponse.isSuccess()){
return RestResponse.successResult(serviceResponse.getResult());
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java
......@@ -17,6 +17,7 @@ import com.gic.haoban.manage.api.dto.qdto.hm.WxUserAddLogSearchQDTO;
import com.gic.haoban.manage.api.dto.statistics.StatisticsDTO;
import com.gic.haoban.manage.api.service.StaffApiService;
import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
import com.gic.haoban.manage.api.service.hm.WxUserAddLogApiService;
......@@ -67,6 +68,9 @@ public class HmQrcodeController {
private StaffClerkRelationApiService staffClerkRelationApiService;
@Autowired
private HmGroupApiService hmGroupApiService;
@Autowired
private HmClerkRelationApiService hmClerkRelationApiService;
/**
* 新增
......@@ -193,7 +197,7 @@ public class HmQrcodeController {
BasePageInfo basePageInfo = new BasePageInfo();
basePageInfo.setPageNum(1);
basePageInfo.setPageSize(1000);
Page<HmClerkRelationDTO> hmClerkByHmId = hmQrcodeApiService.getHmClerkByHmId(basePageInfo, hmId);
Page<HmClerkRelationDTO> hmClerkByHmId = hmClerkRelationApiService.getHmClerkByHmId(basePageInfo, hmId);
List<HmClerkRelationDTO> hmClerkRelationDTOList = hmClerkByHmId.getResult();
if (CollectionUtils.isNotEmpty(hmClerkRelationDTOList)) {
for (HmClerkRelationDTO hmClerkRelationDTO : hmClerkRelationDTOList) {
......@@ -334,7 +338,7 @@ public class HmQrcodeController {
BasePageInfo basePageInfo = new BasePageInfo();
basePageInfo.setPageNum(hmQrcodeDetailQO.getPageNum());
basePageInfo.setPageSize(hmQrcodeDetailQO.getPageSize());
page = hmQrcodeApiService.getHmClerkByHmId(basePageInfo, hmId);
page = hmClerkRelationApiService.getHmClerkByHmId(basePageInfo, hmId);
}
return RestResponse.successResult(page);
}
......
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
......@@ -114,6 +114,9 @@
<dubbo:reference id="hmQrcodeApiService" interface="com.gic.haoban.manage.api.service.hm.HmQrcodeApiService"
timeout="10000" retries="0" check="false" />
<dubbo:reference id="hmClerkRelationApiService" interface="com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService"
timeout="10000" retries="0" check="false" />
<dubbo:reference id="mongoOperationService" interface="com.gic.dsmongo.api.service.MongoOperationService"
timeout="10000" retries="0" check="false"/>
</beans>
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
......@@ -27,7 +27,6 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.dto.StorePhotoDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.EnterpriseUseForbidService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.common.anno.IgnoreLogin;
import com.gic.haoban.common.utils.HaobanResponse;
......@@ -85,8 +84,6 @@ public class StoreController extends WebBaseController {
private StaffApiService staffApiService;
@Autowired
private WxEnterpriseApiService wxEnterpriseApiService;
@Autowired
private EnterpriseUseForbidService enterpriseUseForbidService ;
/**
* 会员小程序-门店列表
......@@ -136,14 +133,14 @@ public class StoreController extends WebBaseController {
map.put(enterprsieId, false) ;
continue;
}
Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, "haoban-3") ;
/* Integer code = this.enterpriseUseForbidService.selectPermissionStatus(enterprsieId, "haoban-3") ;
logger.info("是否停用={},{}",enterprsieId,code);
// 不能用
if(!(code ==0 || code==1)) {
logger.info("该企业过期,{}", staffId, enterprsieId);
map.put(enterprsieId, false) ;
continue;
}
}*/
}
map.put(enterprsieId, true) ;
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
......
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
......@@ -19,7 +19,6 @@
<!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->
<!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService" id="staffDepartmentRelatedApiService"/>
<dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService"/>
<dubbo:reference interface="com.gic.haoban.data.api.service.HaobanDataApiService" id="haobanDataApiService"/>
......
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