nft 增加创作者和发行方字段

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/GoblinNftGoodsSkuInfoVo.java

@@ -112,6 +112,11 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 72, value = "下个分段购开始时间，如果为null则没有")
     private LocalDateTime nextSaleStartTime;
 
+    @ApiModelProperty(position = 73, value = "创作者")
+    private String author;
+    @ApiModelProperty(position = 74, value = "发行方")
+    private String publisher;
+
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 
     public static GoblinNftGoodsSkuInfoVo getNew() {

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

@@ -31,15 +31,15 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
 
     @Override
     public KylinRecommendActiveVo getRecommendById(List<KylinRecommendActive> list) {
-        for(KylinRecommendActive kylinRecommendActive:list){
+        for (KylinRecommendActive kylinRecommendActive : list) {
             //查看时间是否在当前范围内
-            if(LocalDateTime.now().isAfter(kylinRecommendActive.getStartTime())&&LocalDateTime.now().isBefore(kylinRecommendActive.getEndTime())){
+            if (LocalDateTime.now().isAfter(kylinRecommendActive.getStartTime()) && LocalDateTime.now().isBefore(kylinRecommendActive.getEndTime())) {
                 KylinRecommendActiveVo kylinRecommendActiveVo = KylinRecommendActiveVo.getNew();
-                BeanUtils.copyProperties(kylinRecommendActive,kylinRecommendActiveVo);
+                BeanUtils.copyProperties(kylinRecommendActive, kylinRecommendActiveVo);
                 ArrayList<KylinRecommendActiveRelationVo> kylinRecommendActiveRelationVoList = ObjectUtil.getKylinRecommendActiveRelationVo();
-                for(KylinRecommendActiveRelation ky:kylinRecommendActive.getList()){
+                for (KylinRecommendActiveRelation ky : kylinRecommendActive.getList()) {
                     KylinRecommendActiveRelationVo aNew = KylinRecommendActiveRelationVo.getNew();
-                    BeanUtils.copyProperties(ky,aNew);
+                    BeanUtils.copyProperties(ky, aNew);
                     kylinRecommendActiveRelationVoList.add(aNew);
                 }
                 kylinRecommendActiveVo.setList(kylinRecommendActiveRelationVoList);
@@ -71,34 +71,37 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
                 }*/
                 //遍历list
                 List<KylinRecommendActiveRelationVo> kylinRecommendActiveVoList = kylinRecommendActiveVo.getList();
-                for(KylinRecommendActiveRelationVo kylinRecommendActiveRelationVo:kylinRecommendActiveVoList){
-                    if(kylinRecommendActiveRelationVo.getType()==1){
+                for (KylinRecommendActiveRelationVo kylinRecommendActiveRelationVo : kylinRecommendActiveVoList) {
+                    if (kylinRecommendActiveRelationVo.getType() == 1) {
                         //NFT
-                        GoblinNftGoodsSkuInfoVo goblinNftGoodsSkuInfoVo=goodsDetail(kylinRecommendActiveRelationVo.getRecommendBindId());
-                        if(null!=goblinNftGoodsSkuInfoVo){
+                        GoblinNftGoodsSkuInfoVo goblinNftGoodsSkuInfoVo = goodsDetail(kylinRecommendActiveRelationVo.getRecommendBindId());
+                        if (null != goblinNftGoodsSkuInfoVo) {
                             com.liquidnet.service.kylin.dto.vo.GoblinNftGoodsSkuInfoVo aNew = com.liquidnet.service.kylin.dto.vo.GoblinNftGoodsSkuInfoVo.getNew();
-                            BeanUtils.copyProperties(goblinNftGoodsSkuInfoVo,aNew);
+                            GoblinGoodsInfoVo goodsInfoVo = kylinRedisUtils.getGoodsInfoVo(kylinRecommendActiveRelationVo.getRecommendBindId());
+                            BeanUtils.copyProperties(goblinNftGoodsSkuInfoVo, aNew);
+                            aNew.setAuthor(goodsInfoVo.getAuthor());
+                            aNew.setPublisher(goodsInfoVo.getPublisher());
                             kylinRecommendActiveRelationVo.setGoblinNftGoodsSkuInfoVo(aNew);
                         }
 
-                    }else if(kylinRecommendActiveRelationVo.getType()==2){
+                    } else if (kylinRecommendActiveRelationVo.getType() == 2) {
                         //组合购
                         GoblinMixAppDetailsVo goblinMixAppDetailsVo = mixDetails(kylinRecommendActiveRelationVo.getRecommendBindId());
-                        if(null!=goblinMixAppDetailsVo){
+                        if (null != goblinMixAppDetailsVo) {
                             com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo aNew = com.liquidnet.service.kylin.dto.vo.GoblinMixAppDetailsVo.getNew();
-                            BeanUtils.copyProperties(goblinMixAppDetailsVo,aNew);
+                            BeanUtils.copyProperties(goblinMixAppDetailsVo, aNew);
                             kylinRecommendActiveRelationVo.setGoblinMixAppDetailsVo(aNew);
                         }
-                    }else if(kylinRecommendActiveRelationVo.getType()==3){
+                    } else if (kylinRecommendActiveRelationVo.getType() == 3) {
                         //演出
                         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(kylinRecommendActiveRelationVo.getRecommendBindId());
                         kylinRecommendActiveRelationVo.setKylinPerformanceVo(performancesInfo);
-                    }else if(kylinRecommendActiveRelationVo.getType()==4){
-    //商品               //商品
+                    } else if (kylinRecommendActiveRelationVo.getType() == 4) {
+                        //商品               //商品
                         GoblinGoodsInfoVo goblinGoodsInfoVo = kylinRedisUtils.getGoodsInfoVo(kylinRecommendActiveRelationVo.getRecommendBindId());
-                        if(null!=goblinGoodsInfoVo){
+                        if (null != goblinGoodsInfoVo) {
                             com.liquidnet.service.kylin.dto.vo.GoblinGoodsInfoVo aNew = com.liquidnet.service.kylin.dto.vo.GoblinGoodsInfoVo.getNew();
-                            BeanUtils.copyProperties(goblinGoodsInfoVo,aNew);
+                            BeanUtils.copyProperties(goblinGoodsInfoVo, aNew);
                             kylinRecommendActiveRelationVo.setGoblinGoodsInfoVo(aNew);
                         }
                     }
@@ -110,7 +113,7 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
     }
 
     /**
-     *NFT 获取详情
+     * NFT 获取详情
      */
     public GoblinNftGoodsSkuInfoVo goodsDetail(String skuId) {
         // 1
@@ -143,7 +146,7 @@ public class KylinRecommendActiveServiceImpl implements IKylinRecommendActiveSer
         }
     }
 
-    public GoblinMixAppDetailsVo  mixDetails(String mixId) {
+    public GoblinMixAppDetailsVo mixDetails(String mixId) {
         GoblinMixDetailsVo baseVo = kylinRedisUtils.getMixDetails(mixId);
         //GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
         GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, "");