Merge remote-tracking branch 'origin/jxl_nft_per' into jxl_nft_per

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

@@ -2,9 +2,11 @@ package com.liquidnet.service.consumer.kylin.receiver;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.consumer.kylin.service.processor.ConsumerGalaxyJsonNftPublishAndBuyProcessor;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyReqDto;
+import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyRespDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.StreamRecords;
@@ -27,8 +29,10 @@ public class ConsumerGalaxyJsonNftPublishAndBuyReceiver extends AbstractBizRedis
                 aBoolean = true;
             } else {
                 //执行计数
-                jsonNftPublishAndBuyProcessor.nftPublishAndBuy(textMessage);
-                aBoolean = true;
+                ResponseDto<GalaxyNftPublishAndBuyRespDto> responseDto = jsonNftPublishAndBuyProcessor.nftPublishAndBuy(textMessage);
+                if(responseDto.isSuccess()){
+                    aBoolean = true;
+                }
             }
         } catch (Exception e) {
             log.error("CONSUMER MSG EX_HANDLE ==> [{}]:{}", this.getRedisStreamKey(), msg, e);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinTradeCommonBiz.java

@@ -68,7 +68,7 @@ public class ZxinTradeCommonBiz {
 
         //获取sku信息
         GalaxySeriesNftInfoBo seriesNftInfoBo = dataUtils.getSeriesNftInfoBo(reqDto.getRouterType(),reqDto.getSkuId());
-        if(StringUtil.isNull(seriesNftInfoBo)){
+        if(StringUtil.isNull(seriesNftInfoBo)||StringUtil.isEmpty(seriesNftInfoBo.getSeriesId())){
             log.error("开始执行nftPublishAndBuy error msg:{}",GalaxyErrorEnum.SERIES_NFT_INFO_NOT_EXIST.getMessage());
             return ResponseDto.failure(GalaxyErrorEnum.SERIES_NFT_INFO_NOT_EXIST.getCode(), GalaxyErrorEnum.SERIES_NFT_INFO_NOT_EXIST.getMessage());
         }
@@ -87,7 +87,11 @@ public class ZxinTradeCommonBiz {
                     &&nftOrderBo.getNftBuyStatus().equalsIgnoreCase(GalaxyEnum.TaskStatusEnum.INIT.getCode())){
                 //再次发起购买
                 GalaxyNftPublishAndBuyRespDto nftPublishAndBuyRespDto = this.executeBuyBusiness(reqDto,userInfoBo,seriesNftInfoBo,nftOrderBo);
-                return ResponseDto.success(nftPublishAndBuyRespDto);
+                if(StringUtil.isNotNull(nftPublishAndBuyRespDto)&&StringUtil.isNotEmpty(nftPublishAndBuyRespDto.getNftId())){
+                    return ResponseDto.success(nftPublishAndBuyRespDto);
+                }else{
+                    return ResponseDto.failure(GalaxyErrorEnum.NFT_BUY_FAIL.getCode(),GalaxyErrorEnum.NFT_BUY_FAIL.getMessage());
+                }
             }
         }
 
@@ -277,7 +281,11 @@ public class ZxinTradeCommonBiz {
         //第二步：执行购买逻辑
         if(StringUtil.isNotEmpty(nftId)){
             GalaxyNftPublishAndBuyRespDto nftPublishAndBuyRespDto = this.executeBuyBusiness(reqDto,userInfoBo,seriesNftInfoBo,nftOrderBo);
-            return ResponseDto.success(nftPublishAndBuyRespDto);
+            if(StringUtil.isNotNull(nftPublishAndBuyRespDto)&&StringUtil.isNotEmpty(nftPublishAndBuyRespDto.getNftId())){
+                return ResponseDto.success(nftPublishAndBuyRespDto);
+            }else{
+                return ResponseDto.failure(GalaxyErrorEnum.NFT_BUY_FAIL.getCode(),GalaxyErrorEnum.NFT_BUY_FAIL.getMessage());
+            }
         }
         return ResponseDto.failure(GalaxyErrorEnum.PUBLISH_FAIL.getCode(), GalaxyErrorEnum.PUBLISH_FAIL.getMessage());
     }