exit 演出id list保存 排序 查询逻辑修改

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -619,12 +619,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 smileRedisUtils.delAgent(performancesId,ticketId);
             }
 
+            //查询所有演出id
+//            List<String> showIds = smileRedisUtils.getShowIds();
+//            showIds.add(performancesId);
+//            smileRedisUtils.setShowIds(showIds);
 
-            List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
+
+           /* List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
             String perId = StringUtils.join(collect,",");
             if (!"".equals(perId)){
                 smileRedisUtils.setShowIds(perId);
-            }
+            }*/
             return true;
         } catch (Exception e) {
             return false;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileAgentServiceImpl.java

@@ -46,25 +46,30 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
             }
             if (result) {
                 try {
-                    for (SmileAgent smileAgent : smileAgents){
-                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
-                        if (agent!=null){
-                            log.info("SmileAgent:{}",agent);
+                    for (SmileAgent smileAgent : smileAgents) {
+                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId());
+                        if (agent != null) {
+                            log.info("SmileAgent:{}", agent);
                             //修改过票提则无法再次修改
                             return AjaxResult.warn("票提一但设置，无法修改！");
                         }
                     }
                     smileAgents.forEach(smileAgent -> {
                         //是否是修改票提
-                        smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN),smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100),2,RoundingMode.DOWN));
+                        smileAgentMapper.updateAgentById(smileAgent.getId(), smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN), smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
                         SmileAgentVo smileAgentVo = new SmileAgentVo();
                         BeanUtils.copyProperties(smileAgent, smileAgentVo);
-                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId(), smileAgentVo);
+                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
                         log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
                                 smileAgent.getId(),
                                 smileAgent.getPerformanceId(),
                                 smileAgent.getTicketId());
                     });
+
+                    //设置票提的时候将该演出放到前端显示的演出列表中
+                    List<String> showIds = smileRedisUtils.getShowIds();
+                    showIds.add(smileAgents.get(0).getPerformanceId());
+                    smileRedisUtils.setShowIds(showIds);
                     return AjaxResult.success();
                 } catch (Exception e) {
                     e.printStackTrace();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -34,7 +34,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -135,16 +134,22 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public AjaxResult sort(ShowSort showSort) {
+
         //查询数据库是否又该顺序的演出
         kylinPerformancesMapper.updateComment(showSort.getSort());
         kylinPerformancesMapper.updateCommentByPer(showSort.getSort(), showSort.getPerformancesId());
 
-        //获取排序演出id
+        List<String> showIds = smileRedisUtils.getShowIds();
+        showIds.remove(showSort.getPerformancesId());
+        showIds.add(0,showSort.getPerformancesId());
+        smileRedisUtils.setShowIds(showIds);
+
+        /*//获取排序演出id
         List<String> collect = kylinPerformancesMapper.selectPerIdByAgent().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
         String perId = StringUtils.join(collect, ",");
         //保存所有演出id带顺序
-        smileRedisUtils.setShowIds(perId);
-        log.info("redis show key:{}", perId);
+        smileRedisUtils.setShowIds(perId);*/
+        log.info("redis show key:{}", showSort.getPerformancesId());
         return AjaxResult.success();
     }
 

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

@@ -80,10 +80,23 @@ public class SmileRedisUtils {
     /**
      * 保存演出ids
      */
-    public void setShowIds(String perId) {
+    public void setShowIds(List<String> perId) {
         redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
+    /**
+     * 获取演出ids
+     */
+    public List<String> getShowIds(){
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = getRedis().get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
+
     /**
      * 保存个人打款
      */

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -93,14 +94,14 @@ public class SmileFrontServiceImpl implements SmileFrontService {
 
     public List<KylinPerformanceVo> getPerformance() {
         ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList();
-      /*  List<String> list1= (List<String>) redisUtil.get(SmileRedisConst.SMILE_SHOW);
-        for(String s:list1){
-            KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(s);
-            if(null!=kylinPerformanceVo){
+        List<String> smileShow = smileRedisUtils.getSmileShow();
+        for(String id:smileShow){
+            KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
+            if (null != kylinPerformanceVo && LocalDateTime.now().isBefore(LocalDateTime.parse(kylinPerformanceVo.getTimeEnd(), DTF_YMD_HMS))) {//演出结束不显示在列表
                 list.add(kylinPerformanceVo);
             }
-        }*/
-        String perforManceIds = smileRedisUtils.getSmileShow();
+        }
+        /*String perforManceIds = smileRedisUtils.getSmileShow();
         if (StringUtils.isNotBlank(perforManceIds)) {
             for (String id : perforManceIds.split(",")) {
                 KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
@@ -108,7 +109,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
                     list.add(kylinPerformanceVo);
                 }
             }
-        }
+        }*/
         return list;
     }
 

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

@@ -58,8 +58,16 @@ public class SmileRedisUtils {
     }
 
     /* ---------------------------------------- 演出列表数据 ---------------------------------------- */
-    public String getSmileShow() {
-        return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+    public List<String> getSmileShow() {
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = redisUtil.get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+
+//        return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
     }
 
     /* ---------------------------------------- 代理数据 ---------------------------------------- */