修改脚本 刷新状态的方法，更改数据迁移脚本

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

@@ -242,7 +242,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             performanceRelations.setRoadShowId(roadShowId);
             performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
 
-            dataUtils.updatePerformanceMongo(performancesId);
+            performanceVoUtils.performanceVoStatus(performancesId);
             return true;
         } catch (Exception e) {
             return false;
@@ -264,7 +264,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
             performanceStatus.setIsRecommend(isRecommend);
             performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
-            dataUtils.updatePerformanceMongo(performancesId);
+            performanceVoUtils.performanceVoStatus(performancesId);
             return true;
         } catch (Exception e) {
             return false;
@@ -286,7 +286,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                     object
             );
-            dataUtils.updatePerformanceMongo(performancesId);
+            performanceVoUtils.performanceVoStatus(performancesId);
             return 1;
         } catch (Exception e) {
             e.printStackTrace();
@@ -524,7 +524,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             ticketStatus.setUpdatedAt(updatedAt);
             ticketStatus.setIsAgent(status);
             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
-            dataUtils.updatePerformanceMongo(performancesId);
+            performanceVoUtils.performanceVoStatus(performancesId);
             return true;
         } catch (Exception e) {
             return false;
@@ -554,7 +554,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", item.getId()));
                 }
             }
-            dataUtils.updatePerformanceMongo(performancesId);
+            performanceVoUtils.performanceVoStatus(performancesId);
             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/kylin/utils/DataUtils.java

@@ -144,9 +144,14 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.CHECK_USER_RELATION + checkUserId);
     }
 
