修改配置端口为9016

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/bo/GalaxySeriesInfoBo.java

@@ -4,6 +4,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @author AnJiabin <anjiabin@zhengzai.tv>
@@ -82,7 +83,7 @@ public class GalaxySeriesInfoBo implements Serializable,Cloneable {
     /**
      * 可售状态下有意义，表示售卖多少积分
      */
-    private String sellCount;
+    private BigDecimal sellCount;
 
     /**
      * 系列显示封面

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinArtworkBiz.java

@@ -29,6 +29,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
@@ -146,11 +147,22 @@ public class ZxinArtworkBiz {
     }
 
     public ResponseDto<GalaxyArtSeriesClaimRespDto> seriesClaim(GalaxyArtSeriesClaimReqDto reqDto) {
+        //系列声明用到参数
         String skuId = reqDto.getSkuId();
         String seriesName = GalaxyConstant.SERIES_NAME_PREFIX.concat(skuId);
-        String nftUrl = reqDto.getCoverUrl();
-        Long totalCound = reqDto.getTotalCount();
-        String desc = reqDto.getDesc();
+        Long totalCount = reqDto.getTotalCount();
+        String coverUrl = reqDto.getCoverUrl();//暂时用nftUrl
+        String seriesDesc = reqDto.getSeriesDesc();
+        //发行用到的相关信息
+        String author = reqDto.getAuthor();
+        String nftName = reqDto.getNftName();
+        String nftUrl = reqDto.getNftUrl();
+        String displayUrl = reqDto.getDisplayUrl();
+        String nftDesc = reqDto.getNftDesc();
+        String nftFlag = reqDto.getNftFlag();
+        String sellCount = reqDto.getSellCount();
+
+
         //返回参数
         String seriesId = null;
         String taskId = null;
@@ -175,11 +187,11 @@ public class ZxinArtworkBiz {
         nft030ReqDto.setPubKey(zxlnftConfig.getNftPlatformPubKey());
         nft030ReqDto.setSeriesName(seriesName);
         //无限制系列 设置为0
-        nft030ReqDto.setTotalCount(totalCound);
+        nft030ReqDto.setTotalCount(totalCount);
         nft030ReqDto.setOperateId(IDGenerator.get32UUID());
         //系列封面
-        nft030ReqDto.setCoverUrl(nftUrl);
-        nft030ReqDto.setDesc(desc);
+        nft030ReqDto.setCoverUrl(coverUrl);
+        nft030ReqDto.setDesc(seriesDesc);
         nft030ReqDto.setMaxPublishCount(0);
         nft030ReqDto.setSeriesBeginFromZero(false);
         ZxlnftResponseDto<Nft030SeriesClaimRespDto> nft30RespDto = zxlnftSdkUtil.nft030SeriesClaim(nft030ReqDto);
@@ -228,14 +240,16 @@ public class ZxinArtworkBiz {
 
         //构造缓存数据
         if(seriesInfoBo==null){
-            this.buildSeriesInfoBo(skuId,seriesName,seriesId,totalCound,0l,nftUrl,nftUrl);
+            seriesInfoBo = this.buildSeriesInfoBo(false,skuId,seriesName,seriesId,totalCount,0l,
+                    author,nftName,nftUrl,displayUrl,nftDesc,nftFlag,sellCount,coverUrl,seriesDesc);
             dataUtils.setSeriesInfoBo(reqDto.getRouteType(),reqDto.getSkuId(),seriesInfoBo);
         }
         return ResponseDto.success(seriesClaimRespDto);
     }
 
 
-    private GalaxySeriesInfoBo buildSeriesInfoBo(String skuId,String seriesName,String seriesId,Long totalCount,Long crtCount,String nftUrl,String imageUrl){
+    private GalaxySeriesInfoBo buildSeriesInfoBo(boolean isInit,String skuId,String seriesName,String seriesId,Long totalCount,Long crtCount
+            ,String author,String nftName,String nftUrl,String displayUrl,String nftDesc,String nftFlag,String sellCount,String coverUrl,String seriesDesc){
 
         GalaxySeriesInfoBo seriesInfoBo = GalaxySeriesInfoBo.getNew();
         seriesInfoBo.setSkuId(skuId);
@@ -243,12 +257,25 @@ public class ZxinArtworkBiz {
         seriesInfoBo.setSeriesId(seriesId);
         seriesInfoBo.setTotalCount(totalCount);
         seriesInfoBo.setCrtCount(crtCount);
-        if(StringUtil.isEmpty(seriesId)){
-            seriesInfoBo.setPublishStatus(GalaxyConstant.SeriesClaimStatusEnum.PROCESSING.getCode());
-        }else{
-            seriesInfoBo.setPublishStatus(GalaxyConstant.SeriesClaimStatusEnum.SUCCESS.getCode());
+        seriesInfoBo.setNftUrl(nftUrl);
+        seriesInfoBo.setPublishStatus(GalaxyConstant.SeriesClaimStatusEnum.SERIES_INIT.getCode());
+        if(!isInit){
+            if(StringUtil.isEmpty(seriesId)){
+                seriesInfoBo.setPublishStatus(GalaxyConstant.SeriesClaimStatusEnum.PROCESSING.getCode());
+            }else{
+                seriesInfoBo.setPublishStatus(GalaxyConstant.SeriesClaimStatusEnum.SUCCESS.getCode());
+            }
         }
+        //以下为购买信息
+        seriesInfoBo.setAuthor(author);
+        seriesInfoBo.setNftName(nftName);
         seriesInfoBo.setNftUrl(nftUrl);
+        seriesInfoBo.setDisplayUrl(displayUrl);
+        seriesInfoBo.setNftDesc(nftDesc);
+        seriesInfoBo.setNftFlag(nftFlag);
+        seriesInfoBo.setSellCount(new BigDecimal(sellCount));
+        seriesInfoBo.setCoverUrl(coverUrl);
+        seriesInfoBo.setSeriesDesc(seriesDesc);
         return seriesInfoBo;
     }
 

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinPublishBiz.java

@@ -9,8 +9,11 @@ import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesInfoBo;
+import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftBuyReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftBuyRespDto;
+import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -41,23 +44,32 @@ public class ZxinPublishBiz {
     @Autowired
     private ZxlnftConfig zxlnftConfig;
 
+    @Autowired
+    private DataUtils dataUtils;
+
     public ResponseDto<GalaxyNftBuyRespDto> nftBuy(GalaxyNftBuyReqDto reqDto) {
-        String author = reqDto.getAuthor();
-        String name = reqDto.getName();
-        String url = reqDto.getUrl();
-        String displayUrl = reqDto.getDisplayUrl();
+        //获取用户信息
+        GalaxyUserInfoBo userInfoBo = dataUtils.getGalaxyUserInfo(reqDto.getRouteType(),reqDto.getUserId());
+
+        //获取sku信息
+        GalaxySeriesInfoBo seriesInfoBo = dataUtils.getSeriesInfoBo(reqDto.getRouteType(),reqDto.getSkuId());
+
+        String author = seriesInfoBo.getAuthor();
+        String nftName = seriesInfoBo.getNftName();
+        String nftUrl = seriesInfoBo.getNftUrl();
+        String displayUrl = seriesInfoBo.getDisplayUrl();
 
-        String desc = reqDto.getDesc();
-        String flag = reqDto.getFlag();
+        String nftDesc = seriesInfoBo.getNftDesc();
+        String nftFlag = seriesInfoBo.getNftFlag();
         //发行个数
         Long publishCount = 1L;
         //开始索引
         Integer seriesBeginIndex = 0;
-        Long sellCount = Long.valueOf(new BigDecimal(reqDto.getSellCount()).longValue()); //积分
+        Long sellCount = Long.valueOf(seriesInfoBo.getSellCount().multiply(BigDecimal.valueOf(100l)).longValue()); //积分
         /**
          * 根据sku获取系列Id
          */
-        String seriesId = reqDto.getSkuId();
+        String seriesId = seriesInfoBo.getSkuId();
 
 
         //查询系列信息
@@ -79,11 +91,11 @@ public class ZxinPublishBiz {
          */
         Nft034PublishReqDto nft034ReqDto = Nft034PublishReqDto.getNew();
         nft034ReqDto.setAuthor(author);
-        nft034ReqDto.setName(name);
-        nft034ReqDto.setUrl(url);
+        nft034ReqDto.setName(nftName);
+        nft034ReqDto.setUrl(nftUrl);
         nft034ReqDto.setDisplayUrl(displayUrl);
-        nft034ReqDto.setDesc(desc);
-        nft034ReqDto.setFlag(flag);
+        nft034ReqDto.setDesc(nftDesc);
+        nft034ReqDto.setFlag(nftFlag);
         nft034ReqDto.setPublishCount(publishCount);
         //无限制零系列
         nft034ReqDto.setSeriesId(seriesId);