Merge branch 'dev_wutiaoren' into dev_20211205

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -46,6 +46,10 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_CITY_VOTE = "sweet:cityVote";
     public final static String REDIS_KEY_SWEET_CITY_VOTE_USER = ":user:";
     public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME = ":updateTime";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_START = "sweet:cityVote:startTime:";//活动开始时间
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_END = "sweet:cityVote:endTime:";//活动结束时间
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_BANNER = "sweet:cityVote:banner:";//活动banner
+
     // 2021草莓音乐节海报活动活动
     public static final String REDIS_KEY_SWEET_STRAWBERRY_POSTER_CLICK = "sweet:strawberryPoster:click:openId:";
     // 微信用户相关

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/TempBannerVo.java

+package com.liquidnet.service.sweet.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TempBannerVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -6777064807434774542L;
+
+    @ApiModelProperty(value = "banner图片")
+    private String src;
+
+    @ApiModelProperty(value = "banner链接")
+    private String url;
+
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/param/TempBannerParam.java

+package com.liquidnet.service.sweet.param;
+
+import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "SweetCityVoteParam", description = "用户投票记录入参")
+@Data
+public class TempBannerParam implements Serializable {
+
+    @ApiModelProperty(position = 13, required = true, value = "临时banner数据")
+    @NotBlank(message = "tempBannerVo不能为空")
+    private List<TempBannerVo> tempBannerVo;
+
+    @ApiModelProperty(position = 14, required = true, value = "活动类型 1新裤子 2莫宰羊", example = "1")
+    @NotNull(message = "type不能为空")
+    private Integer type;
+
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetCItyVoteStatVo.java

@@ -43,6 +43,9 @@ public class SweetCItyVoteStatVo implements Serializable, Cloneable {
     @ApiModelProperty("名次变动状态 1未变化 2上升 3下降")
     private Integer rankingUpOrDown;
 
+//    @ApiModelProperty("状态[0-未开始|1-进行中|2-已结束]")
+//    private Integer status;
+
     /*@ApiModelProperty("创建时间")
     private LocalDateTime createdAt;
 
@@ -50,6 +53,7 @@ public class SweetCItyVoteStatVo implements Serializable, Cloneable {
     private LocalDateTime updatedAt;*/
 
     private static final SweetCItyVoteStatVo obj = new SweetCItyVoteStatVo();
+
     public static SweetCItyVoteStatVo getNew() {
         try {
             return (SweetCItyVoteStatVo) obj.clone();

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

@@ -156,7 +156,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     mapSql.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     KylinPerformanceMisVo vo = performanceVoUtils.getPerformanceMisVo(performancesId);
                     performanceVoUtils.updatePerformanceMySql(performancesId, mapSql, vo, updatedAt, auditStatus);
-                    if (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7) {//若 演出上 则 线判断状态
+                    if (sqlStatus.getStatus() == 3 || (sqlStatus.getStatus() >= 6 && sqlStatus.getStatus() != 7)) {//若 演出上 则 线判断状态
                         performanceVoUtils.performanceVoStatus(performancesId);
                     }
                     delOrderTicketsRedis(vo);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetCityVoteController.java

@@ -2,13 +2,17 @@ package com.liquidnet.service.sweet.controller;
 
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
 import com.liquidnet.service.sweet.param.SweetCityVoteParam;
+import com.liquidnet.service.sweet.param.TempBannerParam;
 import com.liquidnet.service.sweet.service.ISweetCityVoteService;
+import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.vo.SweetCItyVoteStatVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,4 +62,24 @@ public class SweetCityVoteController {
         return sweetCityVoteService.setStatList(type);
     }
 
+
+    @Autowired
+    RedisDataUtils redisDataUtils;
+
+    @PostMapping("setTime")
+    @ApiOperation("临时-设置时间")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "endTime", value = "结束时间[2021-12-01 10:00:00]", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "startTime", value = "开始时间[2021-12-01 10:00:00]", required = true),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "活动类型 1新裤子 2莫宰羊", required = false)
+    })
+    public void setStartEndTime(@RequestParam Integer type, @RequestParam String startTime, @RequestParam String endTime) {
+        redisDataUtils.setStartEndTime(type, startTime, endTime);
+    }
+
+    @PostMapping("setBanner")
+    @ApiOperation("临时-设置banner")
+    public void setTempBanner(@RequestBody TempBannerParam param) {
+        redisDataUtils.setTempBanner(param.getType(), param.getTempBannerVo());
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetCityVoteServiceImpl.java

@@ -8,6 +8,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.sweet.dto.SweetCityVoteStatDto;
+import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
 import com.liquidnet.service.sweet.entity.SweetCityVote;
 import com.liquidnet.service.sweet.mapper.SweetCityVoteMapper;
 import com.liquidnet.service.sweet.mapper.SweetCityVoteStatMapper;
@@ -29,6 +30,8 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 /**
  * <p>
  * 答题表 服务实现类
@@ -70,6 +73,26 @@ public class SweetCityVoteServiceImpl extends ServiceImpl<SweetCityVoteMapper, S
         stringObjectHashMap.put("userVote", userVote);
         stringObjectHashMap.put("statUpdateTime", redisDataUtils.getSweetCityVoteStatUpdateTime(type));
 
+        //获取活动状态
+        HashMap<String, String> map = redisDataUtils.getStartEndTime(type);
+        if (map.get("startTime") == null || map.get("endTime") == null) {
+            stringObjectHashMap.put("activeStatus", 1);
+        } else {
+            LocalDateTime startTime = LocalDateTime.parse(map.get("startTime"), DTF_YMD_HMS);
+            LocalDateTime endTime = LocalDateTime.parse(map.get("endTime"), DTF_YMD_HMS);
+            LocalDateTime now = LocalDateTime.now();
+            if (startTime.isBefore(now)) {
+                stringObjectHashMap.put("activeStatus", 0);
+            } else if (endTime.isAfter(now)) {
+                stringObjectHashMap.put("activeStatus", 2);
+            } else {
+                stringObjectHashMap.put("activeStatus", 1);
+            }
+        }
+        //获取banner
+        List<TempBannerVo> bannerVoList = redisDataUtils.getTempBanner(type);
+        stringObjectHashMap.put("bannerList", bannerVoList);
+
         return ResponseDto.success(stringObjectHashMap);
     }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -14,6 +14,7 @@ import com.liquidnet.service.sweet.dto.SweetManualArtistStageListDto;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawberryParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
 import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.param.SweetCityVoteParam;
@@ -672,9 +673,9 @@ public class RedisDataUtils {
 
     public void setIntegralActivityDrawInList(String uid, String integralActivityId, LinkedList<IntegralActivityDrawVo> integralActivityDrawList) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
-                    .concat(integralActivityId)
+                .concat(integralActivityId)
                 .concat(SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER_KEY)
-                    .concat(uid);
+                .concat(uid);
         redisUtil.set(redisKey, integralActivityDrawList);
     }
 
@@ -774,4 +775,62 @@ public class RedisDataUtils {
                 .concat(userId);
         redisUtil.uLock(redisKey);
     }
+
+    /***
+     * 设置活动开始结束时间
+     * @param type
+     * @param startTime
+     * @param endTime
+     */
+    public void setStartEndTime(Integer type, String startTime, String endTime) {
+        String startRedisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_START.concat(":type:" + type);
+        String endRedisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_END.concat(":type:" + type);
+        redisUtil.set(startRedisKey, startTime);
+        redisUtil.set(endRedisKey, endTime);
+    }
+
+    /**
+     * 获取活动开始结束时间 如果报错返回null
+     *
+     * @param type
+     * @return
+     */
+    public HashMap<String, String> getStartEndTime(Integer type) {
+        try {
+            HashMap<String, String> map = CollectionUtil.mapStringString();
+            String startRedisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_START.concat(":type:" + type);
+            String endRedisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_END.concat(":type:" + type);
+            map.put("startTime", (String) redisUtil.get(startRedisKey));
+            map.put("endTime", (String) redisUtil.get(endRedisKey));
+            return map;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+    /**
+     * 设置临时banner
+     * @param type
+     * @param vo
+     */
+    public void setTempBanner(Integer type, List<TempBannerVo> vo) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_BANNER.concat(":type:" + type);
+        redisUtil.set(redisKey, vo);
+    }
+
+    /**
+     * 获取临时banner
+     * @param type
+     * @return
+     */
+    public List<TempBannerVo> getTempBanner(Integer type) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_CITY_VOTE_BANNER.concat(":type:" + type);
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return null;
+        }else{
+            return (List<TempBannerVo>)obj;
+        }
+    }
 }