-    public void updatePerformanceMongo(String performanceIds) {
+    public void updatePerformanceMongo(String performanceIds, KylinPerformanceVo paramVo) {
         //查询 mysql 数据
-        KylinPerformanceVo vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
+        KylinPerformanceVo vo;
+        if (null == paramVo) {
+            vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
+        } else {
+            vo = paramVo;
+        }
         if (vo != null) {
             try {
                 //删除 mongo数据

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -97,7 +98,7 @@ public class MongoVoUtils {
                         if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
                             isDiscount = 1;
                         }
-                        if (!kylinTicketVo.getTimeStart().equalsIgnoreCase(kylinTicketVo.getMemberTimeStart())) {
+                        if (DateUtil.compareStrDay(DateUtil.getNowTime(), kylinTicketVo.getMemberTimeStart()) < 0) {
                             isAdvance = 1;
                         }
                         if (kylinTicketVo.getIsMember() == 1) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -141,6 +141,7 @@ public class PerformanceVoUtils {
                         changeStatus.setSurplusGeneral(surplusGeneral);
                     }
                     ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", kylinTicketVoItem.getTicketsId()));
+                    kylinTicketVoItem.setStatus(status);
 
                     //演出状态
                     if (status == 6) {//单一票 可购买 则为可购买
@@ -158,7 +159,9 @@ public class PerformanceVoUtils {
             KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
             changeStatus.setStatus(appStatus);
             performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId));
-            dataUtils.updatePerformanceMongo(performancesId);
+
+            vo.setAppStatus(appStatus);
+            dataUtils.updatePerformanceMongo(performancesId,vo);
         }
     }
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -184,7 +184,7 @@
             </if>
             AND pr.merchant_id = #{merchantId}
         </where>
-        ORDER BY #{orderItem} #{orderSc}
+        ORDER BY ${orderItem} ${orderSc}
     </select>
     <!-- Mis演出列表 (不包含退票信息) -->
     <select id="misPerformanceList" parameterType="java.util.Map" resultMap="misPerformanceListResult">

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/DataImpl.java

 package com.liquidnet.service.kylin.service.impl;
 
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
+import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import com.liquidnet.service.kylin.utils.MongoVoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +49,11 @@ public class DataImpl {
     @Autowired
     private KylinTicketRelationsMapper ticketRelationsMapper;
     @Autowired
+    private PerformanceVoTask performanceVoTask;
+    @Autowired
     private DataUtils dataUtils;
+    @Autowired
+    private RedisUtil redisUtil;
 
     public boolean performance() {
         try {
@@ -73,8 +80,8 @@ public class DataImpl {
             KylinTicketTimesPartnerVo ticketTimesPartnerVo = new KylinTicketTimesPartnerVo();
             KylinTicketPartnerVo ticketPartnerVo = new KylinTicketPartnerVo();
 
-            int count = 100;
-            int page = 4;
+            int count = 200;
+            int page = 0;
 
             try {
                 Class.forName(driverClassName); //执行驱动
@@ -116,6 +123,8 @@ public class DataImpl {
                         performances.setMobile(resultData.getString("mobile"));
                         performances.setDescribes(resultData.getString("describe"));
                         performances.setDetails(resultData.getString("detail"));
+                        performances.setCityId(Integer.parseInt(resultData.getString("city_id")));
+                        performances.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + resultData.getInt("field_id"), "city_name"));
                         performances.setNoticeImage("[{\"id\":1,\"sort\":1,\"message\":\"因演出票品非普通商品，其背后承载的文化服务具有时效性、稀缺性等特征，故不适用7天无理由退货政策。因“不可抗力”导致的演出取消或延期除外。\",\"title\":\"门票退换\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png\"},{\"id\":7,\"sort\":2,\"message\":\"凭订单二维码或手机号兑票入场，二维码或手机号请勿泄露，以免影响入场。个人原因导致的信息泄露，主办方/平台方不承担任何责任。\",\"title\":\"电子票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png\"},{\"id\":3,\"sort\":3,\"message\":\"本场演出不设座位，均为站席观演。\",\"title\":\"仅设站席\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png\"},{\"id\":12,\"sort\":4,\"message\":\"每场现场票数量由场地方决定，具体请到现场询问。\",\"title\":\"现场票\",\"type\":\"image\",\"imgUrl\":\"http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png\"}]");
                         performances.setTimeStart(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_start").toString()));
                         performances.setTimeEnd(DateUtil.Formatter.yyyyMMddHHmmssS.parse(resultData.getTimestamp("time_end").toString()));
@@ -262,9 +271,9 @@ public class DataImpl {
 
                             String title = "";
                             String useStart = DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("use_start").toString()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-                            ;
+
                             String useEnd = DateUtil.Formatter.yyyyMMddHHmmssS.parse(ticketData.getTimestamp("use_end").toString()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-                            ;
+
                             if (ticketData.getInt("type") == 1) {
                                 title = useStart;
                             } else {
@@ -382,17 +391,17 @@ public class DataImpl {
                     }
 
                     for (int i = 0; i < performanceIds.size(); i++) {
-                        dataUtils.updatePerformanceMongo(performanceIds.get(i));
+                        performanceVoTask.performanceVoStatus(performanceIds.get(i));
                     }
 
                     resultData.last();
                     rowCount += resultData.getRow();
-//                    if (allCountResult > rowCount) {
-//                        isBreak = true;
-//                        page+=1;
-//                    } else {
-//                        isBreak = false;
-//                    }
+                    if (allCountResult > rowCount) {
+                        isBreak = true;
+                        page+=1;
+                    } else {
+                        isBreak = false;
+                    }
                 } while (isBreak);
                 return true;
             } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -505,7 +505,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 performanceStatusMapper.update(performanceStatus
                         , new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
 
-                dataUtils.updatePerformanceMongo(performancesId);
+                performanceVoTask.performanceVoStatus(performancesId);
+//                dataUtils.updatePerformanceMongo(performancesId);
                 return ResponseDto.success("下线成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20111));
@@ -587,6 +588,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 List<PerformancePartnerListDao> voList = performancesMapper.partnerPerformanceList(BeanUtil.convertBeanToMap(performancePartnerListParam));
                 pageInfoTmp = new PageInfo(voList);
             } catch (Exception e) {
+                e.printStackTrace();
                 return ResponseDto.failure(ErrorMapping.get(20104));
             }
         }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinTicketsPartnerServiceImpl.java

@@ -14,7 +14,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinTicketsPartnerService;
-import com.liquidnet.service.kylin.utils.DataUtils;
+import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
@@ -58,8 +58,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     @Autowired
     private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
 
-    @Autowired
-    private KylinTicketsMapper ticketsMapper;
 
     @Autowired
     private KylinTicketStatusMapper ticketStatusMapper;
@@ -67,7 +65,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     @Autowired
     private KylinTicketRelationsMapper ticketRelationsMapper;
     @Autowired
-    private DataUtils dataUtils;
+    private PerformanceVoTask performanceVoTask;
 
     @Override
     public ResponseDto<KylinTicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam) {
@@ -357,7 +355,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                         object
                 );
 
-                dataUtils.updatePerformanceMongo(performancesId);
+                performanceVoTask.performanceVoStatus(performancesId);
                 return ResponseDto.success("上线成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20110));
@@ -387,7 +385,7 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                         object
                 );
 
-                dataUtils.updatePerformanceMongo(performancesId);
+                performanceVoTask.performanceVoStatus(performancesId);
                 return ResponseDto.success("下线成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20111));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/timerTask/PerformanceVoTask.java

@@ -149,6 +149,7 @@ public class PerformanceVoTask {
                         changeStatus.setSurplusGeneral(surplusGeneral);
                     }
                     ticketStatusMapper.update(changeStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", kylinTicketVoItem.getTicketsId()));
+                    kylinTicketVoItem.setStatus(status);
 
                     //演出状态
                     if (status == 6) {//单一票 可购买 则为可购买
@@ -162,11 +163,15 @@ public class PerformanceVoTask {
                     }
                 }
             }
+            if(vo.getAppStatus()==7){
+                appStatus=7;
+            }
             //修改演出状态
             KylinPerformanceStatus changeStatus = new KylinPerformanceStatus();
             changeStatus.setStatus(appStatus);
             performanceStatusMapper.update(changeStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performancesId));
-            dataUtils.updatePerformanceMongo(performancesId);
+            vo.setAppStatus(appStatus);
+            dataUtils.updatePerformanceMongo(performancesId,vo);
         }
     }
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -307,9 +307,14 @@ public class DataUtils {
     }
 
 
-    public void updatePerformanceMongo(String performanceIds) {
+    public void updatePerformanceMongo(String performanceIds, KylinPerformanceVo paramVo) {
         //查询 mysql 数据
-        KylinPerformanceVo vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
+        KylinPerformanceVo vo;
+        if (null == paramVo) {
+             vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
+        } else {
+             vo = paramVo;
+        }
         if (vo != null) {
             try {
                 //删除 mongo数据
@@ -327,7 +332,7 @@ public class DataUtils {
                 //删除redis
                 redisUtil.del(KylinRedisConst.PERFORMANCES + performanceIds);
                 // 大龙相关 演出列表
-                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME  + vo.getCityName());
+                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME + vo.getCityName());
                 redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);
                 redisUtil.del(KylinRedisConst.PERFORMANCES_ROADLIST + vo.getRoadShowId());
             } catch (Exception e) {
@@ -386,8 +391,8 @@ public class DataUtils {
                         redisUtil.incr(performanceIdKey, buyCount);
                         break;
                     }
-                    if(null==redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)){
-                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item,0);
+                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
                     }
                     if (i == 0) {
                         count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);
@@ -411,8 +416,8 @@ public class DataUtils {
                         redisUtil.decr(performanceIdKey, Math.abs(buyCount));
                         break;
                     }
-                    if(null==redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)){
-                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item,0);
+                    if (null == redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item)) {
+                        redisUtil.set(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item, 0);
                     }
                     if (i == 0) {
                         count = (int) redisUtil.get(redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + item);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/MongoVoUtils.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.utils;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -101,7 +102,8 @@ public class MongoVoUtils {
                         if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
                             isDiscount = 1;
                         }
-                        if (!kylinTicketVo.getTimeStart().equalsIgnoreCase(kylinTicketVo.getMemberTimeStart())) {
+
+                        if (DateUtil.compareStrDay(DateUtil.getNowTime(), kylinTicketVo.getMemberTimeStart()) < 0) {
                             isAdvance = 1;
                         }
                         if (kylinTicketVo.getIsMember() == 1) {
@@ -144,6 +146,7 @@ public class MongoVoUtils {
             voData.setFieldsData(fields, cityName);
             voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime, isAdvance, isDiscount, payCountdownMinute);
             voData.setTicketTimeList(timeList);
+            voData.setAppStatus(p2.getStatus());
             return voData;
         } catch (Exception e) {
             e.printStackTrace();
@@ -165,8 +168,8 @@ public class MongoVoUtils {
         BeanUtils.copyProperties(data, voItem);
         redisVo.add(voItem);
         List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
-        if(redisData.size()>0){
-            if(redisData.get(0).getOrderTicketsId().equals(orderId)){
+        if (redisData.size() > 0) {
+            if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
                 redisData.remove(0);
             }
         }