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

Skip to content

L
liquidnet-bus-v1
Commit 93b99dc8 authored by 张国柄's avatar 张国柄
Browse files
Options

RDS多数据源调整:adam、candy;

parent 278dffd5
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 88 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberCodeAdminController.java
View file @ 93b99dc8
......@@ -40,9 +40,6 @@ public class AdamMemberCodeAdminController extends BaseController {
@Autowired
IAdamMemberPriceAdminService adamMemberPriceAdminService;
@Autowired
RedisDataSourceUtil redisDataSourceUtil;
@GetMapping("mgt")
public String viewCodeMgt(@RequestParam String memberId, ModelMap mmap) {
mmap.put("memberId", memberId);
......@@ -147,59 +144,4 @@ public class AdamMemberCodeAdminController extends BaseController {
});
return excelUtil.exportExcel(excelList, "会员码数据");
}
//
// @RequiresPermissions("adam:member:code:invalid")
// @Log(title = "会员管理:会员码:失效", businessType = BusinessType.UPDATE)
// @PostMapping("invalid")
// @ResponseBody
// public AjaxResult invalid(AdamMemberCodeOptParam optParam) {
// return toAjax(this.invalidRecoverCode(optParam, 4));
// }
//
// /**
// * 失效｜退回会员兑换码
// *
// * @param optParam AdamMemberCodeOptParam
// * @param state 状态[0-可用|1-已用|2-无效|3-过期｜4-失效｜5-退回]
// * @return boolean
// */
// private boolean invalidRecoverCode(AdamMemberCodeOptParam optParam, int state) {
// String loginName = ShiroUtils.getLoginName();
// LocalDateTime now = LocalDateTime.now();
// logger.info("by:{},optParam:{},state:{}", loginName, optParam, state);
//
// int beforeState = state == 4 ? 0 : (state == 5 ? 1 : -1);
// ArrayList<String> updateCodeList = CollectionUtil.arrayListString();
// optParam.getCodes().forEach(r -> {
// String key = AdamRedisConst.INFO_MEMBER_CODE.concat(r);
// AdamMemberCodeVo vo = (AdamMemberCodeVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
// if (null != vo && vo.getState() == beforeState) {
// redisDataSourceUtil.getRedisKylinUtil().del(key);
//
// updateCodeList.add(vo.getCode());
// }
// });
//
// if (!CollectionUtils.isEmpty(updateCodeList)) {
// LambdaUpdateWrapper<AdamMemberCode> memberCodeUpdateWrapper = Wrappers.lambdaUpdate(AdamMemberCode.class);
// memberCodeUpdateWrapper.eq(AdamMemberCode::getMemberId, optParam.getMemberId());
// memberCodeUpdateWrapper.eq(AdamMemberCode::getState, beforeState);
// memberCodeUpdateWrapper.in(AdamMemberCode::getCode, updateCodeList);
//
// memberCodeUpdateWrapper.set(AdamMemberCode::getState, state);
// memberCodeUpdateWrapper.set(AdamMemberCode::getOperator, loginName);
// memberCodeUpdateWrapper.set(AdamMemberCode::getUpdatedAt, now);
//
// return adamMemberCodeAdminService.update(memberCodeUpdateWrapper);
// }
// return false;
// }
//
// @RequiresPermissions("adam:member:code:recover")
// @Log(title = "会员管理:会员码:退回", businessType = BusinessType.UPDATE)
// @PostMapping("recover")
// @ResponseBody
// public AjaxResult recover(AdamMemberCodeOptParam optParam) {
// return toAjax(this.invalidRecoverCode(optParam, 5));
// }
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java
View file @ 93b99dc8
......@@ -36,7 +36,7 @@ public class AdamUserMemberAdminController {
@ApiOperation(value = "列表")
@PostMapping("blk/lis")
public ResponseDto<List<String>> listBlack() {
return ResponseDto.success((List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID));
return ResponseDto.success((List<String>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID));
}
@Log(title = "会员管理:会员黑名单:添加", businessType = BusinessType.INSERT)
......@@ -53,14 +53,14 @@ public class AdamUserMemberAdminController {
invalidList.add(uid);
}
}
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (CollectionUtils.isEmpty(blacklist)) {
blacklist = existList;
} else {
blacklist.addAll(existList);
}
if (!CollectionUtils.isEmpty(blacklist)) {
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
} else {
log.warn("###blacklist.add:failed,invalidList:{},existList:{},opts:{}", invalidList.size(), existList.size(), opts);
}
......@@ -73,12 +73,12 @@ public class AdamUserMemberAdminController {
@PostMapping("blk/del")
public ResponseDto<List<String>> delBlack(@NotBlank(message = "会员ID不能为空") @RequestParam String opts) {
String[] uidArr = opts.split(",");
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> blacklist = (List<String>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (!CollectionUtils.isEmpty(blacklist)) {
for (String uid : uidArr) {
blacklist.remove(uid);
}
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
}
return ResponseDto.success(blacklist);
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java
View file @ 93b99dc8
......@@ -13,6 +13,7 @@ import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
import com.liquidnet.client.admin.zhengzai.candy.dto.CandyCouponCodeExcelDto;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponCodeAdminService;
import com.liquidnet.client.admin.zhengzai.candy.service.ICandyUserCouponAdminService;
import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
......@@ -114,13 +115,14 @@ public class CandyCouponCodeAdminController extends BaseController {
couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getCouponId, couponId);
List<CandyCouponCode> list = candyCouponCodeAdminService.list(couponCodeLambdaQueryWrapper);
AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
List<String> ccodeUpdateList = CollectionUtil.arrayListString();
list.forEach(r -> {
String key = CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode());
CandyCouponCodeDto dto = (CandyCouponCodeDto) redisDataSourceUtil.getRedisKylinUtil().get(key);
CandyCouponCodeDto dto = (CandyCouponCodeDto) redisCandyUtil.get(key);
if (null != dto && dto.getState() == 0) {
dto.setState(4);
redisDataSourceUtil.getRedisKylinUtil().set(key, dto);
redisCandyUtil.set(key, dto);
ccodeUpdateList.add(dto.getCcode());
}
});
......@@ -157,10 +159,11 @@ public class CandyCouponCodeAdminController extends BaseController {
couponCodeLambdaQueryWrapper.eq(CandyCouponCode::getCouponId, couponId);
List<CandyCouponCode> list = candyCouponCodeAdminService.list(couponCodeLambdaQueryWrapper);
AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
List<String> ccodeUpdateList = CollectionUtil.arrayListString();
list.forEach(r -> {
String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getRedeemUid());
List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisCandyUtil.get(uckey);
if (!CollectionUtils.isEmpty(vos)) {
vos.removeIf(rv -> rv.getUcouponId().equals(r.getUcouponId()));
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberCodeAdminServiceImpl.java
View file @ 93b99dc8
......@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.adam.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.commons.lang.util.CollectionUtil;
......@@ -35,13 +36,14 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
ArrayList<String> codeList = CollectionUtil.arrayListString();
Integer genNum = param.getGenNum();
LocalDateTime now = LocalDateTime.now();
AbstractRedisUtil redisAdamUtil = redisDataSourceUtil.getRedisAdamUtil();
for (int i = 0; i < genNum; i++) {
String mCode;
boolean exists;
do {
mCode = MemberUtil.freeCode();
String key = AdamRedisConst.INFO_MEMBER_CODE.concat(mCode);
exists = redisDataSourceUtil.getRedisKylinUtil().hasKey(key);
exists = redisAdamUtil.hasKey(key);
} while (exists);
AdamMemberCode initMemberCode = new AdamMemberCode();
......@@ -60,7 +62,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
memberCodeList.add(initMemberCode);
codeList.add(mCode);
//redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CODE.concat(mCode), AdamMemberCodeVo.getNew().copy(initMemberCode));
//redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_CODE.concat(mCode), AdamMemberCodeVo.getNew().copy(initMemberCode));
}
if (this.saveBatch(memberCodeList, memberCodeList.size())) {
......@@ -71,7 +73,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
list.forEach(r -> {
r.setMemberNo(getNextMemberNo(param.getMemberId()));
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CODE.concat(r.getCode()), AdamMemberCodeVo.getNew().copy(r));
redisAdamUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(r.getCode()), AdamMemberCodeVo.getNew().copy(r));
});
this.updateBatchById(list, list.size());
return true;
......@@ -115,15 +117,15 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
}
private int getMaxMemberNo() {
Object o = redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INCR_MEMBER_NO);
Object o = redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INCR_MEMBER_NO);
return null == o ? -1 : (int) o;
}
public boolean setMaxMemberNo(int val) {
return redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INCR_MEMBER_NO, val);
return redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INCR_MEMBER_NO, val);
}
public int incrMemberNo() {
return (int) redisDataSourceUtil.getRedisKylinUtil().incr(AdamRedisConst.INCR_MEMBER_NO, 1);
return (int) redisDataSourceUtil.getRedisAdamUtil().incr(AdamRedisConst.INCR_MEMBER_NO, 1);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberOrderAdminServiceImpl.java
View file @ 93b99dc8
......@@ -175,7 +175,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
adamMemberOrderMapper.updateById(updateInfoMemberOrder);
String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisDataSourceUtil.getRedisKylinUtil().get(moKey);
ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisDataSourceUtil.getRedisAdamUtil().get(moKey);
int idx = IntStream.range(0, vos.size())
.filter(i -> vos.get(i).getOrderNo().equals(memberOrder.getOrderNo()))
.findFirst().orElse(-1);
......@@ -183,7 +183,7 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
vo.setState(4);
vo.setUpdatedAt(now);
vos.set(idx, vo);
redisDataSourceUtil.getRedisKylinUtil().set(moKey, vos);
redisDataSourceUtil.getRedisAdamUtil().set(moKey, vos);
if (memberRefund.getRenewable() == 2) {// 拉黑用户，直接更新用户会员状态信息
AdamUserMember updateUserMember = new AdamUserMember();
......@@ -197,20 +197,20 @@ public class AdamMemberOrderAdminServiceImpl extends ServiceImpl<AdamMemberOrder
adamUserMemberMapper.update(updateUserMember, userMemberLambdaUpdateWrapper);
String umkey = AdamRedisConst.INFO_USER_MEMBER + memberOrder.getUid();
AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(umkey);
AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisDataSourceUtil.getRedisAdamUtil().get(umkey);
userMemberVo.setState(2);
userMemberVo.setExpiryAt(now);
userMemberVo.setUpdatedAt(now);
redisDataSourceUtil.getRedisKylinUtil().set(umkey, userMemberVo);
redisDataSourceUtil.getRedisAdamUtil().set(umkey, userMemberVo);
List<String> uidBlackList = (List<String>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
List<String> uidBlackList = (List<String>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.BLK_LIST_MEMBER_UID);
if (CollectionUtils.isEmpty(uidBlackList)) {
uidBlackList = CollectionUtil.arrayListString();
}
uidBlackList.add(memberOrder.getUid());
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.BLK_LIST_MEMBER_UID, uidBlackList);
}
return AjaxResult.success();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberPriceAdminServiceImpl.java
View file @ 93b99dc8
......@@ -43,7 +43,7 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
//
// AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(info);
//
// redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_PRICE.concat(vo.getMemberPriceId()), vo);
// redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_PRICE.concat(vo.getMemberPriceId()), vo);
//
// return vo;
// }
......@@ -98,11 +98,11 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
String memberPriceId = saveOrUpdateInfo.getMemberPriceId();
String mpKey = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisDataSourceUtil.getRedisKylinUtil().get(mpKey);
List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisDataSourceUtil.getRedisAdamUtil().get(mpKey);
vos.removeIf(r -> (r.getMemberId().equals(memberId) && r.getMemberPriceId().equals(memberPriceId)));
vos.add(AdamMemberPriceVo.getNew().copy(saveOrUpdateInfo));
redisDataSourceUtil.getRedisKylinUtil().set(mpKey, vos);
redisDataSourceUtil.getRedisAdamUtil().set(mpKey, vos);
return true;
}
throw new LiquidnetServiceException("-1", "会员价格编辑失败");
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberRightsAdminServiceImpl.java
View file @ 93b99dc8
......@@ -75,7 +75,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
if (saveOrUpadateRst) {
// 同步REDIS:用户端:购买会员详情页:权益列表
List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()));
List<AdamMemberRightsVo> vos = (List<AdamMemberRightsVo>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()));
if (CollectionUtils.isEmpty(vos)) {
vos = new ArrayList<>();
}
......@@ -105,7 +105,7 @@ public class AdamMemberRightsAdminServiceImpl extends ServiceImpl<AdamMemberRigh
}
}
}
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()), vos);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(param.getMemberId()), vos);
}
return saveOrUpadateRst;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberServiceAdminImpl.java
View file @ 93b99dc8
......@@ -44,7 +44,7 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
adamMemberMapper.insert(adamMember);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
}
@Override
......@@ -63,8 +63,8 @@ public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, Ad
adamMember = adamMemberMapper.selectOne(updateMemberWrapper);
AdamMemberVo vo = AdamMemberVo.getNew().copy(adamMember);
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisDataSourceUtil.getRedisKylinUtil().del(AdamRedisConst.INFO_MEMBER_SIMPLE);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(vo.getMemberId()), vo);
redisDataSourceUtil.getRedisAdamUtil().del(AdamRedisConst.INFO_MEMBER_SIMPLE);
return true;
}
return false;
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java
View file @ 93b99dc8
......@@ -370,7 +370,7 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
List<AdamMemberRightsCouponRuleVo> memberRightsCouponRuleVoList = this.copyFromCandyCouponRule(initCouponRuleList);
List<AdamMemberRightsCouponVo> memberRightsCouponVoList =
(List<AdamMemberRightsCouponVo>) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()));
(List<AdamMemberRightsCouponVo>) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()));
if (editing) {// 编辑操作
memberRightsCouponVoList.removeIf(r -> r.getCouponId().equals(updateCoupon.getCouponId()));
} else {// 新增操作
......@@ -399,6 +399,6 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
}
}
redisDataSourceUtil.getRedisKylinUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()), memberRightsCouponVoList);
redisDataSourceUtil.getRedisAdamUtil().set(AdamRedisConst.INFO_MEMBER_RIGHTS_COUPON.concat(updateMgtCoupon.getMcouponId()), memberRightsCouponVoList);
}
}
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