Merge branch 'pre' into 'master'

修改场次 改票的适用时间

See merge request !174

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "stone:user:$uid::surplusGeneral",
+                "kylin:performances:id:879358616337735686573945",
                 "stone:item:logs:list:$uid"
         };
         for (String key : keys) {

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/service/impl/KylinTicketTimesPartnerServiceImpl.java

@@ -210,7 +210,7 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
             kylinTicketTimesPartnerVo.setStatus(null);
             mongoSlimeUtils.updateTicketTimesPartnerVo(kylinTicketTimesPartnerVo);
             KylinTicketPartnerVo ticketPartnerVo = KylinTicketPartnerVo.getNew();
-            ticketPartnerVo.setTicketsId(createTicketTimesParam.getTicketTimesId());
+            ticketPartnerVo.setTimesId(createTicketTimesParam.getTicketTimesId());
             ticketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             ticketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart());
             mongoSlimeUtils.updateTicketPartnerVo(ticketPartnerVo);