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

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/candy/task/CandyCouponDueTaskController.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.controller.candy.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.service.base.ResponseDto;
@@ -110,14 +111,15 @@ public class CandyCouponDueTaskController {
 
             if (!CollectionUtils.isEmpty(updateCouponCodeList)) {
                 if (platformCandyCouponCodeService.updateBatchById(updateCouponCodeList, updateCouponCodeList.size())) {
+                    AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                     updateCouponCodeList.forEach(r -> {
                         String ccKey = CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode());
 
-                        CandyCouponCodeDto dto = (CandyCouponCodeDto) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
+                        CandyCouponCodeDto dto = (CandyCouponCodeDto) redisCandyUtil.get(ccKey);
 
                         if (null != dto) {
                             dto.setState(3);
-                            redisDataSourceUtil.getRedisKylinUtil().set(ccKey, dto);
+                            redisCandyUtil.set(ccKey, dto);
                         }
                         pl.getAndIncrement();
                     });
@@ -196,8 +198,9 @@ public class CandyCouponDueTaskController {
 
             if (!CollectionUtils.isEmpty(updateCommonCouponList)) {
                 if (platformCandyCommonCouponService.updateBatchById(updateCommonCouponList, updateCommonCouponList.size())) {
+                    AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                     String ccKey = CandyRedisConst.BASIC_COMMON_COUPON;
-                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
+                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisCandyUtil.get(ccKey);
 
                     if (!CollectionUtils.isEmpty(vos)) {
                         Map<String, CandyCommonCouponBasicDto> vosMap = vos.stream().collect(Collectors.toMap(CandyCommonCouponBasicDto::getCcouponId, t -> t));
@@ -209,7 +212,7 @@ public class CandyCouponDueTaskController {
                             vos.add(commonCouponBasicDto);
                         });
 
-                        redisDataSourceUtil.getRedisKylinUtil().set(ccKey, vos);
+                        redisCandyUtil.set(ccKey, vos);
                     }
                 } else {
                     throw new LiquidnetServiceException("-1", String.format("券到期处理失败[updateCommonCouponList.size=%s]", updateCommonCouponList.size()));
@@ -270,9 +273,10 @@ public class CandyCouponDueTaskController {
                     // 需要更新的用户券记录按UID分组处理
                     Map<String, List<CandyUserCoupon>> userCouponListByUidMap = updateUserCouponList.stream().collect(Collectors.groupingBy(CandyUserCoupon::getUid));
 
+                    AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                     userCouponListByUidMap.forEach((uid, updateUserCouponListByUid) -> {
                         String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(uid);
-                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
+                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisCandyUtil.get(uckey);
 
                         if (!CollectionUtils.isEmpty(vos)) {
                             updateUserCouponListByUid.forEach(r -> {
@@ -286,7 +290,7 @@ public class CandyCouponDueTaskController {
                                 }
                                 pl.getAndIncrement();
                             });
-                            redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
+                            redisCandyUtil.set(uckey, vos);
                         }
                     });
                 } else {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/PlatformMemberRefundService.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.adam;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
@@ -98,24 +99,27 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
         LocalDateTime newExpiryAt = null;
         List<String> removeUcouponIdList = null;
 
+        AbstractRedisUtil redisAdamUtil = redisDataSourceUtil.getRedisAdamUtil();
+        AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
+
         {// 同步用户端信息
             // 同步更新REDIS会员订单信息
             String moKey = AdamRedisConst.INFO_MEMBER_ORDER + memberOrder.getUid();
-            ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisDataSourceUtil.getRedisKylinUtil().get(moKey);
+            ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisAdamUtil.get(moKey);
             int idx = IntStream.range(0, vos.size()).filter(i -> vos.get(i).getOrderNo().equals(memberOrder.getOrderNo())).findFirst().orElse(-1);
             AdamMemberOrderVo vo = vos.get(idx);
             vo.setState(5);
             vo.setUpdatedAt(now);
             vos.set(idx, vo);
-            boolean syncVo = redisDataSourceUtil.getRedisKylinUtil().set(moKey, vos);
+            boolean syncVo = redisAdamUtil.set(moKey, vos);
             log.info("###会员退款回调处理成功:更新REDIS会员订单信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
             String umKey = AdamRedisConst.INFO_USER_MEMBER.concat(memberOrder.getUid());
-            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(umKey);
+            AdamUserMemberVo userMemberVo = (AdamUserMemberVo) redisAdamUtil.get(umKey);
 
             // 用户会员权益券信息
             String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(memberOrder.getUid());
-            List<CandyUserCouponBasicDto> userCouponBasicDtoList = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
+            List<CandyUserCouponBasicDto> userCouponBasicDtoList = (List<CandyUserCouponBasicDto>) redisCandyUtil.get(uckey);
 
             // 同步更新REDIS会员信息
             if (userMemberVo.getState() == 1) {// 非拉黑用户，则更新到期时间为减去订单标记的会员有效期的日期
@@ -131,7 +135,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
                 userMemberVo.setExpiryAt(newExpiryAt);
                 userMemberVo.setUpdatedAt(now);
 
-                syncVo = redisDataSourceUtil.getRedisKylinUtil().set(umKey, userMemberVo);
+                syncVo = redisAdamUtil.set(umKey, userMemberVo);
                 log.info("###会员退款回调处理成功:更新REDIS会员信息{}[orderNo:{},uid:{}]", syncVo ? "成功" : "失败", orderNo, memberOrder.getUid());
 
                 // 同步更新MYSQL会员信息
@@ -160,7 +164,7 @@ public class PlatformMemberRefundService extends ServiceImpl<AdamMemberRefundMap
             if (!CollectionUtils.isEmpty(removeUcouponIdList)) {
                 List<String> finalRemoveUcouponIdList = removeUcouponIdList;
                 userCouponBasicDtoList.removeIf(r -> finalRemoveUcouponIdList.contains(r.getUcouponId()));
-                redisDataSourceUtil.getRedisKylinUtil().set(uckey, userCouponBasicDtoList);
+                redisCandyUtil.set(uckey, userCouponBasicDtoList);
 
                 // 同步更新MYSQL用户会员权益券信息
                 LambdaUpdateWrapper<CandyUserCoupon> candyUserCouponLambdaUpdateWrapper = Wrappers.lambdaUpdate(CandyUserCoupon.class);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCouponService.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.platform.service.impl.candy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.IDGenerator;
@@ -52,7 +53,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         couponInfoDto.setUseRules(couponRuleDtoList);
 
         String couponInfoDtoKey = CandyRedisConst.BASIC_COUPON_INFO.concat(couponInfoDto.getCouponId());
-        redisDataSourceUtil.getRedisKylinUtil().set(couponInfoDtoKey, couponInfoDto);
+        redisDataSourceUtil.getRedisCandyUtil().set(couponInfoDtoKey, couponInfoDto);
 
         switch (coupon.getBindType()) {// 领取方式[0-用户输入兑换｜1-发放至用户]
             case 0:
@@ -110,8 +111,9 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
         if (!initCouponCodeList.isEmpty()) {
             if (platformCandyCouponCodeService.saveBatch(initCouponCodeList)) {
+                AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                 initCouponCodeList.forEach(r -> {
-                    redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode()), CandyCouponCodeDto.getNew().copy(r));
+                    redisCandyUtil.set(CandyRedisConst.BASIC_COUPON_CODE.concat(r.getCcode()), CandyCouponCodeDto.getNew().copy(r));
                 });
 
                 initCouponCodeList.clear();
@@ -152,16 +154,17 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
         if (!initCommonCouponList.isEmpty()) {
             if (platformCandyCommonCouponService.saveBatch(initCommonCouponList, initCommonCouponList.size())) {
+                AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                 initCommonCouponList.forEach(r -> {
                     String ccKey = CandyRedisConst.BASIC_COMMON_COUPON;
 
-                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(ccKey);
+                    List<CandyCommonCouponBasicDto> vos = (List<CandyCommonCouponBasicDto>) redisCandyUtil.get(ccKey);
                     if (CollectionUtils.isEmpty(vos)) {
                         vos = new ArrayList<>();
                     }
                     vos.add(CandyCommonCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                    redisDataSourceUtil.getRedisKylinUtil().set(ccKey, vos);
+                    redisCandyUtil.set(ccKey, vos);
                 });
             } else {
                 throw new LiquidnetServiceException("-1", String.format("券发放失败[mcouponId=%s]", mgtCoupon.getMcouponId()));
@@ -220,17 +223,18 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
             if (!initUserCouponList.isEmpty()) {
                 if (platformCandyUserCouponService.saveBatch(initUserCouponList)) {
+                    AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
                     initUserCouponList.forEach(r -> {
                         String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getUid());
 
-                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
+                        List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisCandyUtil.get(uckey);
 
                         if (CollectionUtils.isEmpty(vos)) {
                             vos = new ArrayList<>();
                         }
                         vos.add(CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                        redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
+                        redisCandyUtil.set(uckey, vos);
                     });
                 } else {
                     throw new LiquidnetServiceException("-1", "券发放失败");
@@ -261,11 +265,13 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
         int eventAmt = mgtCoupon.getEventAmt(), pl = 0, limitSize = eventLimitArr.length;
         log.info("发放券处理中:目标指定手机号[总数:{},发放量:{}]", limitSize, eventAmt);
 
+        AbstractRedisUtil redisAdamUtil = redisDataSourceUtil.getRedisAdamUtil();
+
         // 指定手机号发放券中，会员权益券失效时间duedAt需要同步会员到期时间expiryAt
         boolean isMemberRightsCoupon = coupon.getExclusive() == 1;
         for (int i = 0; i < eventAmt; i++) {
             for (String r : eventLimitArr) {
-                String uid = (String) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.IDENTITY_MOBILE.concat(r));
+                String uid = (String) redisAdamUtil.get(AdamRedisConst.IDENTITY_MOBILE.concat(r));
 
                 if (StringUtils.isNotEmpty(uid)) {
                     CandyUserCoupon userCoupon = new CandyUserCoupon();
@@ -277,7 +283,7 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
 
                     userCoupon.setBindAt(coupon.getEffectAt());
                     if (isMemberRightsCoupon) {
-                        AdamUserMemberVo vo = (AdamUserMemberVo) redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
+                        AdamUserMemberVo vo = (AdamUserMemberVo) redisAdamUtil.get(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
                         userCoupon.setDuedAt(vo.getExpiryAt());
                     } else {
                         userCoupon.setDuedAt(coupon.getExpireAt());
@@ -291,19 +297,20 @@ public class PlatformCandyCouponService extends ServiceImpl<CandyCouponMapper, C
             }
         }
 
+        AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
         if (!initUserCouponList.isEmpty()) {
             if (platformCandyUserCouponService.saveBatch(initUserCouponList)) {
                 initUserCouponList.forEach(r -> {
                     String uckey = CandyRedisConst.BASIC_USER_COUPON.concat(r.getUid());
 
-                    List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisDataSourceUtil.getRedisKylinUtil().get(uckey);
+                    List<CandyUserCouponBasicDto> vos = (List<CandyUserCouponBasicDto>) redisCandyUtil.get(uckey);
 
                     if (CollectionUtils.isEmpty(vos)) {
                         vos = new ArrayList<>();
                     }
                     vos.add(CandyUserCouponBasicDto.getNew().copy(r, coupon, couponRuleDtoList));
 
-                    redisDataSourceUtil.getRedisKylinUtil().set(uckey, vos);
+                    redisCandyUtil.set(uckey, vos);
                 });
             } else {
                 throw new LiquidnetServiceException("-1", String.format("券发放失败[mcouponId=%s]", mgtCoupon.getMcouponId()));

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.platform.service.impl.candy;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.base.OrderCloseMapping;
@@ -70,7 +71,8 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
     }
 
     public List<CandyUserCouponBasicDto> ucouponBasicDtoByUidProcessing(String uid) {
-        if (null == redisDataSourceUtil.getRedisKylinUtil().get(AdamRedisConst.INFO_USER.concat(uid))) return null;
+        AbstractRedisUtil redisCandyUtil = redisDataSourceUtil.getRedisCandyUtil();
+        if (null == redisCandyUtil.get(AdamRedisConst.INFO_USER.concat(uid))) return null;
 
         List<CandyUserCouponBasicDto> basicDtoList = candyUserCouponMapper.selectMultiForUserCouponBasicDto(uid);
         if (!CollectionUtils.isEmpty(basicDtoList)) {
@@ -86,7 +88,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
-            redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
+            redisCandyUtil.set(CandyRedisConst.BASIC_USER_COUPON.concat(uid), basicDtoList);
         }
         return basicDtoList;
     }
@@ -104,7 +106,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
                 dto.setUseRules(couponRuleDtoListMap.get(dto.getCouponId()));
             });
 
-            redisDataSourceUtil.getRedisKylinUtil().set(CandyRedisConst.BASIC_COMMON_COUPON, basicDtoList);
+            redisDataSourceUtil.getRedisCandyUtil().set(CandyRedisConst.BASIC_COMMON_COUPON, basicDtoList);
         }
         return basicDtoList;
     }