Merge remote-tracking branch 'origin/dev-smile' into dev-smile

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

@@ -172,7 +172,6 @@ public class SmileUserController {
     @ApiOperation("获取销售数据")
     public ResponseDto<SellDataVO> getSellDataOne(@RequestParam String performanceId) {
         String userId = CurrentUtil.getCurrentUid();
-        userId="953190108752281604111893";
         SellDataVO sellDataVO = (SellDataVO) redisUtil.get(SmileRedisConst.SELL_DATA.concat(userId).concat(performanceId));
         return  ResponseDto.success(sellDataVO);
     }
@@ -187,7 +186,6 @@ public class SmileUserController {
     @ApiOperation("获取佣金明细")
     public ResponseDto<CommissionVO> getCommission() {
         String userId = CurrentUtil.getCurrentUid();
-        userId="953190108752281604111893";
         CommissionVO commissionVO= (CommissionVO) redisUtil.get(SmileRedisConst.SELL_DATA_COMMISSION.concat(userId));
         return  ResponseDto.success(commissionVO);
     }

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.service.impl;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
-import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
@@ -91,11 +90,15 @@ public class SmileFrontServiceImpl implements SmileFrontService {
 
     public List<KylinPerformanceVo>  getPerformance(){
         ArrayList<KylinPerformanceVo> list= ObjectUtil.kylinPerformanceVoList();
-        String perforManceIds="";
-        if(redisUtil.hasKey(SmileRedisConst.SMILE_SHOW)){
-             perforManceIds= (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+      /*  List<String> list1= (List<String>) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+        for(String s:list1){
+            KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(s);
+            if(null!=kylinPerformanceVo){
+                list.add(kylinPerformanceVo);
             }
-        if(StringUtil.isNotBlank(perforManceIds)){
+        }*/
+        String perforManceIds= (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+        if(StringUtils.isNotBlank(perforManceIds)){
             for(String id:perforManceIds.split(",")){
                 KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(id);
                 if(null!=kylinPerformanceVo){
@@ -193,5 +196,9 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         }
     }
 
+    public static void main(String[] args) {
+
+    }
+
 
 }