Merge branch 'pre' into 'master'

Pre

See merge request !246

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExSkuVo.java

@@ -110,6 +110,7 @@ public class GoblinNftExSkuVo {
     @ApiModelProperty(position = 20,required = true,value ="修改时间")
     private LocalDateTime updatedAt;
 
+    // redis 覆盖暂时无用
     private String rdStartTime;
     private String rdStopTime;
 

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkGenRdsReceiver.java

@@ -103,7 +103,8 @@
 //        LocalDateTime now = LocalDateTime.now();
 //
 //        GoblinUserDigitalArtworkVo digitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
-//        String artworkId = IDGenerator.nextMilliId2();
+////        String artworkId = IDGenerator.nextMilliId2();
+//        String artworkId = IDGenerator.nextSnowId();
 //        digitalArtworkVo.setArtworkId(artworkId);
 //        digitalArtworkVo.setSkuId(skuId);
 //        digitalArtworkVo.setUid(uid);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-slowly/src/main/java/com/liquidnet/service/consumer/slowly/receiver/ConsumerGoblinBizArtworkGenRdsReceiver.java

@@ -103,7 +103,8 @@ package com.liquidnet.service.consumer.slowly.receiver;//package com.liquidnet.s
 //        LocalDateTime now = LocalDateTime.now();
 //
 //        GoblinUserDigitalArtworkVo digitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
-//        String artworkId = IDGenerator.nextMilliId2();
+////        String artworkId = IDGenerator.nextMilliId2();
+//        String artworkId = IDGenerator.nextSnowId();
 //        digitalArtworkVo.setArtworkId(artworkId);
 //        digitalArtworkVo.setSkuId(skuId);
 //        digitalArtworkVo.setUid(uid);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java

@@ -77,6 +77,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             LocalDateTime now = LocalDateTime.now(), toCheckTime = now.minusSeconds(15);
             for (int i = 0, subSize = subArtworkIdList.size(); i < subSize; i++) {
                 GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(subArtworkIdList.get(i));
+                if (null == userDigitalArtworkVo || !userDigitalArtworkVo.getUid().equals(uid)) {
+                    continue;
+                }
                 GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());
 
                 GoblinUserDigitalArtworkListVo listVo = GoblinUserDigitalArtworkListVo.getNew().copy(userDigitalArtworkVo);
@@ -188,7 +191,8 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
         userDigitalArtworkBoxVo.setDeletedAt(now);
 
 //        if (goblinMongoUtils.updateUserDigitalArtworkVoByUnboxing(userDigitalArtworkBoxVo)) {
-            String artworkId = IDGenerator.nextMilliId2();
+//            String artworkId = IDGenerator.nextMilliId2();
+            String artworkId = IDGenerator.nextSnowId();
 
             String orderId = userDigitalArtworkBoxVo.getOrderId();
             GoblinNftOrderVo orderVo = goblinRedisUtils.getGoblinNftOrder(orderId);
@@ -206,7 +210,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 //            unboxDigitalArtworkListVo.setOpeningTime(now);
 
             String skuId = orderVo.getBoxSkuId(), spuId = orderVo.getSpuId();
-            Integer source = 1;
+//            Integer source = 1;
+            Integer orderType = orderVo.getOrderType();
+            Integer source = orderType == 1 ? 1 : (orderType == 2 ? 2 : (orderType == 3 ? 3 : (orderType == 4 ? 31 : 0)));
 //            if (goblinRedisUtils.hasGenUserDigitalArtwork(uid, skuId, orderId)) {// 已生成
 //                log.warn("#UNBOX_ARTWORK EXIST_ART[uid={},skuId={},orderId={},source={}]", uid, skuId, orderId, source);
 //                return unboxDigitalArtworkListVo;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

@@ -920,7 +920,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         LocalDateTime now = LocalDateTime.now();
 
         GoblinUserDigitalArtworkVo digitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
-        String artworkId = IDGenerator.nextMilliId2();
+//        String artworkId = IDGenerator.nextMilliId2();
+        String artworkId = IDGenerator.nextSnowId();
         digitalArtworkVo.setArtworkId(artworkId);
         digitalArtworkVo.setSkuId(skuId);
         digitalArtworkVo.setUid(uid);

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

@@ -4,8 +4,10 @@ package com.liquidnet.service.platform.controller.kylin;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.KylinTimePerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.PerformanceOrderStatisticalVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.platform.utils.PerformanceVoTask;
+import com.mongodb.BasicDBObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -14,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
@@ -70,6 +73,11 @@ public class KylinPerformancesController {
                         performancesPartnerService.outLinePerformance(item.getPerformanceId());
                         log.info("[FINISH OUT LINE TASK] performanceId = " + item.getPerformanceId() + " time = " + item.getTime());
                     }
+                    if (item.getTaskType() != 0) {
+                        mongoTemplate.getCollection(KylinTimePerformanceVo.class.getSimpleName()).updateMany(
+                                Query.query(Criteria.where("performanceId").is(item.getPerformanceId())).getQueryObject(),
+                                Update.update("taskType", 0).getUpdateObject());
+                    }
                 }
             }
             return ResponseDto.success(true);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeTaskServiceImpl.java

