Merge remote-tracking branch 'origin/dev_bd_rm_consumer_od' into dev_bd_rm_consumer_od

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java

@@ -48,8 +48,6 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
     StringRedisTemplate stringRedisTemplate;
     @Autowired
     RedisDataSourceUtil redisDataSourceUtil;
-//    @Autowired
-//    private RedisUtil redisUtil;
     @Autowired
     private KylinOrderUtils kylinOrderUtils;
     @Autowired
@@ -413,7 +411,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
 
     public HashMap<String, String[]> getMixMasterCode(String masterCode) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_MIX_MASTER.concat(masterCode);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
         if (obj == null) {
             return null;
         } else {
@@ -544,7 +542,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
     //混合售限购减少
     public int decrMixLimit(String mixId, String uid) {
         String rdk = GoblinRedisConst.GOBLIN_MIX_LIMIT.concat(mixId).concat(":").concat(uid);
-        return (int) redisUtil.decr(rdk, 1);
+        return (int) redisDataSourceUtil.getRedisKylinUtil().decr(rdk, 1);
     }
 
     public Boolean changeCouponVos(String ucouponId, GoblinUserCouponVo vo) {