Merge branch 'pre' into 'master'

修改 引用 kylin的redis

See merge request !317

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -241,7 +241,7 @@ public class SmileRedisUtils {
     }
 
     public BigDecimal getUserTotalPrice(String uid) {
-        return (getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
+        return (getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
     }
 
     public void setUserTotalPrice(String uid, BigDecimal add) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java

@@ -79,7 +79,7 @@ public class SellDataInfoImpl {
                         String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
                         String yanChuName=a.get("title")==null?"":a.get("title").toString();
                             //判断是否 已经跑过一遍了
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
                             continue;
                         }
                         //获取 该人 该演出 的所有订单
@@ -121,7 +121,7 @@ public class SellDataInfoImpl {
                             smileSellDataVO.setSellDataOneVO(listSellDataOneVo);
                             smileSellDataVO.setUpdateTime(LocalDateTime.now());
                             //redis 里面放入
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
                             Query query = Query.query(Criteria.where("sellDataId").is(smileSellDataVO.getSellDataId()));
                             Document document = (Document)mongoConverter.convertToMongoType(smileSellDataVO);
                             Update update = Update.fromDocument(document);
@@ -133,8 +133,8 @@ public class SellDataInfoImpl {
                             //mongodb 里面放入
                             mongoTemplate.insert(smileSellDataVO, SmileSellDataVO.class.getSimpleName());*/
                         }
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
                         }
                     }
 
@@ -178,7 +178,7 @@ public class SellDataInfoImpl {
                for(Map a: userPerformanceList){
                     //取出id 查看是否结算
                    String performanceId= a.get("performanceId")==null?"":a.get("performanceId").toString();
-                   if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                   if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
                        //已结算（已完成）
                        a.put("status","3");
                    }else{
@@ -202,7 +202,7 @@ public class SellDataInfoImpl {
                //待入账
                commissionVO.setDaiRuZhang(daiRuZhang);
                commissionVO.setKeJieSuan(keJieSuan);
-               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
+               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisKylinUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
                redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA_COMMISSION.concat(smileUser.getUid()),commissionVO);
            }
        }