记得上下班打卡 | git大法好,push需谨慎

Commit c60d136e authored by 张国柄's avatar 张国柄

opt;

parent a7b7f965
package com.liquidnet.service.adam.service;
import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.entity.AdamEnters;
import java.util.List;
public interface IAdamRdmService {
boolean setUidByMobile(String mobile, String uid);
String getUidByMobile(String mobile);
void delUidByMobile(String mobile);
boolean setUidByPlatformOpenId(String platform, String openId, String uid);
String getUidByPlatformOpenId(String platform, String openId);
void delUidByPlatformOpenId(String platform, String openId);
boolean setUserInfoVoByUid(String uid, AdamUserInfoVo vo);
AdamUserInfoVo getUserInfoVoByUid(String uid);
void delUserInfoVoByUid(String uid);
boolean setRealInfoVoByUid(String uid, AdamRealInfoVo vo);
AdamRealInfoVo getRealInfoVoByUid(String uid);
boolean setCertification(int idType, String idNo, String idName);
boolean isCertification(int idType, String idNo, String idName);
boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList);
List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid);
AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform);
void delThirdPartVoListByUid(String uid);
boolean setEntersVoByUid(String uid, List<AdamEntersVo> list);
List<AdamEntersVo> getEntersVoByUid(String uid);
AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId);
List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds);
void delEntersVoByUid(String uid);
boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list);
List<AdamAddressesVo> getAddressesVoByUid(String uid);
AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId);
void delAddressesVoByUid(String uid);
boolean setBlacklistForMember(List<String> uids);
List<String> getBlacklistForMember();
boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo);
AdamUserMemberVo getUserMemberVoByUid(String uid);
void delUserMemberVoByUid(String uid);
AdamMemberSimpleVo getMemberSimpleVo();
boolean setMemberVoByMemberId(String memberId, AdamMemberVo vo);
AdamMemberVo getMemberVoByMemberId(String memberId);
void delMemberVoByMemberId(String memberId);
boolean setMemberPriceVoByMemberId(String memberId, List<AdamMemberPriceVo> vos);
List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId);
AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId);
boolean setMemberRightsVoByMemberId(String memberId, List<AdamMemberRightsVo> vos);
List<AdamMemberRightsVo> getMemberRightsVoByMemberId(String memberId);
String getMemberAgreement();
boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo);
AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo);
void delShotMemberOrderVoByOrderNo(String orderNo);
boolean setMaxMemberNo(int val);
int incrMemberNo();
int getMaxMemberNo();
boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo);
AdamMemberCodeVo getMemberCodeVoByCode(String memberCode);
/**
* Temporarily connect Mongo
*/
AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo);
void delMemberCodeVoByCode(String memberCode);
boolean setTagsForSex(List<AdamTagVo> voList);
List<AdamTagVo> getTagsForSex();
boolean setTagsForMusic(List<AdamTagParentVo> voList);
List<AdamTagParentVo> getTagsForMusic();
}
...@@ -6,8 +6,8 @@ import com.liquidnet.commons.lang.util.CurrentUtil; ...@@ -6,8 +6,8 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil; import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.dto.AdamAddressesParam; import com.liquidnet.service.adam.dto.AdamAddressesParam;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo; import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamAddressesService; import com.liquidnet.service.adam.service.IAdamAddressesService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -39,7 +39,7 @@ import java.util.List; ...@@ -39,7 +39,7 @@ import java.util.List;
@RequestMapping("addr") @RequestMapping("addr")
public class AdamAddressesController { public class AdamAddressesController {
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamAddressesService adamAddressesService; IAdamAddressesService adamAddressesService;
......
...@@ -7,7 +7,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil; ...@@ -7,7 +7,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.dto.AdamEntersParam; import com.liquidnet.service.adam.dto.AdamEntersParam;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo; import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.service.IAdamEntersService; import com.liquidnet.service.adam.service.IAdamEntersService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -40,7 +40,7 @@ import java.util.Optional; ...@@ -40,7 +40,7 @@ import java.util.Optional;
@RequestMapping("enters") @RequestMapping("enters")
public class AdamEntersController { public class AdamEntersController {
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamEntersService adamEntersService; IAdamEntersService adamEntersService;
......
...@@ -59,7 +59,7 @@ public class AdamLoginController { ...@@ -59,7 +59,7 @@ public class AdamLoginController {
@Autowired @Autowired
DefaultAcsClient defaultAcsClient; DefaultAcsClient defaultAcsClient;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamUserService adamUserService; IAdamUserService adamUserService;
......
...@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo; ...@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberSimpleVo;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo; import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.service.IAdamMemberService; import com.liquidnet.service.adam.service.IAdamMemberService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService; import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -31,7 +31,7 @@ import javax.validation.constraints.NotBlank; ...@@ -31,7 +31,7 @@ import javax.validation.constraints.NotBlank;
@RequestMapping("member") @RequestMapping("member")
public class AdamMemberController { public class AdamMemberController {
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamMemberService adamMemberService; IAdamMemberService adamMemberService;
@Autowired @Autowired
......
...@@ -15,7 +15,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderParam; ...@@ -15,7 +15,7 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
import com.liquidnet.service.adam.dto.AdamMemberOrderResult; import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.IAdamMemberOrderService; import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserService; import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -48,7 +48,7 @@ public class AdamMemberOrderController { ...@@ -48,7 +48,7 @@ public class AdamMemberOrderController {
@Autowired @Autowired
Environment env; Environment env;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamMemberOrderService adamMemberOrderService; IAdamMemberOrderService adamMemberOrderService;
@Autowired @Autowired
......
...@@ -10,7 +10,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil; ...@@ -10,7 +10,7 @@ import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.dto.AdamThirdPartParam; import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.AdamUserInfoParam; import com.liquidnet.service.adam.dto.AdamUserInfoParam;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserInfoService; import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.adam.service.IAdamUserService; import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -43,7 +43,7 @@ public class AdamUserController { ...@@ -43,7 +43,7 @@ public class AdamUserController {
@Autowired @Autowired
Environment env; Environment env;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamUserService adamUserService; IAdamUserService adamUserService;
@Autowired @Autowired
......
...@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam; ...@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo; import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamMember; import com.liquidnet.service.adam.entity.AdamMember;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -35,7 +35,7 @@ public class AdamMemberAdminController extends AdamBaseController { ...@@ -35,7 +35,7 @@ public class AdamMemberAdminController extends AdamBaseController {
@Autowired @Autowired
IAdamMemberCodeAdminService adamMemberCodeAdminService; IAdamMemberCodeAdminService adamMemberCodeAdminService;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "添加会员卡") @ApiOperation(value = "添加会员卡")
......
package com.liquidnet.service.adam.service.impl; package com.liquidnet.service.adam.service;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil; import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst; import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
...@@ -16,6 +18,7 @@ import org.springframework.util.CollectionUtils; ...@@ -16,6 +18,7 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -23,18 +26,16 @@ import java.util.stream.Collectors; ...@@ -23,18 +26,16 @@ import java.util.stream.Collectors;
@Slf4j @Slf4j
@Service @Service
public class AdamRdmServiceImpl implements IAdamRdmService { public class AdamRdmService {
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
@Autowired @Autowired
RedisUtil redisUtil; RedisUtil redisUtil;
@Override
public boolean setUidByMobile(String mobile, String uid) { public boolean setUidByMobile(String mobile, String uid) {
return redisUtil.set(AdamRedisConst.IDENTITY_MOBILE.concat(mobile), uid); return redisUtil.set(AdamRedisConst.IDENTITY_MOBILE.concat(mobile), uid);
} }
@Override
public String getUidByMobile(String mobile) { public String getUidByMobile(String mobile) {
String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile); String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -54,17 +55,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -54,17 +55,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return val; return val;
} }
@Override
public void delUidByMobile(String mobile) { public void delUidByMobile(String mobile) {
redisUtil.del(AdamRedisConst.IDENTITY_MOBILE.concat(mobile)); redisUtil.del(AdamRedisConst.IDENTITY_MOBILE.concat(mobile));
} }
@Override
public boolean setUidByPlatformOpenId(String platform, String openId, String uid) { public boolean setUidByPlatformOpenId(String platform, String openId, String uid) {
return redisUtil.set(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId, uid); return redisUtil.set(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId, uid);
} }
@Override
public String getUidByPlatformOpenId(String platform, String openId) { public String getUidByPlatformOpenId(String platform, String openId) {
String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId; String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId;
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -84,17 +82,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -84,17 +82,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return val; return val;
} }
@Override
public void delUidByPlatformOpenId(String platform, String openId) { public void delUidByPlatformOpenId(String platform, String openId) {
redisUtil.del(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId); redisUtil.del(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId);
} }
@Override
public boolean setUserInfoVoByUid(String uid, AdamUserInfoVo vo) { public boolean setUserInfoVoByUid(String uid, AdamUserInfoVo vo) {
return redisUtil.set(AdamRedisConst.INFO_USER.concat(uid), vo); return redisUtil.set(AdamRedisConst.INFO_USER.concat(uid), vo);
} }
@Override
public AdamUserInfoVo getUserInfoVoByUid(String uid) { public AdamUserInfoVo getUserInfoVoByUid(String uid) {
String rk = AdamRedisConst.INFO_USER.concat(uid); String rk = AdamRedisConst.INFO_USER.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -111,17 +106,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -111,17 +106,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public void delUserInfoVoByUid(String uid) { public void delUserInfoVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_USER.concat(uid)); redisUtil.del(AdamRedisConst.INFO_USER.concat(uid));
} }
@Override
public boolean setRealInfoVoByUid(String uid, AdamRealInfoVo vo) { public boolean setRealInfoVoByUid(String uid, AdamRealInfoVo vo) {
return redisUtil.set(AdamRedisConst.INFO_REAL_NAME.concat(uid), vo); return redisUtil.set(AdamRedisConst.INFO_REAL_NAME.concat(uid), vo);
} }
@Override
public AdamRealInfoVo getRealInfoVoByUid(String uid) { public AdamRealInfoVo getRealInfoVoByUid(String uid) {
String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid); String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -142,23 +134,19 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -142,23 +134,19 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public boolean setCertification(int idType, String idNo, String idName) { public boolean setCertification(int idType, String idNo, String idName) {
return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName); return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
} }
@Override
public boolean isCertification(int idType, String idNo, String idName) { public boolean isCertification(int idType, String idNo, String idName) {
String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo); String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
return !StringUtils.isEmpty(o) && o.equals(idName); return !StringUtils.isEmpty(o) && o.equals(idName);
} }
@Override
public boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList) { public boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList) {
return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY.concat(uid), voList); return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY.concat(uid), voList);
} }
@Override
public List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid) { public List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid) {
String rk = AdamRedisConst.INFO_THIRD_PARTY.concat(uid); String rk = AdamRedisConst.INFO_THIRD_PARTY.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -175,7 +163,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -175,7 +163,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return thirdPartInfoVos; return thirdPartInfoVos;
} }
@Override
public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) { public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) {
List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid); List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid);
if (!CollectionUtils.isEmpty(vos)) { if (!CollectionUtils.isEmpty(vos)) {
...@@ -189,17 +176,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -189,17 +176,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return null; return null;
} }
@Override
public void delThirdPartVoListByUid(String uid) { public void delThirdPartVoListByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_THIRD_PARTY.concat(uid)); redisUtil.del(AdamRedisConst.INFO_THIRD_PARTY.concat(uid));
} }
@Override
public boolean setEntersVoByUid(String uid, List<AdamEntersVo> list) { public boolean setEntersVoByUid(String uid, List<AdamEntersVo> list) {
return redisUtil.set(AdamRedisConst.INFO_ENTERS.concat(uid), list); return redisUtil.set(AdamRedisConst.INFO_ENTERS.concat(uid), list);
} }
@Override
public List<AdamEntersVo> getEntersVoByUid(String uid) { public List<AdamEntersVo> getEntersVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ENTERS.concat(uid); String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -218,28 +202,23 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -218,28 +202,23 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vos; return vos;
} }
@Override
public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) { public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null); return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
} }
@Override
public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) { public List<AdamEntersVo> getEntersVoByUidEntersIds(String uid, String... entersIds) {
List<String> entersIdList = Arrays.asList(entersIds); List<String> entersIdList = Arrays.asList(entersIds);
return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList()); return this.getEntersVoByUid(uid).stream().filter(r -> entersIdList.contains(r.getEntersId())).collect(Collectors.toList());
} }
@Override
public void delEntersVoByUid(String uid) { public void delEntersVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_ENTERS.concat(uid)); redisUtil.del(AdamRedisConst.INFO_ENTERS.concat(uid));
} }
@Override
public boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list) { public boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list) {
return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list); return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list);
} }
@Override
public List<AdamAddressesVo> getAddressesVoByUid(String uid) { public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid); String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -258,32 +237,26 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -258,32 +237,26 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vos; return vos;
} }
@Override
public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) { public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null); return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
} }
@Override
public void delAddressesVoByUid(String uid) { public void delAddressesVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_ADDRESSES.concat(uid)); redisUtil.del(AdamRedisConst.INFO_ADDRESSES.concat(uid));
} }
@Override
public boolean setBlacklistForMember(List<String> uids) { public boolean setBlacklistForMember(List<String> uids) {
return redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, uids); return redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, uids);
} }
@Override
public List<String> getBlacklistForMember() { public List<String> getBlacklistForMember() {
return (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID); return (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
} }
@Override
public boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo) { public boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo) {
return redisUtil.set(AdamRedisConst.INFO_USER_MEMBER.concat(uid), vo); return redisUtil.set(AdamRedisConst.INFO_USER_MEMBER.concat(uid), vo);
} }
@Override
public AdamUserMemberVo getUserMemberVoByUid(String uid) { public AdamUserMemberVo getUserMemberVoByUid(String uid) {
String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid); String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -302,12 +275,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -302,12 +275,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public void delUserMemberVoByUid(String uid) { public void delUserMemberVoByUid(String uid) {
redisUtil.del(AdamRedisConst.INFO_USER_MEMBER.concat(uid)); redisUtil.del(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
} }
@Override
public AdamMemberSimpleVo getMemberSimpleVo() { public AdamMemberSimpleVo getMemberSimpleVo() {
AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE); AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
if (null == vo) { if (null == vo) {
...@@ -325,12 +296,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -325,12 +296,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public boolean setMemberVoByMemberId(String memberId, AdamMemberVo vo) { public boolean setMemberVoByMemberId(String memberId, AdamMemberVo vo) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId), vo); return redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId), vo);
} }
@Override
public AdamMemberVo getMemberVoByMemberId(String memberId) { public AdamMemberVo getMemberVoByMemberId(String memberId) {
String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId); String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -348,17 +317,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -348,17 +317,14 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public void delMemberVoByMemberId(String memberId) { public void delMemberVoByMemberId(String memberId) {
redisUtil.del(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId)); redisUtil.del(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId));
} }
@Override
public boolean setMemberPriceVoByMemberId(String memberId, List<AdamMemberPriceVo> vos) { public boolean setMemberPriceVoByMemberId(String memberId, List<AdamMemberPriceVo> vos) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId), vos); return redisUtil.set(AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId), vos);
} }
@Override
public List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId) { public List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId) {
String key = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId); String key = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -377,7 +343,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -377,7 +343,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vos; return vos;
} }
@Override
public AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId) { public AdamMemberPriceVo getMemberPriceVoByPriceId(String memberId, String memberPriceId) {
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
List<AdamMemberPriceVo> vos = this.getMemberPriceVoByMemberId(memberId); List<AdamMemberPriceVo> vos = this.getMemberPriceVoByMemberId(memberId);
...@@ -395,12 +360,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -395,12 +360,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return null; return null;
} }
@Override
public boolean setMemberRightsVoByMemberId(String memberId, List<AdamMemberRightsVo> vos) { public boolean setMemberRightsVoByMemberId(String memberId, List<AdamMemberRightsVo> vos) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(memberId), vos); return redisUtil.set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(memberId), vos);
} }
@Override
public List<AdamMemberRightsVo> getMemberRightsVoByMemberId(String memberId) { public List<AdamMemberRightsVo> getMemberRightsVoByMemberId(String memberId) {
List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(memberId)); List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(memberId));
if (CollectionUtils.isEmpty(vos)) { if (CollectionUtils.isEmpty(vos)) {
...@@ -419,7 +382,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -419,7 +382,6 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vos; return vos;
} }
@Override
public String getMemberAgreement() { public String getMemberAgreement() {
String val = (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_AGREEMENT); String val = (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_AGREEMENT);
if (StringUtils.isEmpty(val)) { if (StringUtils.isEmpty(val)) {
...@@ -430,12 +392,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -430,12 +392,10 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return val; return val;
} }
@Override
public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) { public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) {
return redisUtil.set(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo, vo); return redisUtil.set(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo, vo);
} }
@Override
public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) { public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
String key = AdamRedisConst.SHOT_MEMBER_ORDER + orderNo; String key = AdamRedisConst.SHOT_MEMBER_ORDER + orderNo;
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -454,33 +414,27 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -454,33 +414,27 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public void delShotMemberOrderVoByOrderNo(String orderNo) { public void delShotMemberOrderVoByOrderNo(String orderNo) {
redisUtil.del(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo); redisUtil.del(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo);
} }
@Override
public boolean setMaxMemberNo(int val) { public boolean setMaxMemberNo(int val) {
return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val); return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val);
} }
@Override
public int incrMemberNo() { public int incrMemberNo() {
return (int) redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO, 1); return (int) redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO, 1);
} }
@Override
public int getMaxMemberNo() { public int getMaxMemberNo() {
Object o = redisUtil.get(AdamRedisConst.INCR_MEMBER_NO); Object o = redisUtil.get(AdamRedisConst.INCR_MEMBER_NO);
return null == o ? -1 : (int) o; return null == o ? -1 : (int) o;
} }
@Override
public boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo) { public boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo) {
return redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo); return redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
} }
@Override
public AdamMemberCodeVo getMemberCodeVoByCode(String memberCode) { public AdamMemberCodeVo getMemberCodeVoByCode(String memberCode) {
String key = AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode); String key = AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -498,7 +452,9 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -498,7 +452,9 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override /**
* Temporarily connect Mongo
*/
public AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo) { public AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo) {
Query query = Query.query(Criteria.where("buyOrderNo").is(buyOrderNo)); Query query = Query.query(Criteria.where("buyOrderNo").is(buyOrderNo));
query.fields().include("code").include("memberNo").include("state").include("type"); query.fields().include("code").include("memberNo").include("state").include("type");
...@@ -510,28 +466,31 @@ public class AdamRdmServiceImpl implements IAdamRdmService { ...@@ -510,28 +466,31 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
return vo; return vo;
} }
@Override
public void delMemberCodeVoByCode(String memberCode) { public void delMemberCodeVoByCode(String memberCode) {
redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode)); redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode));
} }
@Override
public boolean setTagsForSex(List<AdamTagVo> voList) { public boolean setTagsForSex(List<AdamTagVo> voList) {
return redisUtil.set(AdamRedisConst.INFO_TAGS_SEX, voList); return redisUtil.set(AdamRedisConst.INFO_TAGS_SEX, voList);
} }
@Override
public List<AdamTagVo> getTagsForSex() { public List<AdamTagVo> getTagsForSex() {
return (List<AdamTagVo>) redisUtil.get(AdamRedisConst.INFO_TAGS_SEX); return (List<AdamTagVo>) redisUtil.get(AdamRedisConst.INFO_TAGS_SEX);
} }
@Override
public boolean setTagsForMusic(List<AdamTagParentVo> voList) { public boolean setTagsForMusic(List<AdamTagParentVo> voList) {
return redisUtil.set(AdamRedisConst.INFO_TAGS_MUSIC, voList); return redisUtil.set(AdamRedisConst.INFO_TAGS_MUSIC, voList);
} }
@Override
public List<AdamTagParentVo> getTagsForMusic() { public List<AdamTagParentVo> getTagsForMusic() {
return (List<AdamTagParentVo>) redisUtil.get(AdamRedisConst.INFO_TAGS_MUSIC); return (List<AdamTagParentVo>) redisUtil.get(AdamRedisConst.INFO_TAGS_MUSIC);
} }
/* ========================================================== | Other micro-service data inquiry */
public KylinPerformanceVo kylinPerformanceVos(String performancesId) {
return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performancesId);
}
} }
...@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*; ...@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.AdamAddressesParam; import com.liquidnet.service.adam.dto.AdamAddressesParam;
import com.liquidnet.service.adam.dto.vo.AdamAddressesVo; import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
import com.liquidnet.service.adam.service.IAdamAddressesService; import com.liquidnet.service.adam.service.IAdamAddressesService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
...@@ -22,8 +22,6 @@ import org.springframework.data.mongodb.core.convert.MongoConverter; ...@@ -22,8 +22,6 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -49,7 +47,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService { ...@@ -49,7 +47,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Override @Override
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) // @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
......
...@@ -6,7 +6,7 @@ import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo; ...@@ -6,7 +6,7 @@ import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo; import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo; import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.service.IAdamCollectionService; import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient; import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
...@@ -45,7 +45,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService { ...@@ -45,7 +45,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
/* ---------------- 外部服务API ---------------- */ /* ---------------- 外部服务API ---------------- */
@Autowired @Autowired
......
...@@ -8,7 +8,7 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo; ...@@ -8,7 +8,7 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedVo; import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
import com.liquidnet.service.adam.service.IAdamDisposedService; import com.liquidnet.service.adam.service.IAdamDisposedService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient; import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
...@@ -47,7 +47,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService { ...@@ -47,7 +47,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
/* ---------------- 外部服务API ---------------- */ /* ---------------- 外部服务API ---------------- */
......
...@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*; ...@@ -6,7 +6,7 @@ import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.dto.AdamEntersParam; import com.liquidnet.service.adam.dto.AdamEntersParam;
import com.liquidnet.service.adam.dto.vo.AdamEntersVo; import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
import com.liquidnet.service.adam.service.IAdamEntersService; import com.liquidnet.service.adam.service.IAdamEntersService;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
...@@ -50,7 +50,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService { ...@@ -50,7 +50,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification"; private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";
......
...@@ -11,8 +11,8 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult; ...@@ -11,8 +11,8 @@ import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.entity.AdamMemberOrder; import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper; import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamMemberOrderService; import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService; import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.adam.util.MemberUtil; import com.liquidnet.service.adam.util.MemberUtil;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -49,7 +49,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe ...@@ -49,7 +49,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
IAdamUserMemberService adamUserMemberService; IAdamUserMemberService adamUserMemberService;
......
...@@ -9,7 +9,7 @@ import com.liquidnet.commons.lang.util.JsonUtils; ...@@ -9,7 +9,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo; import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUserInfo; import com.liquidnet.service.adam.entity.AdamUserInfo;
import com.liquidnet.service.adam.mapper.AdamUserInfoMapper; import com.liquidnet.service.adam.mapper.AdamUserInfoMapper;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserInfoService; import com.liquidnet.service.adam.service.IAdamUserInfoService;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
import com.mongodb.client.model.FindOneAndUpdateOptions; import com.mongodb.client.model.FindOneAndUpdateOptions;
...@@ -45,7 +45,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada ...@@ -45,7 +45,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Autowired @Autowired
RabbitTemplate rabbitTemplate; RabbitTemplate rabbitTemplate;
@Autowired @Autowired
......
...@@ -6,7 +6,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberVo; ...@@ -6,7 +6,7 @@ import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo; import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
import com.liquidnet.service.adam.entity.AdamUserMember; import com.liquidnet.service.adam.entity.AdamUserMember;
import com.liquidnet.service.adam.mapper.AdamUserMemberMapper; import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService; import com.liquidnet.service.adam.service.IAdamUserMemberService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -26,7 +26,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper, ...@@ -26,7 +26,7 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Override @Override
public String getNextMemberNo(String memberId) { public String getNextMemberNo(String memberId) {
......
...@@ -12,8 +12,8 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam; ...@@ -12,8 +12,8 @@ import com.liquidnet.service.adam.dto.AdamThirdPartParam;
import com.liquidnet.service.adam.dto.vo.*; import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.entity.AdamEnters; import com.liquidnet.service.adam.entity.AdamEnters;
import com.liquidnet.service.adam.entity.AdamRealName; import com.liquidnet.service.adam.entity.AdamRealName;
import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamEntersService; import com.liquidnet.service.adam.service.IAdamEntersService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.adam.service.IAdamRealNameService; import com.liquidnet.service.adam.service.IAdamRealNameService;
import com.liquidnet.service.adam.service.IAdamUserService; import com.liquidnet.service.adam.service.IAdamUserService;
import com.liquidnet.service.base.ErrorMapping; import com.liquidnet.service.base.ErrorMapping;
...@@ -67,7 +67,7 @@ public class AdamUserServiceImpl implements IAdamUserService { ...@@ -67,7 +67,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
@Autowired @Autowired
IAdamRealNameService adamRealNameService; IAdamRealNameService adamRealNameService;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
......
...@@ -5,7 +5,7 @@ import com.liquidnet.service.adam.dto.AdamMemberCodeParam; ...@@ -5,7 +5,7 @@ import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo; import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
import com.liquidnet.service.adam.entity.AdamMemberCode; import com.liquidnet.service.adam.entity.AdamMemberCode;
import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper; import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService; import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
import com.liquidnet.service.adam.util.MemberUtil; import com.liquidnet.service.adam.util.MemberUtil;
...@@ -29,7 +29,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa ...@@ -29,7 +29,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
@Autowired @Autowired
IAdamUserMemberService adamUserMemberService; IAdamUserMemberService adamUserMemberService;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Override @Override
public String createGiftCode(AdamMemberCodeParam param) { public String createGiftCode(AdamMemberCodeParam param) {
......
...@@ -8,7 +8,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam; ...@@ -8,7 +8,7 @@ import com.liquidnet.service.adam.dto.AdamMemberParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberVo; import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
import com.liquidnet.service.adam.entity.AdamMember; import com.liquidnet.service.adam.entity.AdamMember;
import com.liquidnet.service.adam.mapper.AdamMemberMapper; import com.liquidnet.service.adam.mapper.AdamMemberMapper;
import com.liquidnet.service.adam.service.IAdamRdmService; import com.liquidnet.service.adam.service.AdamRdmService;
import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService; import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -31,7 +31,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad ...@@ -31,7 +31,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
@Autowired @Autowired
MongoTemplate mongoTemplate; MongoTemplate mongoTemplate;
@Autowired @Autowired
IAdamRdmService adamRdmService; AdamRdmService adamRdmService;
@Override @Override
public AdamMemberVo add(AdamMemberParam param) { public AdamMemberVo add(AdamMemberParam param) {
......
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