diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/yqzjAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index e2af363..09c8c12 100644 --- a/yqzjAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/yqzjAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -10,7 +10,6 @@ import com.iformall.domain.po.WxTags; import com.iformall.domain.vo.CUserBaseInfoT; import com.iformall.domain.vo.MerchantPoiT; import com.iformall.service.TtMerchantPoiService; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxTagsService; import org.apache.shiro.session.UnknownSessionException; import org.slf4j.Logger; @@ -28,8 +27,6 @@ import java.util.concurrent.TimeUnit; public class AsyncTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; @Autowired private TtMerchantPoiService ttMerchantPoiService; @@ -120,19 +117,6 @@ public class AsyncTask { WxTags wxTagsQ = new WxTags(); List tagList = wxTagsService.findList(wxTagsQ); - try { - successList.parallelStream().forEach(uBase -> { - try { - wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); - } catch (UnknownSessionException ue) { - logger.error("session :"+ue.getMessage()); - } - }); - } catch (Exception e) { - set_redis_value(importKey, "1", "0", "0", "1", true); - e.printStackTrace(); - logger.error("导入模板失败:"+e.getMessage()); - } } } diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java b/yqzjAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java index 430ba20..eeed301 100644 --- a/yqzjAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java +++ b/yqzjAdmin/src/main/java/com/iformall/controller/mem/ImportTemplateTask.java @@ -15,7 +15,6 @@ import com.iformall.domain.vo.WxBillExcelTemplateOther; import com.iformall.enums.EnumMerchantStatus; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.WxBillAllService; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxTagsService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.session.UnknownSessionException; @@ -39,9 +38,6 @@ import java.util.stream.Collectors; public class ImportTemplateTask { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired private WxTagsService wxTagsService; @@ -324,11 +320,6 @@ public class ImportTemplateTask { try { successList.parallelStream().forEach(uBase -> { - try { - wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); - } catch (UnknownSessionException ue) { - logger.error("session :" + ue.getMessage()); - } }); } catch (Exception e) { set_redis_value(importKey, "1", "0", "0", "1", true); diff --git a/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index 685dd1b..c836cf3 100644 --- a/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/yqzjAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -9,7 +9,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxScoreHistory; import com.iformall.enums.EnumCUserBasicInfoStatus; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -27,8 +26,6 @@ public class WxScoreHistoryController extends BaseController { @Autowired private WxScoreHistoryService wxScoreHistoryService; - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; @ApiOperation("分页列表接口") @@ -77,11 +74,6 @@ public class WxScoreHistoryController extends BaseController { } public boolean checkMemberStatus(Long userId) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getTenantInfo().getFinalTenantId()); - if (wxCUserBasicInfo != null && wxCUserBasicInfo.getStatus().equals(EnumCUserBasicInfoStatus.LOCKED.getCode())) { - logger.info("会员权益被锁定:cUserId:" + userId); - return true; - } return false; } diff --git a/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java b/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java index 024812e..a3ce6df 100644 --- a/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java @@ -54,9 +54,6 @@ public class BaseController { @Autowired private FmOpenService openService; - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired private WxCUserBasicChildService wxCUserBasicChildService; @@ -127,12 +124,4 @@ public class BaseController { return ipaddress; } - public Integer getPoins() { - WxCUserBasicInfo cuser = getCUser(); - WxCUserBasicInfo newcuser = wxCUserBasicInfoService.getById(cuser.getId(), cuser.getFinalTenantId()); - if (newcuser == null) { - throw new MallinkException(ErrorCode.USER_IS_EMPTY); - } - return newcuser.getPoins(); - } } diff --git a/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index c8a3a83..ee7463f 100644 --- a/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -12,7 +12,6 @@ import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.service.CUserTokenService; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxMallService; import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; @@ -36,9 +35,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { @Autowired private CUserTokenService cUserTokenService; - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired private WxMallService wxMallService; @@ -68,14 +64,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY.getCode(),"token为空["+token+"]"); } - // 查询token信息 - WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.getByToken(token); - if(basicInfo == null){ - throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录"); - } - - request.setAttribute(Constant.LOGIN_MEMBER_KEY,basicInfo.getId()); - request.setAttribute(Constant.REQUEST_C_USER_KEY, basicInfo); return true; } diff --git a/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index db7f5b1..7d7394a 100644 --- a/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -4,7 +4,6 @@ import com.iformall.annotation.LoginUser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.service.CUserTokenService; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; @@ -24,8 +23,6 @@ import org.springframework.web.method.support.ModelAndViewContainer; @Component public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; @Override public boolean supportsParameter(MethodParameter parameter) { diff --git a/yqzjService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/yqzjService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java deleted file mode 100644 index 17701ab..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ /dev/null @@ -1,216 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxCUserBasicInfoDto; -import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; -import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.CUserBaseInfoT; -import com.iformall.domain.vo.UserCountVo; -import com.iformall.domain.vo.WxTagsGroupVo; -import com.iformall.enums.EnumMsgModel; -import com.iformall.enums.EnumScoreType; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -public interface WxCUserBasicInfoService { - /** - * 根据租户ID获取会员过滤器列表 - * - * @return - */ - - List listFilters(TenantEntity tenantEntity); - - long countByFilter(TenantEntity tenantEntity, List filterList); - - List listByFilter(TenantEntity tenantEntity, List filterList); - - List findIdByFilter(TenantEntity tenantEntity, List filterList); - - List listByFilterList(TenantEntity tenantEntity, List filterList); - - List listOpenIdByFilter(TenantEntity tenantEntity, List filterList); - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxCUserBasicInfo record, Integer pageIndex, Integer pageSize); - - List listPhoneAndNameByIds(WxCUserBasicInfo record); - - Map getUserMap(TenantEntity tenantEntity, List cUserIdList); - /** - * 根据实体查询列表 - * @param record - * @return - */ - int countUser(WxCUserBasicInfo record); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCUserBasicInfo getById(Long id,String finalTenantId); - - WxCUserBasicInfo getById(Long id); - - /** - * 保存实体 - * - * @param record - */ - void save(WxCUserBasicInfo record); - - /** - * 更新实体 - * - * @param record - */ - void update(WxCUserBasicInfo record); - - /** - * 保存或更新实体 - * - * @param record - */ - void updateObj(WxCUserBasicInfo record, WxCUser user); - - /** - * 根据Id删除实体 - * - */ - //void deleteById(Long id); - - List findByPhone(TenantEntity tenantEntity, String phone); - WxCUserBasicInfo findInfoByPhone(TenantEntity tenantEntity, String phone); - - WxCUserBasicInfo findInfoByEmail(TenantEntity tenantInfo, String email); - - /** - * 修改会员积分 - * - * @param record - */ - void updateScore(WxCUserBasicInfo record); - - /** - * 根据性别查询数量 - * - * @param dto - * @return - */ - long findCountBySex(WxCUserBasicInfoDto dto); - - /** - * 根据年龄查询数量 - * - * @param dto - * @return - */ - - long findCountByAge(WxCUserBasicInfoDto dto); - - /** - * 根据年龄积分查寻数量 - * - * @param dto - * @return - */ - long findCountByScore(WxCUserBasicInfoDto dto); - - int exportDataCount(WxCUserBasicInfo basicInfo); - - void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response); - - - void exportTemplate(HttpServletRequest request, HttpServletResponse response); - - void importOneMem(String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); - - long findCount(WxCUserBasicInfoDto record); - - List findCountHistory(WxCUserBasicInfoDto record); - /** - * 停车会员记录导出 - * @param record - * @param request - * @param response - */ - void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response); - - - /** - * 自然增长用户 - * @return - */ - long findGrowUserCount(TenantEntity tenantEntity); - - /** - * 导入用户数 - * @return - */ - long findImportUserCount(TenantEntity tenantEntity); - - ResultData updateStatus(WxCUserBasicInfo wxCUserBasicInfo); - - WxCUserBasicInfo getByObject(WxCUserBasicInfo wxCUserBasicInfo); - - - List findListByScore(TenantEntity tenantEntity, WxCUserBasicInfoDto wxCUserBasicInfoDto); - - List findBirthdayList(TenantEntity tenantEntity, String format, String format1); - - void cuserOldToNew(Long oldCuserId, Long newCuserId,TenantEntity tenantinfo); - - WxCUserBasicInfo registerByPhone(TenantEntity tenantEntity, String phone, String nickName,String name, Integer sex, String avatarUrl); - - int addCredit(Long userId, TenantEntity tenantInfo, EnumScoreType wechatPhone); - - void registerJinmao(TenantEntity tenantInfo,WxCUserBasicInfo basicInfo); - - void updateTenantIdMsg(TenantEntity tenantInfo, TenantEntity mallTenant, Long userId); - - void updateTenantId(String finalTenantId, String tenantId, Long userId); - - void handleLoginUser(WxCUserBasicInfo basicInfo); - - void logout(WxCUserBasicInfo basicInfo); - - WxCUserBasicInfo getByToken(String token); - - WxCUserBasicInfo register(TenantEntity tenantInfo, String phone, String pwd); - - WxCUserBasicInfo registerEmail(TenantEntity tenantInfo, String email, String password); - - /** - * 发送激活邮件,修改密码邮件 - */ - void sendTicketEmail(WxCUserBasicInfo basicInfo, EnumMsgModel type); - - void updUserInfo(WxCUserBasicInfo cUser, Long memberId); - -// WxCUserBasicInfo getById1(Long id); - - - // void updateCode(Long id, String mcode); - - void reducePoints(Long id,String finalTenantId,Integer reducePoints); - void addPoints(Long id,String finalTenantId,Integer addPoints); - - List findIdsListByPhone(String finalTenantId,String phone); - - List findList(WxCUserBasicInfo basicInfo); -} - diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index 4a3e1b2..4662a60 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -10,7 +10,6 @@ import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxCUserCarMapper; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserCarService; import com.iformall.service.WxMallService; import org.apache.commons.lang3.StringUtils; @@ -35,9 +34,6 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Autowired - WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired WxMallService wxMallService; @@ -60,13 +56,6 @@ public class WxCUserCarServiceImpl implements WxCUserCarService { return; } List userIds = userCarList.stream().map(uc -> uc.getCUserId()).collect(Collectors.toList()); - Map userMap = wxCUserBasicInfoService.getUserMap(tenantEntity, userIds); - for (WxCUserCar uc:userCarList) { - WxCUserBasicInfo basicInfo = userMap.get(uc.getCUserId()); - if(basicInfo != null){ - uc.setUserPhone(basicInfo.getPhone()); - } - } } @Override diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 43fc677..7a6a06d 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -16,7 +16,6 @@ import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxLevelConfigMapper; import com.iformall.mapper.WxLevelMerchantMapper; -import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxLevelConfigService; import com.iformall.utils.Constant; import com.iformall.utils.RedisCacheUtils; @@ -52,9 +51,6 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Autowired WxCUserBasicInfoMapper wxCUserBasicInfoMapper; - @Autowired - private WxCUserBasicInfoService wxCUserBasicInfoService; - @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate wxLevelConfigListRedisTemplate; @@ -82,7 +78,6 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { if (i + 1