commit

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

@@ -34,9 +34,12 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "kylin:performances_inventory:ticket:id:545532380412108806781770:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:571907440470466561438090:surplusGeneral",
-                "kylin:performances_inventory:ticket:id:571910454067650563092295:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:575422212015185926395076:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:575423832945909762737992:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:575424371127296001891205:surplusGeneral",
+                "kylin:performances_inventory:ticket:id:575424699866603521727423:surplusGeneral",
+                "kylin:order:id:585335405046292488883367",
+                "kylin:order:id:585337076784250883411769"
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java

@@ -20,25 +20,39 @@ public class DataController {
     private DataImpl data;
 
 
-    @PostMapping("initScore")
-    @ApiOperation("积分数据迁移")
-    public ResponseDto<Boolean> initScore(@RequestParam("page") int page, @RequestParam("size") int size) {
-        Boolean result = data.initScore(page,size);
-        return ResponseDto.success(result);
+    @PostMapping("fieldData")
+    @ApiOperation("场地数据迁移")
+    public ResponseDto<Boolean> fieldData() {
+        data.fieldData();
+        return ResponseDto.success();
     }
 
-    @PostMapping("initScoreSingle")
-    @ApiOperation("积分数据迁移(根据uid)")
-    public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
-        Boolean result = data.initScore(uid);
-        return ResponseDto.success(result);
+    @PostMapping("account")
+    @ApiOperation("演出关联用户id迁移")
+    public ResponseDto<Boolean> account() {
+        data.account();
+        return ResponseDto.success();
     }
 
-    @PostMapping("initLogsSingle")
-    @ApiOperation("初始化用户积分日志(根据uid)")
-    public ResponseDto<Boolean> initLogs(@RequestParam("uid") String uid) {
-        Boolean result = data.initLogs(uid);
-        return ResponseDto.success(result);
-    }
+//    @PostMapping("initScore")
+//    @ApiOperation("积分数据迁移")
+//    public ResponseDto<Boolean> initScore(@RequestParam("page") int page, @RequestParam("size") int size) {
+//        Boolean result = data.initScore(page,size);
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("initScoreSingle")
+//    @ApiOperation("积分数据迁移(根据uid)")
+//    public ResponseDto<Boolean> initScore(@RequestParam("uid") String uid) {
+//        Boolean result = data.initScore(uid);
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("initLogsSingle")
+//    @ApiOperation("初始化用户积分日志(根据uid)")
+//    public ResponseDto<Boolean> initLogs(@RequestParam("uid") String uid) {
+//        Boolean result = data.initLogs(uid);
+//        return ResponseDto.success(result);
+//    }
 
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -97,7 +97,7 @@ public class PerformanceVoTask {
         List<String> performanceIdList = new ArrayList<>();
 
         if (performanceSingleId == null) {
-            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 6, 8, 9));
+            List<KylinPerformanceStatus> list = performanceStatusMapper.selectList(new UpdateWrapper<KylinPerformanceStatus>().in("status", 3, 4, 6, 7, 8, 9, 10));
             for (KylinPerformanceStatus item : list) {
                 performanceIdList.add(item.getPerformanceId());
             }
@@ -386,41 +386,42 @@ public class PerformanceVoTask {
         KylinPerformanceMisVo misVo = getPerformanceMisVo(performanceId);
         KylinPerformanceVo mongoVo = mongoVoUtils.combinePerformanceVoData(performanceId);
         if (!misVo.getTitle().equals(mongoVo.getTitle())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE TITLE");
+            log.info("performanceId = " + performanceId + " NEED CHANGE TITLE");
             return true;
-        } if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE IMGPOSTER");
+        }
+        if (!misVo.getImgPoster().equals(mongoVo.getImgPoster())) {
+            log.info("performanceId = " + performanceId + " NEED CHANGE IMGPOSTER");
             return true;
         } else if (!misVo.getType().equals(mongoVo.getType())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE TYPE");
+            log.info("performanceId = " + performanceId + " NEED CHANGE TYPE");
             return true;
         } else if (!misVo.getTimeStart().equals(mongoVo.getTimeStart())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE TIMESTART");
+            log.info("performanceId = " + performanceId + " NEED CHANGE TIMESTART");
             return true;
         } else if (!misVo.getTimeEnd().equals(mongoVo.getTimeEnd())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE TIMEEND");
+            log.info("performanceId = " + performanceId + " NEED CHANGE TIMEEND");
             return true;
         } else if (!misVo.getFieldId().equals(mongoVo.getFieldId())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE FIELDID");
+            log.info("performanceId = " + performanceId + " NEED CHANGE FIELDID");
             return true;
         } else if (!misVo.getNotice().equals(mongoVo.getNotice())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE NOTICE");
+            log.info("performanceId = " + performanceId + " NEED CHANGE NOTICE");
             return true;
-        } else if (!misVo.getDetails().replace("'","").equals(mongoVo.getDetails().replace("'",""))) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE DETAILS");
+        } else if (!misVo.getDetails().replace("'", "").equals(mongoVo.getDetails().replace("'", ""))) {
+            log.info("performanceId = " + performanceId + " NEED CHANGE DETAILS");
             return true;
         } else if (!misVo.getApprovalUrl().equals(mongoVo.getApprovalUrl())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE APPROVALURL");
+            log.info("performanceId = " + performanceId + " NEED CHANGE APPROVALURL");
             return true;
         } else if (!misVo.getPayCountdownMinute().equals(mongoVo.getPayCountdownMinute())) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE PAYCOUTDOWN");
+            log.info("performanceId = " + performanceId + " NEED CHANGE PAYCOUTDOWN");
             return true;
         }
 
         boolean exists = mongoTemplate.exists(Query.query(Criteria.where("status").is(-1).and("performancesId").is(performanceId)),
                 KylinTicketTimesPartnerVo.class, KylinTicketTimesPartnerVo.class.getSimpleName());
         if (exists) {
-            log.info("performanceId = "+performanceId+" NEED CHANGE NEW TIMES");
+            log.info("performanceId = " + performanceId + " NEED CHANGE NEW TIMES");
             return true;
         }
 