@@ -190,26 +190,30 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
 
             Boolean bolTime = false;
             if (!StringUtil.isEmpty(goblinNftExSkuVo)) {
-                // redis存储 单个sku的开始和结束时间
-                LocalDateTime rdExStartTime = LocalDateTime.parse(goblinNftExSkuVo.getRdStartTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-                LocalDateTime rdExStopTime = LocalDateTime.parse(goblinNftExSkuVo.getRdStopTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
                 // 时间比对
-                if (exStartTime.isBefore(rdExStartTime)) {
+                if (goblinNftExSkuVo.getExStartTime() != null && exStartTime.isBefore(goblinNftExSkuVo.getExStartTime())) { // 当操作时间小于red存储时间时为true
                     goblinNftExSku.setExStartTime(exStartTime);
                     goblinNftExSku.setRdStartTime(exStartTime.toString());
                     bolTime = true;
+                }else {
+                    goblinNftExSku.setExStartTime(goblinNftExSkuVo.getExStartTime());
+                    goblinNftExSku.setRdStartTime(goblinNftExSkuVo.getExStartTime().toString());
                 }
-                if (exStopTime.isAfter(rdExStopTime)) {
+
+                if (goblinNftExSkuVo.getExStopTime() != null && exStopTime.isAfter(goblinNftExSkuVo.getExStopTime())) {  // 当操作时间大于red存储时间为true
                     goblinNftExSku.setExStopTime(exStopTime);
                     goblinNftExSku.setRdStopTime(exStopTime.toString());
                     bolTime = true;
+                }else {
+                    goblinNftExSku.setExStopTime(goblinNftExSkuVo.getExStopTime());
+                    goblinNftExSku.setRdStopTime(goblinNftExSkuVo.getExStopTime().toString());
                 }
             } else {
                 bolTime = true;
                 goblinNftExSku.setExStartTime(exStartTime);
-                goblinNftExSku.setExStopTime(exStopTime);
                 goblinNftExSku.setRdStartTime(exStartTime.toString());
+                goblinNftExSku.setExStopTime(exStopTime);
                 goblinNftExSku.setRdStopTime(exStopTime.toString());
             }
 
@@ -242,8 +246,6 @@ public class GoblinNftExCodeTaskServiceImpl implements IGoblinNftExCodeTaskServi
         LocalDateTime localDateTime2 = LocalDateTime.parse(time2, dtf2);
         System.out.println(localDateTime2.isBefore(LocalDateTime.now()));//你的时间小于当前时间是true
         System.out.println(localDateTime2.isAfter(LocalDateTime.now()));//你的时间小于在当前时间是false
-
-
     }
 
 

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

@@ -257,12 +257,11 @@ public class GoblinRedisUtils {
      */
     public GoblinNftExSkuVo getSkuTime(String skuId) {
         String key = GoblinRedisConst.ACTIVITY_SKU_TIME.concat(skuId);
-        GoblinNftExSkuVo goblinNftExSkuVo = null;
-        if (!StringUtil.isEmpty(getRedis().get(key))){
-            ObjectMapper objectMapper = new ObjectMapper();
-            objectMapper.convertValue (getRedis().get(key), GoblinNftExSkuVo.class);
+        Object val = getRedis().get(key);
+        if (!StringUtil.isEmpty(val)){
+            return (GoblinNftExSkuVo)val;
         }
-        return goblinNftExSkuVo;
+        return null;
     }
 
     /**