Skip to content

H
haoban-manage3.0
Commit d88c24f5 by jinxin
Options

无效接口删除

parent 020a59c3
Showing with 525 additions and 493 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/CheckQywxSettingApiService.java
......@@ -16,7 +16,8 @@ public interface CheckQywxSettingApiService {
* @param wxEnterpriseId
* @param name
*/
void setFriendSetting(String wxEnterpriseId, String name);
//无效接口
// void setFriendSetting(String wxEnterpriseId, String name);
/**
* 获取设置的好友流程
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
......@@ -34,7 +34,8 @@ public interface DepartmentApiService {
* @param wxEnterpriseId
* @return
*/
List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
//无效接口
// List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
/**
* 查wxEnterprise下所有门店(溢出门店)
......@@ -137,10 +138,11 @@ public interface DepartmentApiService {
* @param
* @return
*/
ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
boolean isInitLocked(String wxEnterpriseId);
//无效接口
// ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String wxUserId);
//
//
// boolean isInitLocked(String wxEnterpriseId);
void syncWxDepartmentByParentMQ(String res);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ExternalClerkRelatedApiService.java
......@@ -93,7 +93,8 @@ public interface ExternalClerkRelatedApiService {
* @param enterpriseId
* @return
*/
ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
//无效接口
// ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid);
/**
* 获取企业下的关联关系列表
......@@ -193,8 +194,9 @@ public interface ExternalClerkRelatedApiService {
boolean isFriends(String memberId, String clerkId, String enterpriseId);
com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriend(String enterpriseId, String staffId, String memberId) ;
com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
//无效接口
// com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
List<String> listMemberAndClerk(List<String> memberIdList , List<String> clerkIdList , String enterpriseId) ;
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
......@@ -224,7 +224,8 @@ public interface MemberUnionidRelatedApiService {
* @author mozhu
* @date 2022-09-09 14:18:34
*/
void addDelFriendEventTest(String param);
//无效接口
// void addDelFriendEventTest(String param);
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QwFriendApiService.java
......@@ -68,8 +68,9 @@ public interface QwFriendApiService {
* @return
* @throws
*/
public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
List<String> externalUserIdList);
//无效接口
// public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
// List<String> externalUserIdList);
/**
*
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxErrorLogApiService.java
......@@ -29,7 +29,8 @@ public interface QywxErrorLogApiService {
* @param id 主键
* @return 实例对象
*/
QywxErrorLogDTO queryById(Long id);
//无效接口
// QywxErrorLogDTO queryById(Long id);
/**
* 查询分页列表
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QywxTagApiService.java
......@@ -138,7 +138,8 @@ public interface QywxTagApiService {
* @param relationId
* @return
*/
public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId);
//无效接口
// public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
......@@ -66,9 +66,10 @@ public interface StaffApiService {
*/
StaffDTO getByUserIdAndReflushWhenNoPhone(String userId, String wxEnterpriseId);
StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
//无效接口
// StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId);
StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
// StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code);
void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId);
......@@ -147,7 +148,8 @@ public interface StaffApiService {
* @author : YongEn
* @date : 2022/3/23
*/
List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId);
//无效接口
// List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId);
/**
......@@ -159,7 +161,8 @@ public interface StaffApiService {
* @author mozhu
* @date 2021-12-21 17:23:36
*/
List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
//无效接口
// List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
/**
......@@ -191,7 +194,8 @@ public interface StaffApiService {
* @param qrCode 二维码
* @return int
*/
int updateQrCodeByStaffId(String staffId, String qrCode);
//无效接口
// int updateQrCodeByStaffId(String staffId, String qrCode);
/**
......@@ -249,7 +253,8 @@ public interface StaffApiService {
* @author mozhu
* @date 2022-05-27 09:43:00
*/
boolean isSuperAdmin(String clerkId);
//无效接口
// boolean isSuperAdmin(String clerkId);
/**
......@@ -261,7 +266,8 @@ public interface StaffApiService {
* @author mozhu
* @date 2022-05-30 11:46:08
*/
List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId);
//无效接口
// List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java
......@@ -65,7 +65,8 @@ public interface StaffClerkRelationApiService {
* @param staffId
* @param channelCode
*/
void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode);
//无效接口
// void delBindByStoreId(String wxEnterpriseId,String storeId, String staffId,int channelCode);
StaffClerkRelationDTO getOneByClerkId(String clerkId);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/SyncHaobanToGicApiService.java
......@@ -13,7 +13,8 @@ public interface SyncHaobanToGicApiService {
* @param gicClerkId
* @param name
*/
public void updateGicClerk(String gicClerkId,String name);
//无效接口
// public void updateGicClerk(String gicClerkId,String name);
/**
* 判断gicClerk是否能新增
......@@ -23,7 +24,7 @@ public interface SyncHaobanToGicApiService {
* @param gicStoreId
* @return
*/
public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
// public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId);
/**
*
......@@ -34,7 +35,7 @@ public interface SyncHaobanToGicApiService {
* @param memberChangeReason 1会员自行转移2后台手动选择3企业转移会员4店员删除5订单操作6开卡扫描二维码7企业号认领8企业号分配9app转岗移除
* @param operId
*/
public boolean gicClerkMove(String gicClerkId,String gicOldStoreId,String gicNewStoreId,int clerkChangeReason,int memberChangeReason,String operId);
// public boolean gicClerkMove(String gicClerkId,String gicOldStoreId,String gicNewStoreId,int clerkChangeReason,int memberChangeReason,String operId);
/**
......@@ -44,7 +45,7 @@ public interface SyncHaobanToGicApiService {
* @param gicClerkId
* @return
*/
public boolean setStoreManager(String gicEnterpriseId,String gicStoreId,String gicClerkId);
// public boolean setStoreManager(String gicEnterpriseId,String gicStoreId,String gicClerkId);
boolean syncClerkToGicClerkAdd(String storeId, String clerkCode, Integer sex, String name, String phoneNumber,
String nationCode, String postionName);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/ValidationCodeApiService.java
......@@ -13,7 +13,8 @@ public interface ValidationCodeApiService {
* @param phoneNumber
* @param code
*/
int smsValidationCode(String phoneNumber, String code);
//接口无效
// int smsValidationCode(String phoneNumber, String code);
/**
* 短信验证码
......@@ -22,7 +23,7 @@ public interface ValidationCodeApiService {
* @param phoneNumber
* @param code
*/
int smsValidationCode(String nationCode,String phoneNumber, String code);
// int smsValidationCode(String nationCode,String phoneNumber, String code);
SendSmsResponse sendValidationCode(String nationCode, String phoneNumber, String code);
......@@ -33,7 +34,8 @@ public interface ValidationCodeApiService {
* @param code
* @return
*/
int verifyValidationCode(String phoneNumber, String code);
//接口无效
// int verifyValidationCode(String phoneNumber, String code);
/**
*
......@@ -43,7 +45,7 @@ public interface ValidationCodeApiService {
* @param unReadCount
* @return
*/
int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
// int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unReadPeople,String unReadCount,String enterpriseId);
/**
* 发送验证码
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java
......@@ -152,7 +152,8 @@ public interface WxEnterpriseApiService {
* @param wxEnterpriseId
* @return
*/
WelcomeDTO getWelcome(String wxEnterpriseId);
//接口无效
// WelcomeDTO getWelcome(String wxEnterpriseId);
/**
* 获取欢迎语
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java
......@@ -23,7 +23,8 @@ public interface WxEnterpriseRelatedApiService {
List<EnterpriseDetailDTO> listEnterpriseByWxEnterpriseId(String wxEnterpriseId , String phoneNumber ,boolean filterFlag);
String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
//接口无效
// String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId);
boolean enterpriseUseNew(String enterpriseId);
......@@ -35,7 +36,8 @@ public interface WxEnterpriseRelatedApiService {
* 返回在一定时期内的信息
* @return
*/
List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime);
//接口无效
// List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime);
/**
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmLinkApiService.java
......@@ -39,7 +39,8 @@ public interface HmLinkApiService {
public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
Integer linkType);
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
//无效接口
// public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo);
public ServiceResponse<String> save(HmLinkDTO dto);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/PendingTaskApiService.java
......@@ -91,7 +91,8 @@ public interface PendingTaskApiService {
* @param relationId
* @return
*/
public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId);
//无效接口
// public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId);
/**
......@@ -109,7 +110,8 @@ public interface PendingTaskApiService {
* @param endTime
* @return
*/
public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
//无效接口
// public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime);
/**
* 更新失效或者结束时间 活动任务
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java
......@@ -27,7 +27,8 @@ public interface HaobanMenuApiService {
*
* @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
*/
ServiceResponse<List<String>> getAllMenuCodeList();
//无效接口
// ServiceResponse<List<String>> getAllMenuCodeList();
ServiceResponse<List<HaobanMenuDTO>> getAllMenuList();
......@@ -60,9 +61,10 @@ public interface HaobanMenuApiService {
* @param clerkType 职员类型
* @return {@link ServiceResponse}<{@link List}<{@link HaobanMenuDTO}>>
*/
ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
//无效接口
// ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType);
ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode);
// ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode);
ServiceResponse<String> getMenuNameByCode(String menuCode);
......
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java
......@@ -72,5 +72,6 @@ public interface HaobanRoleApiService {
* @author mozhu
* @date 2022-10-09 14:16:12
*/
ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId,Integer clerkType,Integer systemFlag);
//无效接口
// ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId,Integer clerkType,Integer systemFlag);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java
......@@ -41,7 +41,7 @@ public interface DepartmentMapper {
Page<TabHaobanDepartment> pageDepartmentByParams(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("keyword")String keyword,
@Param("storeFlag")Integer storeFlag, @Param("recycleFlag")Integer recycleFlag);
List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
// List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/QywxTagRelationMapper.java
......@@ -22,7 +22,7 @@ public interface QywxTagRelationMapper {
/**
*/
TabQywxTagRelation selectByPrimaryKey(String qywxTagRelationId);
// TabQywxTagRelation selectByPrimaryKey(String qywxTagRelationId);
/**
*/
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffDepartmentRelatedMapper.java
......@@ -23,9 +23,9 @@ public interface StaffDepartmentRelatedMapper {
int delByStaffid(@Param("staffId") String staffId);
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
// TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(@Param("departmentId")String departmentId, @Param("staffId")String staffId);
TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
// TabHaobanStaffDepartmentRelated getDepartmentIdAndCode(@Param("departmentId")String departmentId, @Param("clerkCode")String code);
int countByDepartmentIds(@Param("departmentIds")List<String> departmentIds);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java
......@@ -90,9 +90,9 @@ public interface TabHaobanExternalClerkRelatedMapper {
* @param unionId
* @return
*/
TabHaobanExternalClerkRelated getClerkExternalByUnionId(@Param("enterpriseId") String enterpriseId,
@Param("clerkId") String clerkId,
@Param("unionId") String unionId);
// TabHaobanExternalClerkRelated getClerkExternalByUnionId(@Param("enterpriseId") String enterpriseId,
// @Param("clerkId") String clerkId,
// @Param("unionId") String unionId);
/**
* @param relationKey
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabQywxErrorLogMapper.java
......@@ -49,7 +49,7 @@ public interface TabQywxErrorLogMapper {
* @param id 主键
* @return 实例对象
*/
TabQywxErrorLog queryById(Long id);
// TabQywxErrorLog queryById(Long id);
/**
* 分页列表
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/WxEnterpriseRelatedMapper.java
......@@ -28,7 +28,7 @@ public interface WxEnterpriseRelatedMapper {
List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(@Param("enterpriseIds")List<String> enterpriseIds);
List<TabHaobanWxEnterpriseRelated> listEnterpriseByTime(@Param("time")String time);
// List<TabHaobanWxEnterpriseRelated> listEnterpriseByTime(@Param("time")String time);
/**
* 查询企业下唯一商户
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
......@@ -45,7 +45,7 @@ public interface TabHaobanMenuMapper {
List<TabHaobanMenu> getAllMenuList();
List<String> getAllMenuCodeList();
// List<String> getAllMenuCodeList();
List<TabHaobanMenu> getPidMenuList();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxErrorLogService.java
......@@ -30,7 +30,8 @@ public interface QywxErrorLogService {
* @param id 主键
* @return 实例对象
*/
TabQywxErrorLogBO queryById(Long id);
//无效接口
// TabQywxErrorLogBO queryById(Long id);
/**
* 查询分页列表
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/QywxTagService.java
......@@ -101,7 +101,8 @@ public interface QywxTagService {
* @param relationId
* @return
*/
public TabQywxTagRelation getQywxTagRelationById(String relationId);
//无效接口
// public TabQywxTagRelation getQywxTagRelationById(String relationId);
/**
* 根据id 查询
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffDepartmentRelatedService.java
......@@ -20,7 +20,7 @@ public interface StaffDepartmentRelatedService {
void delByStaffid(String userid);
TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
// TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId);
StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId);
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxTagServiceImpl.java
......@@ -156,10 +156,10 @@ public class QywxTagServiceImpl implements QywxTagService {
return true;
}
@Override
public TabQywxTagRelation getQywxTagRelationById(String relationId) {
return qywxTagRelationMapper.selectByPrimaryKey(relationId);
}
// @Override
// public TabQywxTagRelation getQywxTagRelationById(String relationId) {
// return qywxTagRelationMapper.selectByPrimaryKey(relationId);
// }
@Override
public boolean delQywxTag(String groupKey, String wxEnterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffDepartmentRelatedServiceImpl.java
......@@ -100,10 +100,10 @@ public class StaffDepartmentRelatedServiceImpl implements StaffDepartmentRelated
mapper.delByStaffid(staffid);
}
@Override
public TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId) {
return mapper.getDepartmentIdAndStaffId(departmentId,staffId);
}
// @Override
// public TabHaobanStaffDepartmentRelated getDepartmentIdAndStaffId(String departmentId, String staffId) {
// return mapper.getDepartmentIdAndStaffId(departmentId,staffId);
// }
@Override
public StaffDepartmentRelatedDTO getById(String staffDepartmentStaffRelatedId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/TabQywxErrorLogServiceImpl.java
......@@ -55,11 +55,11 @@ public class TabQywxErrorLogServiceImpl implements QywxErrorLogService {
return tabQywxErrorLogBO;
}
@Override
public TabQywxErrorLogBO queryById(Long id) {
TabQywxErrorLog tabQywxErrorLog = this.tabQywxErrorLogMapper.queryById(id);
return EntityUtil.changeEntityByOrika(TabQywxErrorLogBO.class, tabQywxErrorLog);
}
// @Override
// public TabQywxErrorLogBO queryById(Long id) {
// TabQywxErrorLog tabQywxErrorLog = this.tabQywxErrorLogMapper.queryById(id);
// return EntityUtil.changeEntityByOrika(TabQywxErrorLogBO.class, tabQywxErrorLog);
// }
@Override
public List<TabQywxErrorLog> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java
......@@ -168,16 +168,16 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
return ServiceResponse.success(b);
}
@Override
public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId) {
if (StringUtils.isBlank(relationId)) {
return ServiceResponse.success();
}
List<String> relationIds = new ArrayList<String>();
relationIds.add(relationId);
boolean b = pendingTaskService.deletePendingTask(relationIds);
return ServiceResponse.success(b);
}
// @Override
// public ServiceResponse<Boolean> deletePendingTaskByRelationId(String relationId) {
// if (StringUtils.isBlank(relationId)) {
// return ServiceResponse.success();
// }
// List<String> relationIds = new ArrayList<String>();
// relationIds.add(relationId);
// boolean b = pendingTaskService.deletePendingTask(relationIds);
// return ServiceResponse.success(b);
// }
@Override
public ServiceResponse<Boolean> deletePendingTaskByBusinessId(String businessId) {
......@@ -185,14 +185,14 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
return ServiceResponse.success(true);
}
@Override
public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime) {
PendingTaskBO pendingTaskBO = new PendingTaskBO();
pendingTaskBO.setRelationId(relationId);
pendingTaskBO.setInvalidTime(endTime);
boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
return ServiceResponse.success(b);
}
// @Override
// public ServiceResponse<Boolean> updateInvalidTime(String relationId, Date endTime) {
// PendingTaskBO pendingTaskBO = new PendingTaskBO();
// pendingTaskBO.setRelationId(relationId);
// pendingTaskBO.setInvalidTime(endTime);
// boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
// return ServiceResponse.success(b);
// }
@Override
public ServiceResponse<Boolean> updateInvalidTimeByBusinessId(String businessId, Date endTime) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java
......@@ -52,16 +52,16 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
@Autowired
private EnterpriseService enterpriseService;
@Override
public void setFriendSetting(String wxEnterpriseId, String name) {
CheckFriendSettingDTO checkFriendSettingDTO = new CheckFriendSettingDTO();
checkFriendSettingDTO.setName(name);
checkFriendSettingDTO.setWxEnterpriseId(wxEnterpriseId);
RedisUtil.setCache(FRIEND_SETTING_KEY, checkFriendSettingDTO);
RedissonClient redisClient = RedisUtil.getRedisClient();
RMap<Object, Object> map = redisClient.getMap(FRIEND_SETTING_VAL_KEY);
map.delete();
}
// @Override
// public void setFriendSetting(String wxEnterpriseId, String name) {
// CheckFriendSettingDTO checkFriendSettingDTO = new CheckFriendSettingDTO();
// checkFriendSettingDTO.setName(name);
// checkFriendSettingDTO.setWxEnterpriseId(wxEnterpriseId);
// RedisUtil.setCache(FRIEND_SETTING_KEY, checkFriendSettingDTO);
// RedissonClient redisClient = RedisUtil.getRedisClient();
// RMap<Object, Object> map = redisClient.getMap(FRIEND_SETTING_VAL_KEY);
// map.delete();
// }
@Override
public CheckFriendSettingDTO getFriendSetting() {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
......@@ -161,11 +161,11 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
return departmentService.getRootByEnterpriseId(wxEnterpriseId);
}
@Override
public List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId) {
List<TabHaobanDepartment> list = departmentMapper.listStoreByWxEnterpriseId(wxEnterpriseId);
return EntityUtil.changeEntityListByJSON(DepartmentDTO.class, list);
}
// @Override
// public List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId) {
// List<TabHaobanDepartment> list = departmentMapper.listStoreByWxEnterpriseId(wxEnterpriseId);
// return EntityUtil.changeEntityListByJSON(DepartmentDTO.class, list);
// }
@Override
public Page<DepartmentDTO> pageFullStoreByWxEnterpriseId(
......@@ -293,10 +293,10 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
logger.info("【mq同步】parentId={}", parentId);
}
@Override
public boolean isInitLocked(String wxEnterpriseId) {
return RedisUtil.isLocked("init-enterprise-" + wxEnterpriseId);
}
// @Override
// public boolean isInitLocked(String wxEnterpriseId) {
// return RedisUtil.isLocked("init-enterprise-" + wxEnterpriseId);
// }
private void addAllDepartment(List<com.gic.wechat.api.dto.qywx.DepartmentDTO> list, Integer parentId,
......@@ -402,19 +402,19 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
}
@Override
public ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String staffId) {
ServiceResponse<List<DepartmentDTO>> rer = new ServiceResponse<List<DepartmentDTO>>();
List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffId);
if (CollectionUtils.isEmpty(relateList)) {
logger.info("没有部分显示:{}", staffId);
return rer;
}
List<String> departmentIds = relateList.stream().map(dto -> dto.getDepartmentId()).collect(Collectors.toList());
List<DepartmentDTO> departmentList = listByDepartmentIds(departmentIds, 1);
rer.setResult(departmentList);
return rer;
}
// @Override
// public ServiceResponse<List<DepartmentDTO>> listStoreListByStaffId(String staffId) {
// ServiceResponse<List<DepartmentDTO>> rer = new ServiceResponse<List<DepartmentDTO>>();
// List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffId);
// if (CollectionUtils.isEmpty(relateList)) {
// logger.info("没有部分显示:{}", staffId);
// return rer;
// }
// List<String> departmentIds = relateList.stream().map(dto -> dto.getDepartmentId()).collect(Collectors.toList());
// List<DepartmentDTO> departmentList = listByDepartmentIds(departmentIds, 1);
// rer.setResult(departmentList);
// return rer;
// }
@Override
public Integer totalStoreCountByEnterpriseId(String wxEnterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
......@@ -320,12 +320,12 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
}
}
@Override
public ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid) {
TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getClerkExternalByUnionId(enterpriseId, clerkId, unionid);
ExternalClerkRelatedDTO clerkRelatedDTO = EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated);
return clerkRelatedDTO;
}
// @Override
// public ExternalClerkRelatedDTO getClerkFriendByUnionid(String enterpriseId, String clerkId, String unionid) {
// TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getClerkExternalByUnionId(enterpriseId, clerkId, unionid);
// ExternalClerkRelatedDTO clerkRelatedDTO = EntityUtil.changeEntityNew(ExternalClerkRelatedDTO.class, externalClerkRelated);
// return clerkRelatedDTO;
// }
@Override
public ExternalClerkRelatedDTO getExternalClerkByWxUserIdAncExternalUserId(String wxEnterpriseId, String staffId, String enterpriseId, String externalUserId) {
......@@ -457,15 +457,15 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getStatusFlag() == 1);
}
@Override
public com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId,
String memberId) {
TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
if(null != externalClerkRelated) {
return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getExternalClerkRelatedId());
}
return com.gic.api.base.commons.ServiceResponse.failure("9999", "无好友关系") ;
}
// @Override
// public com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId,
// String memberId) {
// TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
// if(null != externalClerkRelated) {
// return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getExternalClerkRelatedId());
// }
// return com.gic.api.base.commons.ServiceResponse.failure("9999", "无好友关系") ;
// }
@Override
public List<String> listMemberAndClerk(List<String> memberIdList, List<String> clerkIdList, String enterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
......@@ -1775,10 +1775,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
}
@Override
public void addDelFriendEventTest(String param) {
log.info("addDelFriendEventTest：{}", param);
}
// @Override
// public void addDelFriendEventTest(String param) {
// log.info("addDelFriendEventTest：{}", param);
// }
/**
* 获取客户详情列表
*
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QwFriendApiServiceImpl.java
......@@ -181,38 +181,38 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
return ServiceResponse.failure("9999", "企微未查询到数据");
}
@Override
public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
List<String> externalUserIdList) {
if (CollectionUtils.isEmpty(externalUserIdList) || externalUserIdList.size() > 1000) {
return ServiceResponse.failure("9999", "外部联系人不能为空且每次最多1000条");
}
String suiteid = config.getWxSuiteid();
ServiceResponse<WxEnterpriseQwDTO> corpidResp = this.checkAndGetCorpid(enterpriseId,true);
if (!corpidResp.isSuccess()) {
return ServiceResponse.failure(corpidResp.getCode(), corpidResp.getMessage());
}
WxEnterpriseQwDTO qwDTO = corpidResp.getResult();
String corpid = qwDTO.getThirdCorpid();
ServiceResponse<List<PendingIdDTO>> qwResp = this.qywxExternalUserService.externalUseridToPendingId(corpid,
suiteid, externalUserIdList);
log.info("获取pendingid,参数={},返回={}", externalUserIdList, JSON.toJSONString(qwResp));
if (!qwResp.isSuccess()) {
return ServiceResponse.failure(qwResp.getCode(), qwResp.getMessage());
}
List<PendingIdDTO> list = qwResp.getResult();
if (CollectionUtils.isNotEmpty(list)) {
List<QwPendingIdDTO> retList = new ArrayList<>();
for (PendingIdDTO item : list) {
QwPendingIdDTO dto = new QwPendingIdDTO();
dto.setExternalUserId(item.getExternal_userid());
dto.setPendingId(item.getPending_id());
retList.add(dto);
}
return ServiceResponse.success(retList);
}
return ServiceResponse.failure("9999", "企微未查询到数据");
}
// @Override
// public ServiceResponse<List<QwPendingIdDTO>> listPendingIdByExternalid(String enterpriseId,
// List<String> externalUserIdList) {
// if (CollectionUtils.isEmpty(externalUserIdList) || externalUserIdList.size() > 1000) {
// return ServiceResponse.failure("9999", "外部联系人不能为空且每次最多1000条");
// }
// String suiteid = config.getWxSuiteid();
// ServiceResponse<WxEnterpriseQwDTO> corpidResp = this.checkAndGetCorpid(enterpriseId,true);
// if (!corpidResp.isSuccess()) {
// return ServiceResponse.failure(corpidResp.getCode(), corpidResp.getMessage());
// }
// WxEnterpriseQwDTO qwDTO = corpidResp.getResult();
// String corpid = qwDTO.getThirdCorpid();
// ServiceResponse<List<PendingIdDTO>> qwResp = this.qywxExternalUserService.externalUseridToPendingId(corpid,
// suiteid, externalUserIdList);
// log.info("获取pendingid,参数={},返回={}", externalUserIdList, JSON.toJSONString(qwResp));
// if (!qwResp.isSuccess()) {
// return ServiceResponse.failure(qwResp.getCode(), qwResp.getMessage());
// }
// List<PendingIdDTO> list = qwResp.getResult();
// if (CollectionUtils.isNotEmpty(list)) {
// List<QwPendingIdDTO> retList = new ArrayList<>();
// for (PendingIdDTO item : list) {
// QwPendingIdDTO dto = new QwPendingIdDTO();
// dto.setExternalUserId(item.getExternal_userid());
// dto.setPendingId(item.getPending_id());
// retList.add(dto);
// }
// return ServiceResponse.success(retList);
// }
// return ServiceResponse.failure("9999", "企微未查询到数据");
// }
// 2010 不需要处理的
// 判断企业是否能用企微
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxErrorLogApiServiceImpl.java
......@@ -40,10 +40,10 @@ public class QywxErrorLogApiServiceImpl implements QywxErrorLogApiService {
tabQywxErrorLogService.insert(EntityUtil.changeEntityByOrika(TabQywxErrorLogBO.class, qywxErrorLogDTO));
}
@Override
public QywxErrorLogDTO queryById(Long id) {
return EntityUtil.changeEntityByOrika(QywxErrorLogDTO.class, tabQywxErrorLogService.queryById(id));
}
// @Override
// public QywxErrorLogDTO queryById(Long id) {
// return EntityUtil.changeEntityByOrika(QywxErrorLogDTO.class, tabQywxErrorLogService.queryById(id));
// }
@Override
public Page<QywxErrorLogDTO> queryListByPage(QywxErrorLogListQDTO qywxErrorLogListQDTO) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QywxTagApiServiceImpl.java
......@@ -770,11 +770,11 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
return EntityUtil.changeEntityListByJSON(QywxTagRelationDTO.class, tagRelations);
}
@Override
public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId) {
TabQywxTagRelation tagRelation = qywxTagService.getQywxTagRelationById(relationId);
return EntityUtil.changeEntityByJSON(QywxTagRelationDTO.class, tagRelation);
}
// @Override
// public QywxTagRelationDTO getQywxTagRelationByRelationId(String relationId) {
// TabQywxTagRelation tagRelation = qywxTagService.getQywxTagRelationById(relationId);
// return EntityUtil.changeEntityByJSON(QywxTagRelationDTO.class, tagRelation);
// }
@Override
public QywxTagInfoDTO getQywxTagByQywxTagId(String qywxTagId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java
......@@ -499,16 +499,16 @@ public class StaffApiServiceImpl implements StaffApiService {
return staffDTO;
}
@Override
public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId) {
TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedService.getDepartmentIdAndStaffId(departmentId, staffId);
return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, tab);
}
// @Override
// public StaffDepartmentRelatedDTO getDepartmentIdAndStaffId(String departmentId, String staffId) {
// TabHaobanStaffDepartmentRelated tab = staffDepartmentRelatedService.getDepartmentIdAndStaffId(departmentId, staffId);
// return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, tab);
// }
@Override
public StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code) {
return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, staffDepartmentRelatedMapper.getDepartmentIdAndCode(departmentId, code));
}
// @Override
// public StaffDepartmentRelatedDTO getDepartmentIdAndCode(String departmentId, String code) {
// return EntityUtil.changeEntityByJSON(StaffDepartmentRelatedDTO.class, staffDepartmentRelatedMapper.getDepartmentIdAndCode(departmentId, code));
// }
@Override
public void initWxUser(String corpid, String contactSecret, String wxEnterpriseId, Integer wxDepartmentId, String taskId) {
......@@ -708,21 +708,21 @@ public class StaffApiServiceImpl implements StaffApiService {
return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(tabHaobanStaffs), StaffDTO.class);
}
@Override
public List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId) {
List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxEnterpriseId(wxEnterpriseId);
return EntityUtil.changeEntityListNew(StaffDTO.class, tabHaobanStaffs);
}
// @Override
// public List<StaffDTO> listAllStaffByWxEnterpriseId(String wxEnterpriseId) {
// List<TabHaobanStaff> tabHaobanStaffs = staffMapper.listByWxEnterpriseId(wxEnterpriseId);
// return EntityUtil.changeEntityListNew(StaffDTO.class, tabHaobanStaffs);
// }
@Override
public List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId) {
List<StaffDTO> list = staffService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
if (CollectionUtils.isEmpty(list)) {
return Collections.EMPTY_LIST;
}
this.addDepartInfo(list);
return list;
}
// @Override
// public List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId) {
// List<StaffDTO> list = staffService.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId);
// if (CollectionUtils.isEmpty(list)) {
// return Collections.EMPTY_LIST;
// }
// this.addDepartInfo(list);
// return list;
// }
private void addDepartInfo(List<StaffDTO> list) {
......@@ -759,10 +759,10 @@ public class StaffApiServiceImpl implements StaffApiService {
return staffMapper.updateOpenIdByStaffId(staffId, openId);
}
@Override
public int updateQrCodeByStaffId(String staffId, String qrCode) {
return staffMapper.updateQrCodeByStaffId(staffId, qrCode);
}
// @Override
// public int updateQrCodeByStaffId(String staffId, String qrCode) {
// return staffMapper.updateQrCodeByStaffId(staffId, qrCode);
// }
@Override
public StaffQrCodeDTO getQrCodeByClerkId(String clerkId) {
......@@ -884,20 +884,20 @@ public class StaffApiServiceImpl implements StaffApiService {
return storeRangeService.isFlagByStoreId(storeId, wxEnterpriseId, enterpriseId);
}
@Override
public boolean isSuperAdmin(String clerkId) {
ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
if (clerkDTO == null) {
return false;
}
Integer superAdmin = clerkDTO.getSuperAdmin();
return superAdmin != null && superAdmin == 1;
}
@Override
public List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId) {
return storeRangeService.listStoreIdByWxEnterpriseId(wxEnterpriseId, enterpriseId);
}
// @Override
// public boolean isSuperAdmin(String clerkId) {
// ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
// if (clerkDTO == null) {
// return false;
// }
// Integer superAdmin = clerkDTO.getSuperAdmin();
// return superAdmin != null && superAdmin == 1;
// }
// @Override
// public List<String> getHaoBanStoreRolesByEnterpriseId(String enterpriseId, String wxEnterpriseId) {
// return storeRangeService.listStoreIdByWxEnterpriseId(wxEnterpriseId, enterpriseId);
// }
@Override
public StoreRoleDTO getCountHaoBanStoreIdsByClerkId(String clerkId, String wxEnterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
......@@ -224,12 +224,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
@Override
public void delBindByStoreId(String wxEnterpriseId, String storeId, String staffId, int channelCode) {
Set<String> needUnBindStoreIds = new HashSet<>();
needUnBindStoreIds.add(storeId);
staffClerkRelationService.delBindByStoreIds(wxEnterpriseId, needUnBindStoreIds, staffId, ChannelCodeEnum.SELF_UNBIND.getCode());
}
// @Override
// public void delBindByStoreId(String wxEnterpriseId, String storeId, String staffId, int channelCode) {
// Set<String> needUnBindStoreIds = new HashSet<>();
// needUnBindStoreIds.add(storeId);
// staffClerkRelationService.delBindByStoreIds(wxEnterpriseId, needUnBindStoreIds, staffId, ChannelCodeEnum.SELF_UNBIND.getCode());
// }
@Override
public List<StaffClerkRelationDTO> listByClerkIds(List<String> clerkIds) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/SyncHaobanToGicApiServiceImpl.java
......@@ -32,66 +32,66 @@ public class SyncHaobanToGicApiServiceImpl implements SyncHaobanToGicApiService
clerkService.delClerk(gicClerkId);
}
@Override
public void updateGicClerk(String gicClerkId, String name) {
logger.info("【删除gicClerk】clerkID={},name={}",gicClerkId,name);
ClerkDTO clerkDto = new ClerkDTO();
ClerkDTO clerk = clerkService.getClerkByClerkId(gicClerkId);
if(clerk == null || clerk.getClerkName().equals(name)){
return;
}else{
logger.info("【更新gicClerk】clerkID={},name={}",gicClerkId,name);
clerkDto.setClerkId(gicClerkId);
clerkDto.setClerkName(name);
clerkService.updateClerk(clerkDto);
}
}
// @Override
// public void updateGicClerk(String gicClerkId, String name) {
// logger.info("【删除gicClerk】clerkID={},name={}",gicClerkId,name);
// ClerkDTO clerkDto = new ClerkDTO();
// ClerkDTO clerk = clerkService.getClerkByClerkId(gicClerkId);
// if(clerk == null || clerk.getClerkName().equals(name)){
// return;
// }else{
// logger.info("【更新gicClerk】clerkID={},name={}",gicClerkId,name);
// clerkDto.setClerkId(gicClerkId);
// clerkDto.setClerkName(name);
// clerkService.updateClerk(clerkDto);
// }
//
// }
@Override
public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId) {
logger.info("【店员新增校验】gicEnterpriseId={},phoneNumber={},code={}",gicEnterpriseId,phoneNumber,code);
ClerkDTO clerk = clerkService.getClerkByCodeNoDel(gicEnterpriseId, code);
//检验code是否唯一,并且手机号不为空
if (null!=clerk && StringUtils.isNotBlank(clerk.getPhoneNumber())) {
return false;
//检验code唯一，并且手机为空，并且门店id不同
}else if(null!=clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && !gicStoreId.equals(clerk.getStoreId())){
return false;
}else if(null != clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && gicStoreId.equals(clerk.getStoreId())){
String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, clerk.getClerkId());
logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
if(StringUtils.isNotBlank(message)){
return false;
}
}else{
//code不存在的情况下 判断是否能新增
String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, "");
logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
if(StringUtils.isNotBlank(message)){
return false;
}
}
return true;
}
// @Override
// public boolean validateGicClerkAdd(String gicEnterpriseId,String phoneNumber,String code,String gicStoreId) {
// logger.info("【店员新增校验】gicEnterpriseId={},phoneNumber={},code={}",gicEnterpriseId,phoneNumber,code);
// ClerkDTO clerk = clerkService.getClerkByCodeNoDel(gicEnterpriseId, code);
// //检验code是否唯一,并且手机号不为空
// if (null!=clerk && StringUtils.isNotBlank(clerk.getPhoneNumber())) {
// return false;
// //检验code唯一，并且手机为空，并且门店id不同
// }else if(null!=clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && !gicStoreId.equals(clerk.getStoreId())){
// return false;
// }else if(null != clerk && StringUtils.isBlank(clerk.getPhoneNumber()) && gicStoreId.equals(clerk.getStoreId())){
// String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, clerk.getClerkId());
// logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
// if(StringUtils.isNotBlank(message)){
// return false;
// }
// }else{
// //code不存在的情况下 判断是否能新增
// String message = clerkService.validatePhoneNumber(gicEnterpriseId, gicStoreId, phoneNumber, "");
// logger.info("【新增用户校验】message={},gicEnterpriseId={},gicStoreId={},phoneNumber={}",message,gicEnterpriseId,gicStoreId,phoneNumber);
// if(StringUtils.isNotBlank(message)){
// return false;
// }
// }
// return true;
// }
@Override
public boolean gicClerkMove(String gicClerkId, String gicOldStoreId, String gicNewStoreId, int clerkChangeReason,
int memberChangeReason, String operId) {
logger.info("【门店转移】gicClerkId={},gicOldStoreId={},gicNewStoreId={},clerkChangeReason={},memberChangeReason={},operId={}",
gicClerkId,gicOldStoreId,gicNewStoreId,clerkChangeReason,memberChangeReason,operId);
if(StringUtils.isAnyBlank(gicClerkId,gicOldStoreId,gicNewStoreId,operId)){
return false;
}
clerkService.clerkMove(gicClerkId, gicOldStoreId, gicNewStoreId, clerkChangeReason, memberChangeReason, operId);
return true;
}
// @Override
// public boolean gicClerkMove(String gicClerkId, String gicOldStoreId, String gicNewStoreId, int clerkChangeReason,
// int memberChangeReason, String operId) {
// logger.info("【门店转移】gicClerkId={},gicOldStoreId={},gicNewStoreId={},clerkChangeReason={},memberChangeReason={},operId={}",
// gicClerkId,gicOldStoreId,gicNewStoreId,clerkChangeReason,memberChangeReason,operId);
// if(StringUtils.isAnyBlank(gicClerkId,gicOldStoreId,gicNewStoreId,operId)){
// return false;
// }
// clerkService.clerkMove(gicClerkId, gicOldStoreId, gicNewStoreId, clerkChangeReason, memberChangeReason, operId);
// return true;
// }
@Override
public boolean setStoreManager(String gicEnterpriseId, String gicStoreId, String gicClerkId) {
powerService.setStoreManager(gicEnterpriseId, gicStoreId, gicClerkId);
return true;
}
// @Override
// public boolean setStoreManager(String gicEnterpriseId, String gicStoreId, String gicClerkId) {
// powerService.setStoreManager(gicEnterpriseId, gicStoreId, gicClerkId);
// return true;
// }
@Override
public boolean syncClerkToGicClerkAdd(String storeId,String clerkCode,Integer sex,String name,
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ValidationCodeApiServiceImpl.java
......@@ -82,25 +82,25 @@ public class ValidationCodeApiServiceImpl implements ValidationCodeApiService {
* @param phoneNumber
* @param code
*/
@Override
public int smsValidationCode(String nationCode, String phoneNumber, String code) {
logger.info("短信验证码:nationCode：{} phoneNumber:{} 验证码：{} ", nationCode, phoneNumber, code);
if (StringUtils.isBlank(phoneNumber)) {
return 3;
}
Map<String, String> map = new HashMap<String, String>();
map.put("1", code);
map.put("2", "15");
SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, nationCode, 2, map);
if (SUCCESS.equals(responseDTO.getErrCode())) {
logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
return 1;
} else {
logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
return 2;
}
}
// @Override
// public int smsValidationCode(String nationCode, String phoneNumber, String code) {
// logger.info("短信验证码:nationCode：{} phoneNumber:{} 验证码：{} ", nationCode, phoneNumber, code);
// if (StringUtils.isBlank(phoneNumber)) {
// return 3;
// }
//
// Map<String, String> map = new HashMap<String, String>();
// map.put("1", code);
// map.put("2", "15");
// SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, nationCode, 2, map);
// if (SUCCESS.equals(responseDTO.getErrCode())) {
// logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
// return 1;
// } else {
// logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
// return 2;
// }
// }
/**
* 短信验证码
......@@ -108,89 +108,89 @@ public class ValidationCodeApiServiceImpl implements ValidationCodeApiService {
* @param nationCode
* @param phoneNumber
*/
@Override
public int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unRendPeople, String unReadCount, String enterpriseId) {
logger.info("短信验证码:nationCode：{} phoneNumber:{} 未读人数：{},未读数:{} ", nationCode, phoneNumber, unRendPeople, unReadCount);
if (StringUtils.isBlank(phoneNumber)) {
return 3;
}
Map<String, String> map = new HashMap<String, String>();
map.put("1", unRendPeople);
map.put("2", unReadCount);
SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend(enterpriseId, phoneNumber, nationCode, 3, map);
if (SUCCESS.equals(responseDTO.getErrCode())) {
logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
return 1;
} else {
logger.info("手机号码：" + phoneNumber + "短信提醒发送失败：" + responseDTO.getErrMessage());
return 2;
}
}
@Override
public int smsValidationCode(String phoneNumber, String code) {
logger.info("短信验证码:phoneNumber:" + phoneNumber + "code:" + code);
if (StringUtil.isNotNullStr(phoneNumber, true)) {
Map<String, String> map = new HashMap<String, String>();
map.put("1", code);
map.put("2", "15");
SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, "86", 2, map);
if (responseDTO.getErrCode().equals("0")) {
logger.info("发送成功！" + phoneNumber);
return 1;
} else {
logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
return 2;
}
}
logger.info("手机号吗为空" + phoneNumber);
return 3;
}
@Override
public int verifyValidationCode(String phoneNumber, String code) {
TelResDTO res = voiceService.voiceVerify(phoneNumber, code, 2, null);
if (null != res && YTXErrCode.ERR_000000 == res.getCode()) {
logger.info("成功+" + phoneNumber);
} else {
logger.info("发送失败" + phoneNumber);
return 0;
}
// 保存通讯记录
CommunicationLogDTO communicationLog = null;
try {
communicationLog = new CommunicationLogDTO();
communicationLog.setCreateTime(new Date());
communicationLog.setOperationType(1);
communicationLog.setParamInfo(code);
communicationLog.setReceivePhone(phoneNumber);
communicationLog.setStatus(1);
if (null != res) {
YTXErrCode errcode = res.getCode();
if (!errcode.getCode().equals(
YTXErrCode.ERR_000000.getCode())) {
communicationLog.setStatus(0);
communicationLog.setErrMsg(errcode.getValue());
communicationLog.setFee(0);
}
} else {
communicationLog.setStatus(0);
communicationLog.setErrMsg("无返回结果");
communicationLog.setFee(0);
}
communicationService.saveCommunication(communicationLog,
"voice");
} catch (Exception e) {
logger.info("调用服务模块异常，保存通讯日志记录出错:"
+ JSON.toJSONString(communicationLog));
}
return 1;
}
// @Override
// public int smsMessageNoReadRemind(String nationCode, String phoneNumber, String unRendPeople, String unReadCount, String enterpriseId) {
// logger.info("短信验证码:nationCode：{} phoneNumber:{} 未读人数：{},未读数:{} ", nationCode, phoneNumber, unRendPeople, unReadCount);
// if (StringUtils.isBlank(phoneNumber)) {
// return 3;
// }
//
// Map<String, String> map = new HashMap<String, String>();
// map.put("1", unRendPeople);
// map.put("2", unReadCount);
// SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend(enterpriseId, phoneNumber, nationCode, 3, map);
// if (SUCCESS.equals(responseDTO.getErrCode())) {
// logger.info("给phoneNumber：{} 发送短信成功！", phoneNumber);
// return 1;
// } else {
// logger.info("手机号码：" + phoneNumber + "短信提醒发送失败：" + responseDTO.getErrMessage());
// return 2;
// }
// }
// @Override
// public int smsValidationCode(String phoneNumber, String code) {
// logger.info("短信验证码:phoneNumber:" + phoneNumber + "code:" + code);
// if (StringUtil.isNotNullStr(phoneNumber, true)) {
//
// Map<String, String> map = new HashMap<String, String>();
// map.put("1", code);
// map.put("2", "15");
// SmsSendResponseDTO responseDTO = accountOverdueSmsSendService.smsSend("-1", phoneNumber, "86", 2, map);
// if (responseDTO.getErrCode().equals("0")) {
// logger.info("发送成功！" + phoneNumber);
// return 1;
// } else {
//
// logger.info("手机号码：" + phoneNumber + "短信验证码发送失败：" + responseDTO.getErrMessage());
// return 2;
// }
// }
// logger.info("手机号吗为空" + phoneNumber);
// return 3;
// }
// @Override
// public int verifyValidationCode(String phoneNumber, String code) {
// TelResDTO res = voiceService.voiceVerify(phoneNumber, code, 2, null);
// if (null != res && YTXErrCode.ERR_000000 == res.getCode()) {
// logger.info("成功+" + phoneNumber);
//
// } else {
// logger.info("发送失败" + phoneNumber);
// return 0;
// }
//
// // 保存通讯记录
// CommunicationLogDTO communicationLog = null;
// try {
// communicationLog = new CommunicationLogDTO();
// communicationLog.setCreateTime(new Date());
// communicationLog.setOperationType(1);
// communicationLog.setParamInfo(code);
// communicationLog.setReceivePhone(phoneNumber);
// communicationLog.setStatus(1);
// if (null != res) {
// YTXErrCode errcode = res.getCode();
// if (!errcode.getCode().equals(
// YTXErrCode.ERR_000000.getCode())) {
// communicationLog.setStatus(0);
// communicationLog.setErrMsg(errcode.getValue());
// communicationLog.setFee(0);
// }
// } else {
// communicationLog.setStatus(0);
// communicationLog.setErrMsg("无返回结果");
// communicationLog.setFee(0);
// }
// communicationService.saveCommunication(communicationLog,
// "voice");
// } catch (Exception e) {
// logger.info("调用服务模块异常，保存通讯日志记录出错:"
// + JSON.toJSONString(communicationLog));
// }
// return 1;
// }
@Override
public SendSmsResponse sendValidationCodeHb3(String nationCode, String phoneNumber, String code, String enterpriseId, String storeId, String clerkId, boolean payFlag) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseApiServiceImpl.java
......@@ -360,11 +360,11 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
return true;
}
@Override
public WelcomeDTO getWelcome(String wxEnterpriseId) {
TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(wxEnterpriseId);
return EntityUtil.changeEntityByJSON(WelcomeDTO.class, tabWelcome);
}
// @Override
// public WelcomeDTO getWelcome(String wxEnterpriseId) {
// TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(wxEnterpriseId);
// return EntityUtil.changeEntityByJSON(WelcomeDTO.class, tabWelcome);
// }
@Override
public boolean setWelcome(String wxEnterpriseId, Integer openFlag) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java
......@@ -152,11 +152,11 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
return list;
}
@Override
public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId);
return tab != null ? tab.getEnterpriseId() : null;
}
// @Override
// public String getGicEnterpriseIdByEnterpriseRelatedId(String wxEnterpriseRelatedId) {
// TabHaobanWxEnterpriseRelated tab = wxEnterpriseRelatedService.getByGicEnterpriseIdByEnterpriseRelatedId(wxEnterpriseRelatedId);
// return tab != null ? tab.getEnterpriseId() : null;
// }
@Override
public boolean enterpriseUseNew(String enterpriseId) {
......@@ -191,12 +191,12 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
return details;
}
@Override
public List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime) {
List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedMapper.listEnterpriseByTime(seqTime);
List<EnterpriseDetailDTO> details = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, list);
return details;
}
// @Override
// public List<EnterpriseDetailDTO> queryBindGicEnterpriseByTime(String seqTime) {
// List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedMapper.listEnterpriseByTime(seqTime);
// List<EnterpriseDetailDTO> details = EntityUtil.changeEntityListByJSON(EnterpriseDetailDTO.class, list);
// return details;
// }
@Transactional(rollbackFor = Exception.class)
@Override
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
......@@ -129,12 +129,12 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
return ServiceResponse.success(id);
}
@Override
public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo);
Page<HmLinkDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, HmLinkDTO.class);
return ServiceResponse.success(resultPage);
}
// @Override
// public ServiceResponse<Page<HmLinkDTO>> listPage(HmLinkSearchQDTO qdto, BasePageInfo basePageInfo) {
// Page<HmLinkBO> page = this.hmLinkService.listPage(qdto, basePageInfo);
// Page<HmLinkDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, HmLinkDTO.class);
// return ServiceResponse.success(resultPage);
// }
@Override
public ServiceResponse<HmLinkWxaDTO> getLinkHmFromWxa(String enterpriseId, Integer whitchStore, String inStoreId,
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanMenuApiServiceImpl.java
......@@ -41,11 +41,11 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<String>> getAllMenuCodeList() {
List<String> allMenuList = haobanMenuService.getAllMenuCodeList();
return ServiceResponse.success(allMenuList);
}
// @Override
// public ServiceResponse<List<String>> getAllMenuCodeList() {
// List<String> allMenuList = haobanMenuService.getAllMenuCodeList();
// return ServiceResponse.success(allMenuList);
// }
@Override
public ServiceResponse<List<HaobanMenuDTO>> getAllMenuList() {
......@@ -65,16 +65,16 @@ public class HaobanMenuApiServiceImpl implements HaobanMenuApiService {
return ServiceResponse.success(EntityUtil.changeEntityListNew(HaobanMenuDTO.class, haobanMenuBOList));
}
@Override
public ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType) {
List<String> haobanMenuList = haobanMenuService.getHaobanMenuList(wxEnterpriseId, clerkType);
return ServiceResponse.success(haobanMenuList);
}
// @Override
// public ServiceResponse<List<String>> getHaobanMenuList(String wxEnterpriseId, Integer clerkType) {
// List<String> haobanMenuList = haobanMenuService.getHaobanMenuList(wxEnterpriseId, clerkType);
// return ServiceResponse.success(haobanMenuList);
// }
@Override
public ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode) {
return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanMenuDTO.class, haobanMenuService.getMenuByCode(menuCode)));
}
// @Override
// public ServiceResponse<HaobanMenuDTO> getMenuByCode(String menuCode) {
// return ServiceResponse.success(EntityUtil.changeEntityNew(HaobanMenuDTO.class, haobanMenuService.getMenuByCode(menuCode)));
// }
@Override
public ServiceResponse<String> getMenuNameByCode(String menuCode) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
......@@ -274,15 +274,15 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag) {
HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, systemFlag);
if (haobanRoleBO == null) {
return ServiceResponse.success();
}
List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
return ServiceResponse.success(menuCodes);
}
// @Override
// public ServiceResponse<List<String>> getMenuCodesByClerkType(String wxEnterpriseId, Integer clerkType, Integer systemFlag) {
// HaobanRoleBO haobanRoleBO = haobanRoleService.getByWxEnterpriseIdAndClerkType(wxEnterpriseId, clerkType, systemFlag);
// if (haobanRoleBO == null) {
// return ServiceResponse.success();
// }
// List<String> menuCodes = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId(wxEnterpriseId, haobanRoleBO.getRoleId());
// return ServiceResponse.success(menuCodes);
// }
@Override
public ServiceResponse addHaobanRoleInit(String wxEnterpriseId) {
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java
......@@ -44,7 +44,8 @@ public interface HaobanMenuService {
*
* @return {@link List}<{@link HaobanMenuBO}>
*/
List<String> getAllMenuCodeList();
//无效接口
// List<String> getAllMenuCodeList();
List<HaobanMenuBO> getAllMenuList();
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
......@@ -69,10 +69,10 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
return this.tabHaobanMenuMapper.update(tabHaobanMenu);
}
@Override
public List<String> getAllMenuCodeList() {
return tabHaobanMenuMapper.getAllMenuCodeList();
}
// @Override
// public List<String> getAllMenuCodeList() {
// return tabHaobanMenuMapper.getAllMenuCodeList();
// }
@Override
public List<HaobanMenuBO> getAllMenuList() {
......
haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml
......@@ -341,15 +341,15 @@
order by sort desc
</select>
<select id="listStoreByWxEnterpriseId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_department
where status_flag = 1
and is_store = 1
and wx_enterprise_id = #{wxEnterpriseId}
order by create_time
</select>
<!-- <select id="listStoreByWxEnterpriseId" resultMap="BaseResultMap">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_department-->
<!-- where status_flag = 1-->
<!-- and is_store = 1-->
<!-- and wx_enterprise_id = #{wxEnterpriseId}-->
<!-- order by create_time-->
<!-- </select>-->
<select id="getRootByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
......
haoban-manage3-service/src/main/resources/mapper/QywxTagRelationMapper.xml
......@@ -21,12 +21,12 @@
relation_type, sync_flag, `order`, qywx_tag_id, qywx_tag_item_id, status_flag, create_time,
update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_qywx_tag_relation
where qywx_tag_relation_id = #{qywxTagRelationId,jdbcType=VARCHAR}
</select>
<!-- <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_qywx_tag_relation-->
<!-- where qywx_tag_relation_id = #{qywxTagRelationId,jdbcType=VARCHAR}-->
<!-- </select>-->
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from tab_haoban_qywx_tag_relation
where qywx_tag_relation_id = #{qywxTagRelationId,jdbcType=VARCHAR}
......
haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml
......@@ -108,24 +108,24 @@
</update>
<select id="getDepartmentIdAndStaffId" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where staff_id = #{staffId,jdbcType=VARCHAR}
and department_id = #{departmentId}
and status_flag = 1
limit 1
</select>
<!-- <select id="getDepartmentIdAndStaffId" resultMap="BaseResultMap" parameterType="java.lang.String">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_staff_department_related-->
<!-- where staff_id = #{staffId,jdbcType=VARCHAR}-->
<!-- and department_id = #{departmentId}-->
<!-- and status_flag = 1-->
<!-- limit 1-->
<!-- </select>-->
<select id="getDepartmentIdAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">
select
<include refid="Base_Column_List"/>
from tab_haoban_staff_department_related
where clerk_code = #{clerkCode,jdbcType=VARCHAR}
and department_id = #{departmentId}
and status_flag = 1
</select>
<!-- <select id="getDepartmentIdAndCode" resultMap="BaseResultMap" parameterType="java.lang.String">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_staff_department_related-->
<!-- where clerk_code = #{clerkCode,jdbcType=VARCHAR}-->
<!-- and department_id = #{departmentId}-->
<!-- and status_flag = 1-->
<!-- </select>-->
<select id="countByDepartmentIds" resultType="java.lang.Integer">
......
haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml
......@@ -403,15 +403,15 @@
and status_flag = 1
</select>
<select id="getClerkExternalByUnionId" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_external_clerk_related
where enterprise_id = #{enterpriseId}
and unionid = #{unionId}
and clerk_id = #{clerkId}
and status_flag = 1
</select>
<!-- <select id="getClerkExternalByUnionId" resultMap="BaseResultMap">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_external_clerk_related-->
<!-- where enterprise_id = #{enterpriseId}-->
<!-- and unionid = #{unionId}-->
<!-- and clerk_id = #{clerkId}-->
<!-- and status_flag = 1-->
<!-- </select>-->
<select id="getByRelationKey" resultMap="BaseResultMap">
select
......
haoban-manage3-service/src/main/resources/mapper/TabQywxErrorLogMapper.xml
......@@ -130,12 +130,12 @@
</delete>
<!--查询单个-->
<select id="queryById" resultMap="TabQywxErrorLogMap">
select
<include refid="Base_Column_List"/>
from tab_qywx_error_log
where id = #{id}
</select>
<!-- <select id="queryById" resultMap="TabQywxErrorLogMap">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_qywx_error_log-->
<!-- where id = #{id}-->
<!-- </select>-->
<!--通过实体作为筛选条件查询-->
<select id="queryListByPage" parameterType="com.gic.haoban.manage.api.dto.qdto.QywxErrorLogListQDTO"
......
haoban-manage3-service/src/main/resources/mapper/WxEnterpriseRelatedMapper.xml
......@@ -219,13 +219,13 @@
</if>
</select>
<select id="listEnterpriseByTime" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_wx_enterprise_related
where status_flag = 1
AND DATE_FORMAT(update_time,'%Y-%m-%d') = #{time}
</select>
<!-- <select id="listEnterpriseByTime" resultMap="BaseResultMap">-->
<!-- select-->
<!-- <include refid="Base_Column_List"/>-->
<!-- from tab_haoban_wx_enterprise_related-->
<!-- where status_flag = 1-->
<!-- AND DATE_FORMAT(update_time,'%Y-%m-%d') = #{time}-->
<!-- </select>-->
<select id="findOneByEIdAndWxEid" resultMap="BaseResultMap">
select
......
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
......@@ -98,12 +98,12 @@
where status_flag = 1
</select>
<select id="getAllMenuCodeList" resultType="java.lang.String">
select menu_code
from tab_haoban_menu
where status_flag = 1
order by menu_sort
</select>
<!-- <select id="getAllMenuCodeList" resultType="java.lang.String">-->
<!-- select menu_code-->
<!-- from tab_haoban_menu-->
<!-- where status_flag = 1-->
<!-- order by menu_sort-->
<!-- </select>-->
<select id="getPidMenuList" resultMap="TabHaobanMenuMap">
select
......
haoban-manage3-service/src/test/java/HmLinkTest.java
......@@ -153,7 +153,8 @@ public class HmLinkTest {
qdto.setLinkType(1);
qdto.setSearchParams("LJ01417077902036099073");
BasePageInfo basePageInfo = new BasePageInfo() ;
System.out.println(JSON.toJSONString(this.hmLinkApiService.listPage(qdto, basePageInfo), true));
//无效接口
// System.out.println(JSON.toJSONString(this.hmLinkApiService.listPage(qdto, basePageInfo), true));
}
......
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