@@ -428,26 +429,26 @@ public class PerformanceVoTask {
             TicketTimesTicketCreatePartnerVo times = misVo.getTicketTimes().get(i);
             KylinTicketTimesVo timesVo = mongoVo.getTicketTimeList().get(i);
 
-            if(!times.getUseStart().equals(timesVo.getUseStart())){
-                log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_START");
+            if (!times.getUseStart().equals(timesVo.getUseStart())) {
+                log.info("performanceId = " + performanceId + " NEED CHANGE TIMES USE_START");
                 return true;
             }
 
-            if(!times.getUseEnd().equals(timesVo.getUseEnd())){
-                log.info("performanceId = "+performanceId+" NEED CHANGE TIMES USE_END");
+            if (!times.getUseEnd().equals(timesVo.getUseEnd())) {
+                log.info("performanceId = " + performanceId + " NEED CHANGE TIMES USE_END");
                 return true;
             }
 
             boolean exists2 = mongoTemplate.exists(Query.query(Criteria.where("status").is(-2).and("timesId").is(times.getTicketTimesId())), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
             if (exists2) {
-                log.info("performanceId = "+performanceId+" NEED CHANGE NEW TICKET");
+                log.info("performanceId = " + performanceId + " NEED CHANGE NEW TICKET");
                 return true;
             }
             for (KylinTicketPartnerVo ticketPartnerVo : times.getTicket()) {
                 for (KylinTicketVo ticketVo : timesVo.getTicketList()) {
                     if (ticketVo.getTicketsId().equals(ticketPartnerVo.getTicketsId())) {
                         if (!ticketVo.getTitle().equals(ticketPartnerVo.getTitle())) {
-                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET TITLE");
+                            log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET TITLE");
                             return true;
                         }
 //                        else if (!ticketVo.getQrCodeShowTime().equals(ticketPartnerVo.getQrCodeShowTime())) {
@@ -455,14 +456,14 @@ public class PerformanceVoTask {
 //                            return true;
 //                    }
                         else if (!ticketVo.getDescribeElectronic().equals(ticketPartnerVo.getDescribeElectronic())) {
-                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELECTRONIC");
+                            log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET DESCRIBEELECTRONIC");
                             return true;
                         } else if (!ticketVo.getDescribeExpress().equals(ticketPartnerVo.getDescribeExpress())) {
-                            log.info("performanceId = "+performanceId+" ticketId = "+ticketVo.getTicketsId()+" NEED CHANGE TICKET DESCRIBEELEXPRESS");
+                            log.info("performanceId = " + performanceId + " ticketId = " + ticketVo.getTicketsId() + " NEED CHANGE TICKET DESCRIBEELEXPRESS");
                             return true;
                         }
                         if (!ticketVo.getDescribes().equals(ticketPartnerVo.getDescribes())) {
-                            log.info("performanceId = "+performanceId+" NEED CHANGE TICKET DESCRIBES");
+                            log.info("performanceId = " + performanceId + " NEED CHANGE TICKET DESCRIBES");
                             return true;
                         }
                         break;