Skip to content

H
haoban-manage3.0
Commit 7e84fc10 by xugaojun
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 5d07fe15 7041c016
Showing with 93 additions and 84 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/QywxCorpInfoSimpleDTO.java
......@@ -60,14 +60,19 @@ public class QywxCorpInfoSimpleDTO implements Serializable{
/**
* 权限等级。
1:通讯录基本信息只读
2:通讯录全部信息只读（已废弃）
3:通讯录全部信息读写
4:单个基本信息只读
5:通讯录全部信息只写（已废弃）
* **/
* 1:通讯录基本信息只读
* 2:通讯录全部信息只读（已废弃）
* 3:通讯录全部信息读写
* 4:单个基本信息只读
* 5:通讯录全部信息只写（已废弃）
**/
private Integer level;
/**
* 是否使用代开发，1：是，0：否
*/
private Integer isCustomizedApp;
public Integer getErrcode() {
return errcode;
}
......@@ -219,4 +224,12 @@ public class QywxCorpInfoSimpleDTO implements Serializable{
public void setLevel(Integer level) {
this.level = level;
}
public Integer getIsCustomizedApp() {
return isCustomizedApp;
}
public void setIsCustomizedApp(Integer isCustomizedApp) {
this.isCustomizedApp = isCustomizedApp;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SecretTypeEnum.java
......@@ -4,14 +4,15 @@ package com.gic.haoban.manage.api.enums;
* Created by hua on 2020/6/3.
*/
public enum SecretTypeEnum {
CONTACT_CUSTOMER(1,"顾客联系"),
CONTACT_SECRET(2,"通讯录"),
HAOBAN_HELP(3,"好办助手"),
MEMBER_WAPP(4,"会员小程序");
CONTACT_CUSTOMER(1, "顾客联系"),
CONTACT_SECRET(2, "通讯录"),
HAOBAN_HELP(3, "好办助手"),
MEMBER_WAPP(4, "会员小程序"),
CUSTOMIZED_APP(5, "自建代开发");
private int val;
private String name;
SecretTypeEnum(int val,String name) {
SecretTypeEnum(int val, String name) {
this.val = val;
this.name = name;
}
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MessageApiService.java
......@@ -20,6 +20,7 @@ public interface MessageApiService {
*
* @param qywxCallBackDTO
*/
@Deprecated
void wxMessageReceive(QywxCallBackDTO qywxCallBackDTO);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
package com.gic.haoban.manage.api.service;
import java.util.List;
import java.util.Set;
import com.gic.haoban.base.api.common.BasePageInfo;
import com.gic.haoban.manage.api.dto.*;
import java.util.List;
import java.util.Set;
public interface WxEnterpriseApiService {
/**
* 接收企业回调信息
* 好办接收企业微信回调信息
*
* @param dto
*/
void callbackReviceEnterprise(QywxCorpInfoSimpleDTO dto);
......@@ -40,19 +41,21 @@ public interface WxEnterpriseApiService {
/**
* 获取配置
*
* @param wxEnterpriseId
* @param secretType
* @param enterpriseId
* @return
*/
public SecretSettingDTO getSecretSetting(String wxEnterpriseId,int secretType,String enterpriseId);
SecretSettingDTO getSecretSetting(String wxEnterpriseId, int secretType, String enterpriseId);
/**
* 保存
*
* @param secretSettingDTO
* @return
*/
public boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
boolean saveSecretSetting(SecretSettingDTO secretSettingDTO);
/**
* secretList
......@@ -66,7 +69,7 @@ public interface WxEnterpriseApiService {
* @param secretId
* @return
*/
public boolean delSecretSetting(String secretId);
boolean delSecretSetting(String secretId);
/**
* 保存小程序配置
......@@ -74,7 +77,7 @@ public interface WxEnterpriseApiService {
* @param miniprogramSettingDTO
* @return
*/
public boolean saveMiniprogramSetting(MiniprogramSettingDTO miniprogramSettingDTO);
boolean saveMiniprogramSetting(MiniprogramSettingDTO miniprogramSettingDTO);
/**
......@@ -83,7 +86,7 @@ public interface WxEnterpriseApiService {
* @param wxEnterpriseId
* @return
*/
public List<MiniprogramSettingDTO> listMiniprogramSetting(String wxEnterpriseId);
List<MiniprogramSettingDTO> listMiniprogramSetting(String wxEnterpriseId);
/**
* 获取单个小程序配置
......@@ -92,30 +95,30 @@ public interface WxEnterpriseApiService {
* @param enterpriseId
* @return
*/
public MiniprogramSettingDTO getMiniprogramSettingByEid(String wxEnterpriseId, String enterpriseId);
MiniprogramSettingDTO getMiniprogramSettingByEid(String wxEnterpriseId, String enterpriseId);
/**
* 获取单个小程序配置
*
* @param wxEnterpriseId
* @param appId
* @return
*/
public MiniprogramSettingDTO getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
/**
* 获取单个小程序配置
*
* @param wxEnterpriseId
* @param appId
* @return
*/
MiniprogramSettingDTO getMiniprogramSettingByAppId(String wxEnterpriseId, String appId);
/**
* 删除 小程序配置
*
* @return
*/
public boolean delMiniprogramSettingByEid(String id);
boolean delMiniprogramSettingByEid(String id);
/**
* @param dto
* @return
*/
public boolean saveWelcome(WelcomeDTO dto);
boolean saveWelcome(WelcomeDTO dto);
/**
* 获取欢迎语
......@@ -123,7 +126,7 @@ public interface WxEnterpriseApiService {
* @param wxEnterpriseId
* @return
*/
public WelcomeDTO getWelcome(String wxEnterpriseId);
WelcomeDTO getWelcome(String wxEnterpriseId);
/**
* 获取欢迎语
......@@ -131,7 +134,7 @@ public interface WxEnterpriseApiService {
* @param wxEnterpriseId
* @return
*/
public boolean setWelcome(String wxEnterpriseId, Integer openFlag);
boolean setWelcome(String wxEnterpriseId, Integer openFlag);
/**
* 获取欢迎语
......@@ -139,5 +142,5 @@ public interface WxEnterpriseApiService {
* @param wxEnterpriseId
* @return
*/
public boolean delWelcome(String wxEnterpriseId);
boolean delWelcome(String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/SecretSettingMapper.java
package com.gic.haoban.manage.service.dao.mapper;
import com.gic.haoban.manage.api.dto.SecretSettingDTO;
import com.gic.haoban.manage.service.entity.TabSecretSetting;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import retrofit2.http.PATCH;
import java.util.List;
......@@ -43,10 +41,13 @@ public interface SecretSettingMapper {
/**
* 获取配置
*
* @param wxEnterpriseId
* @param secretType
* @return
*/
TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("secretType") int secretType, @Param("enterpriseId") String enterpriseId);
TabSecretSetting getSecretSetting(@Param("wxEnterpriseId") String wxEnterpriseId,
@Param("secretType") int secretType,
@Param("enterpriseId") String enterpriseId);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanWxApplication.java
......@@ -4,6 +4,9 @@ import java.io.Serializable;
import java.util.Date;
public class TabHaobanWxApplication implements Serializable {
private static final long serialVersionUID = 1L;
private String wxApplicationId;
private String siteId;
......@@ -26,7 +29,10 @@ public class TabHaobanWxApplication implements Serializable {
private Date updateTime;
private static final long serialVersionUID = 1L;
/**
* 是否使用代开发，1：是，0：否
*/
private Integer isCustomizedApp;
public String getWxApplicationId() {
return wxApplicationId;
......@@ -115,4 +121,12 @@ public class TabHaobanWxApplication implements Serializable {
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getIsCustomizedApp() {
return isCustomizedApp;
}
public void setIsCustomizedApp(Integer isCustomizedApp) {
this.isCustomizedApp = isCustomizedApp;
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/SecretSettingServiceImpl.java
......@@ -23,23 +23,23 @@ import java.util.List;
@Service
public class SecretSettingServiceImpl implements SecretSettingService {
private static final Logger logger= LoggerFactory.getLogger(SecretSettingServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(SecretSettingServiceImpl.class);
@Autowired
private SecretSettingMapper secretSettingMapper;
@Override
public boolean saveSecretSetting(SecretSettingDTO secretSetting) {
if (secretSetting.getSecretId()!=null) {
if (secretSetting.getSecretId() != null) {
secretSetting.setUpdateTime(new Date());
secretSettingMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting));
secretSettingMapper.updateByPrimaryKeySelective(EntityUtil.changeEntityByJSON(TabSecretSetting.class, secretSetting));
return true;
}else{
} else {
secretSetting.setSecretId(ToolUtil.randomUUID());
secretSetting.setCreateTime(new Date());
secretSetting.setUpdateTime(new Date());
secretSetting.setStatusFlag(1);
secretSettingMapper.insert(EntityUtil.changeEntityByJSON(TabSecretSetting.class,secretSetting));
secretSettingMapper.insert(EntityUtil.changeEntityByJSON(TabSecretSetting.class, secretSetting));
return true;
}
}
......@@ -51,13 +51,13 @@ public class SecretSettingServiceImpl implements SecretSettingService {
tabSecretSetting.setStatusFlag(0);
tabSecretSetting.setUpdateTime(new Date());
int i = secretSettingMapper.updateByPrimaryKeySelective(tabSecretSetting);
return i>0;
return i > 0;
}
@Override
public List<SecretSettingDTO> listSecretSetting(String wxEnterpriseId) {
List<TabSecretSetting> list = secretSettingMapper.listSecretSetting(wxEnterpriseId);
return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class,list);
return EntityUtil.changeEntityListByJSON(SecretSettingDTO.class, list);
}
@Override
......@@ -67,12 +67,12 @@ public class SecretSettingServiceImpl implements SecretSettingService {
return null;
}
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, secretType, null);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
}
@Override
public SecretSettingDTO getMemberSecretSetting(String wxEnterpriseId, String enterpriseId) {
TabSecretSetting secretSetting = secretSettingMapper.getSecretSetting(wxEnterpriseId, SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class,secretSetting);
return EntityUtil.changeEntityByJSON(SecretSettingDTO.class, secretSetting);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -15,7 +15,6 @@ import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.enterprise.api.dto.StoreDTO;
import com.gic.enterprise.api.service.EnterpriseService;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.app.customer.dto.ChildDTO;
import com.gic.haoban.app.customer.dto.CustomerDTO;
......@@ -29,7 +28,9 @@ import com.gic.haoban.base.api.common.ServiceResponse;
import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.*;
import com.gic.haoban.manage.api.enums.SecretTypeEnum;
import com.gic.haoban.manage.api.service.*;
import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
import com.gic.haoban.manage.api.service.MaterialApiService;
import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
import com.gic.haoban.manage.service.config.Config;
import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
import com.gic.haoban.manage.service.dao.mapper.TabHaobanWelcomeMapper;
......@@ -42,10 +43,8 @@ import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.util.EmojiFilterUtil;
import com.gic.member.api.dto.MemberDTO;
import com.gic.member.api.service.MemberOpenCardBusinessService;
import com.gic.member.api.service.MemberService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.redis.data.util.RedisUtil;
import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService;
import com.gic.wechat.api.dto.qywx.*;
import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
import com.gic.wechat.api.service.qywx.QywxUserApiService;
......@@ -63,7 +62,10 @@ import java.util.stream.Collectors;
@Service
public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedApiService {
private static final Logger log = LogManager.getLogger(MemberUnionidRelatedApiServiceImpl.class);
private static final String SELF_APP = "selfSuiteId";
@Autowired
private MemberUnionRelatedService memberUnionRelatedService;
@Autowired
......@@ -71,32 +73,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
@Autowired
private QywxUserApiService qywxUserApiService;
@Autowired
private com.gic.enterprise.api.service.StoreGroupService gicDepartmentService;
@Autowired
private MemberService memberService;
@Autowired
private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@Autowired
private WxEnterpriseService wxEnterpriseService;
private static final String SELF_APP = "selfSuiteId";
@Autowired
private MemberOpenCardBusinessService memberOpenCardBusinessService;
@Autowired
private ClerkService clerkService;
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private MemberUnionidRelatedMapper memberUnionidRelatedMapper;
@Autowired
private StaffDepartmentRelatedService staffDepartmentRelatedService;
@Autowired
private ESDataDynamicOperationApiService eSDataDynamicOperationApiService;
@Autowired
private ClerkMainStoreRelatedService clerkMainStoreRelatedService;
@Autowired
private StoreService storeService;
......@@ -116,10 +105,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
private ExternalClerkRelatedService externalClerkRelatedService;
@Autowired
private PowerService powerService;
@Autowired
private EnterpriseService enterpriseService;
@Autowired
private MiniprogramSettingService miniprogramSettingService;
......@@ -132,9 +117,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
@Autowired
private CustomerApiService customerApiService;
@Autowired
private QywxTagApiService qywxTagApiService;
@Override
public void dealQywxExternalUser(String params) {
log.info("回调：{}", params);
......@@ -202,7 +184,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
memberInfoListParamsDTO.setFilterList(filterList);
boolean flag = customerApiService.checkMemberRangeByMemberId(params, memberInfoListParamsDTO);
MemberStoreDTO dto = new MemberStoreDTO();
dto.setMemberId(tab.getMemberId());
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java
......@@ -6,7 +6,6 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GICMQClientUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.commons.util.GlobalVar;
import com.gic.enterprise.api.service.StoreService;
import com.gic.haoban.app.customer.service.api.service.InnerApiService;
import com.gic.haoban.base.api.common.Constant;
import com.gic.haoban.manage.api.dto.*;
......@@ -19,7 +18,10 @@ import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
import com.gic.haoban.manage.service.entity.TabHaobanStaff;
import com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated;
import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
import com.gic.haoban.manage.service.service.*;
import com.gic.haoban.manage.service.service.DepartmentService;
import com.gic.haoban.manage.service.service.StaffDepartmentRelatedService;
import com.gic.haoban.manage.service.service.StaffService;
import com.gic.haoban.manage.service.service.WxEnterpriseService;
import com.gic.mq.sdk.GicMQClient;
import com.gic.thirdparty.api.dto.PicUploadResDTO;
import com.gic.thirdparty.api.service.QQCloudPicService;
......@@ -48,12 +50,10 @@ import java.util.Map;
@Service("messageApiService")
public class MessageApiServiceImpl implements MessageApiService {
private static final Logger log = LogManager.getLogger(MessageApiServiceImpl.class);
private final String CONTACT_APP = "contactSuiteId";
@Autowired
private DepartmentService departmentService;
@Autowired
private WxEnterpriseRelatedService wxEnterpriseRelatedService;
@Autowired
private DepartmentApiService departmentApiService;
@Autowired
private WxEnterpriseService enterpriseService;
......@@ -64,8 +64,6 @@ public class MessageApiServiceImpl implements MessageApiService {
@Autowired
private StaffApiService staffApiService;
@Autowired
private WxApplicationService wxApplicationService;
@Autowired
private Config config;
@Autowired
private QywxDepartmentApiService qywxDepartmentApiService;
......@@ -76,11 +74,6 @@ public class MessageApiServiceImpl implements MessageApiService {
@Autowired
private InnerApiService innerApiService;
private final String CONTACT_APP = "contactSuiteId";
@Autowired
private StoreService storeService;
@Autowired
private StaffClerkRelationApiService staffClerkRelationApiService;
......
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