opt-rename;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinDigitalArtworkInfoVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkInfoVo.java

@@ -7,10 +7,10 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel(value = "GoblinDigitalArtworkInfoVo", description = "藏品详情信息")
+@ApiModel(value = "GoblinUserDigitalArtworkInfoVo", description = "我的藏品详情")
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GoblinDigitalArtworkInfoVo implements Serializable, Cloneable {
+public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 8903534983251413696L;
     @ApiModelProperty(position = 11, value = "藏品名称")
     private String name;
@@ -40,17 +40,17 @@ public class GoblinDigitalArtworkInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 23, value = "藏品详情")
     private String details;
 
-    private static final GoblinDigitalArtworkInfoVo obj = new GoblinDigitalArtworkInfoVo();
+    private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
 
-    public static GoblinDigitalArtworkInfoVo getNew() {
+    public static GoblinUserDigitalArtworkInfoVo getNew() {
         try {
-            return (GoblinDigitalArtworkInfoVo) obj.clone();
+            return (GoblinUserDigitalArtworkInfoVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new GoblinDigitalArtworkInfoVo();
+            return new GoblinUserDigitalArtworkInfoVo();
         }
     }
 
-    public GoblinDigitalArtworkInfoVo copy(GoblinDigitalArtworkVo source) {
+    public GoblinUserDigitalArtworkInfoVo copy(GoblinUserDigitalArtworkVo source) {
 //        this.setName();
 //        this.setSubtitle();
 //        this.setMaterialType();

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinDigitalArtworkListVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkListVo.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 @ApiModel(value = "GoblinDigitalArtworkListVo", description = "藏品列表信息")
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GoblinDigitalArtworkListVo implements Serializable, Cloneable {
+public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -1510553574954846520L;
     @ApiModelProperty(position = 11, value = "藏品Id")
     private String artworkId;
@@ -45,17 +45,17 @@ public class GoblinDigitalArtworkListVo implements Serializable, Cloneable {
     private LocalDateTime openingTime;
 
 
-    private static final GoblinDigitalArtworkListVo obj = new GoblinDigitalArtworkListVo();
+    private static final GoblinUserDigitalArtworkListVo obj = new GoblinUserDigitalArtworkListVo();
 
-    public static GoblinDigitalArtworkListVo getNew() {
+    public static GoblinUserDigitalArtworkListVo getNew() {
         try {
-            return (GoblinDigitalArtworkListVo) obj.clone();
+            return (GoblinUserDigitalArtworkListVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new GoblinDigitalArtworkListVo();
+            return new GoblinUserDigitalArtworkListVo();
         }
     }
 
-    public GoblinDigitalArtworkListVo copy(GoblinDigitalArtworkVo source) {
+    public GoblinUserDigitalArtworkListVo copy(GoblinUserDigitalArtworkVo source) {
         this.setArtworkId(source.getArtworkId());
 //        this.setName();
 //        this.setSubtitle();

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinDigitalArtworkPageVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkPageVo.java

@@ -5,40 +5,39 @@ import com.liquidnet.service.base.PagedResult;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-@ApiModel(value = "GoblinDigitalArtworkPageVo", description = "我的藏品信息")
+@ApiModel(value = "GoblinUserDigitalArtworkPageVo", description = "我的藏品信息")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GoblinDigitalArtworkPageVo implements Cloneable {
-    private static final long serialVersionUID = -1510553574954846520L;
+public class GoblinUserDigitalArtworkPageVo implements Cloneable {
     @ApiModelProperty(position = 11, value = "藏品数量")
     private int artworkNum;
     @ApiModelProperty(position = 12, value = "藏品列表分页数据")
-    private PagedResult<GoblinDigitalArtworkListVo> pagedResult;
+    private PagedResult<GoblinUserDigitalArtworkListVo> pagedResult;
 
     public int getArtworkNum() {
         return artworkNum;
     }
 
-    public PagedResult<GoblinDigitalArtworkListVo> getPagedResult() {
+    public PagedResult<GoblinUserDigitalArtworkListVo> getPagedResult() {
         return pagedResult;
     }
 
-    public GoblinDigitalArtworkPageVo setArtworkNum(int artworkNum) {
+    public GoblinUserDigitalArtworkPageVo setArtworkNum(int artworkNum) {
         this.artworkNum = artworkNum;
         return this;
     }
 
-    public GoblinDigitalArtworkPageVo setPagedResult(PagedResult<GoblinDigitalArtworkListVo> pagedResult) {
+    public GoblinUserDigitalArtworkPageVo setPagedResult(PagedResult<GoblinUserDigitalArtworkListVo> pagedResult) {
         this.pagedResult = pagedResult;
         return this;
     }
 
-    private static final GoblinDigitalArtworkPageVo obj = new GoblinDigitalArtworkPageVo();
+    private static final GoblinUserDigitalArtworkPageVo obj = new GoblinUserDigitalArtworkPageVo();
 
-    public static GoblinDigitalArtworkPageVo getNew() {
+    public static GoblinUserDigitalArtworkPageVo getNew() {
         try {
-            return (GoblinDigitalArtworkPageVo) obj.clone();
+            return (GoblinUserDigitalArtworkPageVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new GoblinDigitalArtworkPageVo();
+            return new GoblinUserDigitalArtworkPageVo();
         }
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinDigitalArtworkVo.java → liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkVo.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GoblinDigitalArtworkVo implements Serializable, Cloneable {
+public class GoblinUserDigitalArtworkVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -5920952408993245963L;
     private String artworkId;
     private String uid;
@@ -32,13 +32,13 @@ public class GoblinDigitalArtworkVo implements Serializable, Cloneable {
     private String author;
     private String publisher;
 
-    private static final GoblinDigitalArtworkVo obj = new GoblinDigitalArtworkVo();
+    private static final GoblinUserDigitalArtworkVo obj = new GoblinUserDigitalArtworkVo();
 
-    public static GoblinDigitalArtworkVo getNew() {
+    public static GoblinUserDigitalArtworkVo getNew() {
         try {
-            return (GoblinDigitalArtworkVo) obj.clone();
+            return (GoblinUserDigitalArtworkVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new GoblinDigitalArtworkVo();
+            return new GoblinUserDigitalArtworkVo();
         }
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinUserDigitalArtworkService.java

 package com.liquidnet.service.goblin.service;
 
-import com.liquidnet.service.goblin.dto.vo.GoblinDigitalArtworkInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinDigitalArtworkListVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinDigitalArtworkPageVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinDigitalArtworkVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserDigitalArtworkInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserDigitalArtworkListVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserDigitalArtworkPageVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserDigitalArtworkVo;
 
 public interface IGoblinUserDigitalArtworkService {
 
-    GoblinDigitalArtworkPageVo page(String uid, Integer pageNum, Integer pageSize);
+    GoblinUserDigitalArtworkPageVo page(String uid, Integer pageNum, Integer pageSize);
 
-    GoblinDigitalArtworkInfoVo info(String uid, String artworkId);
+    GoblinUserDigitalArtworkInfoVo info(String uid, String artworkId);
 
-    GoblinDigitalArtworkListVo unboxingForBuyOrExchange(String uid, GoblinDigitalArtworkVo userDigitalArtworkVo);
+    GoblinUserDigitalArtworkListVo unboxingForBuyOrExchange(String uid, GoblinUserDigitalArtworkVo userDigitalArtworkVo);
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinDigitalArtwork.java → liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinUserDigitalArtwork.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class GoblinDigitalArtwork implements Serializable {
+public class GoblinUserDigitalArtwork implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinDigitalArtworkMapper.java → liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinUserDigitalArtworkMapper.java

 package com.liquidnet.service.goblin.mapper;
 
-import com.liquidnet.service.goblin.entity.GoblinDigitalArtwork;
+import com.liquidnet.service.goblin.entity.GoblinUserDigitalArtwork;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author liquidnet
  * @since 2022-03-23
  */
-public interface GoblinDigitalArtworkMapper extends BaseMapper<GoblinDigitalArtwork> {
+public interface GoblinUserDigitalArtworkMapper extends BaseMapper<GoblinUserDigitalArtwork> {
 
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinDigitalArtworkMapper.xml → liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinUserDigitalArtworkMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.goblin.mapper.GoblinDigitalArtworkMapper">
+<mapper namespace="com.liquidnet.service.goblin.mapper.GoblinUserDigitalArtworkMapper">
 
 </mapper>

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

@@ -9,7 +9,7 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.GoblinQueueBizArtworkGenDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinDigitalArtworkVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinUserDigitalArtworkVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -36,7 +36,7 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    private static final String SQL_INSERT_ARTWORK = "INSERT INTO goblin_digital_artwork (artwork_id, sku_id, uid, order_id, source, state, created_at)VALUES(?,?,?,?,?,?,?)";
+    private static final String SQL_INSERT_ARTWORK = "INSERT INTO goblin_user_digital_artwork (artwork_id, sku_id, uid, order_id, source, state, created_at)VALUES(?,?,?,?,?,?,?)";
     private static final String QUEUE_MSG_TL = "{\"nftOrderPayId\":\"1\",\"routerType\":\"zxinchain\",\"skuId\":\"2\",\"userId\":\"3\",\"buyTimestamp\":\"4\"}";
     private static final String QUEUE_KEY_NFT = "galaxy:stream:rk.json.nftPublishAndBuy";
 
@@ -95,7 +95,7 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
 
             LocalDateTime now = LocalDateTime.now();
 
-            GoblinDigitalArtworkVo digitalArtworkVo = GoblinDigitalArtworkVo.getNew();
+            GoblinUserDigitalArtworkVo digitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
             String artworkId = IDGenerator.nextMilliId2();
             digitalArtworkVo.setArtworkId(artworkId);
             digitalArtworkVo.setSkuId(skuId);
@@ -107,12 +107,12 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
             digitalArtworkVo.setCreatedAt(now);
 
             // Mongo记录VO
-            mongoTemplate.insert(digitalArtworkVo, GoblinDigitalArtworkVo.class.getSimpleName());
+            mongoTemplate.insert(digitalArtworkVo, GoblinUserDigitalArtworkVo.class.getSimpleName());
             boolean fromBoxArtworkFlg = StringUtils.isNotEmpty(fromArtworkId);
             if (fromBoxArtworkFlg) {// 更新盲盒藏品数据
-                GoblinDigitalArtworkVo userDigitalArtworkVo = this.getUserDigitalArtworkVoFromRdb(fromArtworkId);
+                GoblinUserDigitalArtworkVo userDigitalArtworkVo = this.getUserDigitalArtworkVoFromRdb(fromArtworkId);
                 if (null != userDigitalArtworkVo) {
-                    mongoTemplate.getCollection(GoblinDigitalArtworkVo.class.getSimpleName()).updateOne(
+                    mongoTemplate.getCollection(GoblinUserDigitalArtworkVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("artworkId").is(fromArtworkId).and("state").ne(1)).getQueryObject(),
                             Update.update("state", userDigitalArtworkVo.getState())
                                     .set("delFlg", userDigitalArtworkVo.getDelFlg())
@@ -199,8 +199,8 @@ public class ConsumerGoblinBizArtworkGenRdsReceiver extends AbstractBizRedisRece
         return vo;
     }
 
-    public GoblinDigitalArtworkVo getUserDigitalArtworkVoFromRdb(String artworkId) {
-        return (GoblinDigitalArtworkVo) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(artworkId));
+    public GoblinUserDigitalArtworkVo getUserDigitalArtworkVoFromRdb(String artworkId) {
+        return (GoblinUserDigitalArtworkVo) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(artworkId));
     }
 
     public boolean hasUserDigitalArtworkVoFromRdb(String genMarkerKey) {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql

@@ -78,8 +78,8 @@ create table goblin_goods_sku_tag
 
 create unique index uidx_ggst_sku_tag on goblin_goods_sku_tag (sku_id, tag_id);
 # -- >>------------------------------------------------------------------------------------
-drop table if exists goblin_digital_artwork;
-create table goblin_digital_artwork
+drop table if exists goblin_user_digital_artwork;
+create table goblin_user_digital_artwork
 (
     mid            bigint auto_increment primary key,
     artwork_id     varchar(64)  not null comment '藏品ID',
@@ -102,7 +102,7 @@ create table goblin_digital_artwork
     updated_at     datetime     null,
     deleted_at     datetime     null,
     comment        varchar(500)
-) engine = InnoDB comment '数字藏品信息';
+) engine = InnoDB comment '用户数字藏品信息';
 # -- >>------------------------------------------------------------------------------------
 drop table if exists goblin_goods_sku_excode;
 create table goblin_goods_sku_excode

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

@@ -33,7 +33,7 @@ public class GoblinUserDigitalArtworkController {
     @Autowired
     GoblinRedisUtils goblinRedisUtils;
     @Autowired
-    IGoblinUserDigitalArtworkService goblinDigitalArtworkService;
+    IGoblinUserDigitalArtworkService goblinUserDigitalArtworkService;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "藏品列表")
@@ -42,12 +42,12 @@ public class GoblinUserDigitalArtworkController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "显示记录数[默认5，暂定最大也为5]"),
     })
     @PostMapping("list")
-    public ResponseDto<GoblinDigitalArtworkPageVo> list(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
+    public ResponseDto<GoblinUserDigitalArtworkPageVo> list(@RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                             @RequestParam(required = false, defaultValue = "5") Integer pageSize) {
         pageNum = pageNum < 1 ? 1 : pageNum;
         pageSize = pageSize < 1 ? 5 : (pageSize > 5 ? 5 : pageSize);
         String currentUid = CurrentUtil.getCurrentUid();
-        return ResponseDto.success(goblinDigitalArtworkService.page(currentUid, pageNum, pageSize));
+        return ResponseDto.success(goblinUserDigitalArtworkService.page(currentUid, pageNum, pageSize));
     }
 
     @ApiOperationSupport(order = 2)
@@ -56,8 +56,8 @@ public class GoblinUserDigitalArtworkController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "artworkId", value = "藏品ID"),
     })
     @PostMapping("info")
-    public ResponseDto<GoblinDigitalArtworkInfoVo> info(@NotBlank(message = "藏品ID不能为空") @RequestParam String artworkId) {
-        return ResponseDto.success(goblinDigitalArtworkService.info(CurrentUtil.getCurrentUid(), artworkId));
+    public ResponseDto<GoblinUserDigitalArtworkInfoVo> info(@NotBlank(message = "藏品ID不能为空") @RequestParam String artworkId) {
+        return ResponseDto.success(goblinUserDigitalArtworkService.info(CurrentUtil.getCurrentUid(), artworkId));
     }
 
     @ApiOperationSupport(order = 3)
@@ -66,10 +66,10 @@ public class GoblinUserDigitalArtworkController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "artworkId", value = "藏品ID"),
     })
     @PostMapping("unboxing")
-    public ResponseDto<GoblinDigitalArtworkListVo> unboxing(@NotBlank(message = "藏品ID不能为空")
+    public ResponseDto<GoblinUserDigitalArtworkListVo> unboxing(@NotBlank(message = "藏品ID不能为空")
                                                             @RequestParam String artworkId) {
         String currentUid = CurrentUtil.getCurrentUid();
-        GoblinDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
+        GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
         if (null == userDigitalArtworkVo || !currentUid.equals(userDigitalArtworkVo.getUid())) {
             return ResponseDto.failure(ErrorMapping.get("140100"));
         }
@@ -83,17 +83,17 @@ public class GoblinUserDigitalArtworkController {
         if (1 == userDigitalArtworkVo.getState()) {// 盲盒已开启
             GoblinNftOrderVo goblinNftOrder = goblinRedisUtils.getGoblinNftOrder(userDigitalArtworkVo.getOrderId());
             GoblinGoodsSkuInfoVo unboxSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftOrder.getBoxSkuId());
-            GoblinDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinDigitalArtworkListVo.getNew();
+            GoblinUserDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinUserDigitalArtworkListVo.getNew();
             unboxDigitalArtworkListVo.setName(unboxSkuInfoVo.getName());
             unboxDigitalArtworkListVo.setSubtitle(unboxSkuInfoVo.getSubtitle());
             unboxDigitalArtworkListVo.setCoverPic(unboxSkuInfoVo.getSkuPic());
             return ResponseDto.success(unboxDigitalArtworkListVo);
         }
-        GoblinDigitalArtworkListVo unboxingRstVo = null;
+        GoblinUserDigitalArtworkListVo unboxingRstVo = null;
         switch (userDigitalArtworkVo.getSource()) {
             case 1:
             case 2:
-                unboxingRstVo = goblinDigitalArtworkService.unboxingForBuyOrExchange(currentUid, userDigitalArtworkVo);
+                unboxingRstVo = goblinUserDigitalArtworkService.unboxingForBuyOrExchange(currentUid, userDigitalArtworkVo);
                 break;
             case 3:
             default:

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

@@ -43,17 +43,17 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 //    private String sevGalaxyUrl;
 
     @Override
-    public GoblinDigitalArtworkPageVo page(String uid, Integer pageNum, Integer pageSize) {
-        GoblinDigitalArtworkPageVo pageVo = GoblinDigitalArtworkPageVo.getNew();
+    public GoblinUserDigitalArtworkPageVo page(String uid, Integer pageNum, Integer pageSize) {
+        GoblinUserDigitalArtworkPageVo pageVo = GoblinUserDigitalArtworkPageVo.getNew();
         long artworkNum = goblinRedisUtils.countUserDigitalArtwork(uid);
         if (artworkNum > 0) {
             if (artworkNum > 30 && pageNum * pageSize > 30) {// 查询Mongo
-                PagedResult<GoblinDigitalArtworkListVo> listVoPagedResult = goblinMongoUtils.getUserDigitalArtworkListVos(uid, pageNum, pageSize);
+                PagedResult<GoblinUserDigitalArtworkListVo> listVoPagedResult = goblinMongoUtils.getUserDigitalArtworkListVos(uid, pageNum, pageSize);
                 listVoPagedResult.setTotal(artworkNum, pageSize);
                 pageVo.setArtworkNum((int) artworkNum).setPagedResult(listVoPagedResult);
             } else {
-                PagedResult<GoblinDigitalArtworkListVo> listVoPagedResult = ObjectUtil.getGoblinDigitalArtworkListVoPagedResult();
-                List<GoblinDigitalArtworkListVo> list = ObjectUtil.getGoblinDigitalArtworkListVoArrayList();
+                PagedResult<GoblinUserDigitalArtworkListVo> listVoPagedResult = ObjectUtil.getGoblinUserDigitalArtworkListVoPagedResult();
+                List<GoblinUserDigitalArtworkListVo> list = ObjectUtil.getGoblinUserDigitalArtworkListVoArrayList();
 
                 List<String> userDigitalArtworkIds = goblinRedisUtils.getUserDigitalArtworkIds(uid);
                 if (!CollectionUtils.isEmpty(userDigitalArtworkIds)) {
@@ -64,11 +64,11 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
                     LocalDateTime now = LocalDateTime.now(), toCheckTime = now.minusSeconds(15);
                     int subSize = subList.size();
                     for (int i = 0; i < subSize; i++) {
-                        GoblinDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(subList.get(i));
+                        GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(subList.get(i));
                         if (null != userDigitalArtworkVo) {
                             GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());
 
-                            GoblinDigitalArtworkListVo listVo = GoblinDigitalArtworkListVo.getNew().copy(userDigitalArtworkVo);
+                            GoblinUserDigitalArtworkListVo listVo = GoblinUserDigitalArtworkListVo.getNew().copy(userDigitalArtworkVo);
                             listVo.setName(goodsSkuInfoVo.getName());
                             listVo.setSubtitle(goodsSkuInfoVo.getSubtitle());
                             listVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
@@ -100,10 +100,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
     }
 
     @Override
-    public GoblinDigitalArtworkInfoVo info(String uid, String artworkId) {
-        GoblinDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
+    public GoblinUserDigitalArtworkInfoVo info(String uid, String artworkId) {
+        GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
         if (null != userDigitalArtworkVo && userDigitalArtworkVo.getUid().equals(uid)) {
-            GoblinDigitalArtworkInfoVo artworkInfoVo = GoblinDigitalArtworkInfoVo.getNew().copy(userDigitalArtworkVo);
+            GoblinUserDigitalArtworkInfoVo artworkInfoVo = GoblinUserDigitalArtworkInfoVo.getNew().copy(userDigitalArtworkVo);
 
             GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());
             GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(goodsSkuInfoVo.getSpuId());
@@ -123,12 +123,12 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
     }
 
     @Override
-    public GoblinDigitalArtworkListVo unboxingForBuyOrExchange(String uid, GoblinDigitalArtworkVo userDigitalArtworkVo) {
+    public GoblinUserDigitalArtworkListVo unboxingForBuyOrExchange(String uid, GoblinUserDigitalArtworkVo userDigitalArtworkVo) {
         String orderId = userDigitalArtworkVo.getOrderId();
         GoblinNftOrderVo goblinNftOrder = goblinRedisUtils.getGoblinNftOrder(orderId);
         GoblinGoodsSkuInfoVo unboxSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftOrder.getBoxSkuId());
 
-        GoblinDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinDigitalArtworkListVo.getNew();
+        GoblinUserDigitalArtworkListVo unboxDigitalArtworkListVo = GoblinUserDigitalArtworkListVo.getNew();
 //        unboxDigitalArtworkListVo.setArtworkId();
         unboxDigitalArtworkListVo.setName(unboxSkuInfoVo.getName());
         unboxDigitalArtworkListVo.setSubtitle(unboxSkuInfoVo.getSubtitle());
@@ -167,7 +167,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
     /* -------------------------------------------------------------------------------------------------------------- */
     /* -------------------------------------------------------------------------------------------------------------- */
 
-    private void updateUserDigitalArtworkByChainTrade(GoblinDigitalArtworkVo userDigitalArtworkVo, GoblinDigitalArtworkListVo listVo,
+    private void updateUserDigitalArtworkByChainTrade(GoblinUserDigitalArtworkVo userDigitalArtworkVo, GoblinUserDigitalArtworkListVo listVo,
                                                       List<String> checkRespDataList, LocalDateTime now) {
         if (!CollectionUtils.isEmpty(checkRespDataList)) {
             String nftId = checkRespDataList.get(0);

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

@@ -1268,8 +1268,8 @@ public class GoblinMongoUtils {
     /**
      * 盲盒开启后，直接从`我的藏品列表`中移除
      */
-    public boolean updateUserDigitalArtworkVoByUnboxing(GoblinDigitalArtworkVo vo) {
-        UpdateResult updateResult = mongoTemplate.getCollection(GoblinDigitalArtworkVo.class.getSimpleName()).updateOne(
+    public boolean updateUserDigitalArtworkVoByUnboxing(GoblinUserDigitalArtworkVo vo) {
+        UpdateResult updateResult = mongoTemplate.getCollection(GoblinUserDigitalArtworkVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("artworkId").is(vo.getArtworkId()).and("state").ne(1)).getQueryObject(),
                 Update.update("state", vo.getState())
                         .set("delFlg", vo.getDelFlg())
@@ -1281,8 +1281,8 @@ public class GoblinMongoUtils {
         return updateResult.getModifiedCount() > 0;
     }
 
-    public boolean updateUserDigitalArtworkVoByChainTrade(GoblinDigitalArtworkVo vo) {
-        UpdateResult updateResult = mongoTemplate.getCollection(GoblinDigitalArtworkVo.class.getSimpleName()).updateOne(
+    public boolean updateUserDigitalArtworkVoByChainTrade(GoblinUserDigitalArtworkVo vo) {
+        UpdateResult updateResult = mongoTemplate.getCollection(GoblinUserDigitalArtworkVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("artworkId").is(vo.getArtworkId())).getQueryObject(),
                 Update.update("editionSn", vo.getEditionSn())
                         .set("nftId", vo.getNftId())
@@ -1297,14 +1297,14 @@ public class GoblinMongoUtils {
         return updateResult.getModifiedCount() > 0;
     }
 
-    public PagedResult<GoblinDigitalArtworkListVo> getUserDigitalArtworkListVos(String uid, Integer pageNum, Integer pageSize) {
+    public PagedResult<GoblinUserDigitalArtworkListVo> getUserDigitalArtworkListVos(String uid, Integer pageNum, Integer pageSize) {
         Criteria criteria = Criteria.where("delFlg").is("0").and("uid").is(uid);
         Query query = Query.query(criteria);
 
-        PagedResult<GoblinDigitalArtworkListVo> pagedResult = ObjectUtil.getGoblinDigitalArtworkListVoPagedResult();
+        PagedResult<GoblinUserDigitalArtworkListVo> pagedResult = ObjectUtil.getGoblinUserDigitalArtworkListVoPagedResult();
         query.with(PageRequest.of(pageNum - 1, pageSize)).with(Sort.by(Sort.Order.desc("createdAt")));
 
-        List<GoblinDigitalArtworkListVo> list = mongoTemplate.find(query, GoblinDigitalArtworkListVo.class, GoblinDigitalArtworkVo.class.getSimpleName());
+        List<GoblinUserDigitalArtworkListVo> list = mongoTemplate.find(query, GoblinUserDigitalArtworkListVo.class, GoblinUserDigitalArtworkVo.class.getSimpleName());
         return pagedResult.setList(list);
     }
 

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

@@ -1376,11 +1376,11 @@ public class GoblinRedisUtils {
         return Objects.isNull(o) ? 0 : (int) o;
     }
 
-    public GoblinDigitalArtworkVo getUserDigitalArtworkVo(String artworkId) {
-        return (GoblinDigitalArtworkVo) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(artworkId));
+    public GoblinUserDigitalArtworkVo getUserDigitalArtworkVo(String artworkId) {
+        return (GoblinUserDigitalArtworkVo) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(artworkId));
     }
 
-    public boolean setUserDigitalArtworkVo(GoblinDigitalArtworkVo vo) {
+    public boolean setUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
         return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(vo.getArtworkId()), vo);
     }
 
@@ -1388,7 +1388,7 @@ public class GoblinRedisUtils {
      * 盲盒开启后，直接从`我的藏品列表`中移除
      * 此处通过Redis过期删除
      */
-    public boolean setexUserDigitalArtworkVo(GoblinDigitalArtworkVo vo) {
+    public boolean setexUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
         return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(vo.getArtworkId()), vo, 259200);
     }
 

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

@@ -26,7 +26,7 @@ public class ObjectUtil {
     private static final PagedResult<GoblinStoreMgtGoodsListVo> goblinStoreMgtGoodsVoPagedResult = new PagedResult<>();
     private static final PagedResult<GoblinStoreNoticeVo> goblinStoreNoticeVoPagedResult = new PagedResult<>();
     private static final PagedResult<GoblinStoreMgtCouponListVo> goblinStoreMgtCouponListVoPagedResult = new PagedResult<>();
-    private static final PagedResult<GoblinDigitalArtworkListVo> goblinDigitalArtworkListVoPagedResult = new PagedResult<>();
+    private static final PagedResult<GoblinUserDigitalArtworkListVo> goblinUserDigitalArtworkListVoPagedResult = new PagedResult<>();
     private static final PagedResult<GoblinNftGoodsSkuListVo> goblinNftGoodsSkuListVoPagedResult = new PagedResult<>();
     private static final PagedResult<GoblinNftOrderDetailsVo> goblinNftOrderDetailsVoPagedResult = new PagedResult<>();
 
@@ -82,7 +82,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinMailVo> goblinMailVo = new ArrayList<>();
     private static final ArrayList<GoblinPosGoodsVo> goblinPosGoodsVoArrayList = new ArrayList<>();
     private static final ArrayList<TempCouponVo> tempCouponVo = new ArrayList<>();
-    private static final  ArrayList<GoblinDigitalArtworkListVo> goblinDigitalArtworkListVoArrayList = new ArrayList<>();
+    private static final ArrayList<GoblinUserDigitalArtworkListVo> GOBLIN_USER_DIGITAL_ARTWORK_LIST_VO_ARRAY_LIST = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
     private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
@@ -99,8 +99,8 @@ public class ObjectUtil {
         return goblinStoreMgtCouponListVoPagedResult.clone();
     }
 
-    public static PagedResult<GoblinDigitalArtworkListVo> getGoblinDigitalArtworkListVoPagedResult() {
-        return goblinDigitalArtworkListVoPagedResult.clone();
+    public static PagedResult<GoblinUserDigitalArtworkListVo> getGoblinUserDigitalArtworkListVoPagedResult() {
+        return goblinUserDigitalArtworkListVoPagedResult.clone();
     }
 
     public static PagedResult<GoblinNftGoodsSkuListVo> getGoblinNftGoodsSkuListVoPagedResult() {
@@ -318,8 +318,8 @@ public class ObjectUtil {
         return (ArrayList<GoblinPosGoodsVo>) goblinPosGoodsVoArrayList.clone();
     }
 
-    public static ArrayList<GoblinDigitalArtworkListVo> getGoblinDigitalArtworkListVoArrayList() {
-        return (ArrayList<GoblinDigitalArtworkListVo>) goblinDigitalArtworkListVoArrayList.clone();
+    public static ArrayList<GoblinUserDigitalArtworkListVo> getGoblinUserDigitalArtworkListVoArrayList() {
+        return (ArrayList<GoblinUserDigitalArtworkListVo>) GOBLIN_USER_DIGITAL_ARTWORK_LIST_VO_ARRAY_LIST.clone();
     }
 
     public static BasicDBObject cloneBasicDBObject() {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -128,6 +128,6 @@ goblin_store_coupon_rule.update_del=UPDATE goblin_store_coupon_rule SET del_flg=
 goblin_user_coupon.insert=INSERT INTO goblin_user_coupon (ucoupon_id, store_coupon_id, uid, state, bind_at, dued_at, operator, created_at)VALUES(?,?,?,?,?,?,?,?) 
 goblin_user_coupon.updateState=UPDATE goblin_user_coupon SET state = ? , used_for = ? ,updated_at = ? where ucoupon_id = ?
 #---- 我的藏品
-goblin_user_digital_artwork.update_for_chain=UPDATE goblin_digital_artwork SET edition_sn=?,nft_id=?,release_txhash=?,release_at=?,trading_txhash=?,trading_at=?,state=?,updated_at=? WHERE artwork_id=? AND state<>1 
-goblin_user_digital_artwork.update_for_unboxing=UPDATE goblin_digital_artwork SET state=1,del_flg='1',opening_at=?,updated_at=?,deleted_at=? WHERE artwork_id=? AND state<>1 
+goblin_user_digital_artwork.update_for_chain=UPDATE goblin_user_digital_artwork SET edition_sn=?,nft_id=?,release_txhash=?,release_at=?,trading_txhash=?,trading_at=?,state=?,updated_at=? WHERE artwork_id=? AND state<>1 
+goblin_user_digital_artwork.update_for_unboxing=UPDATE goblin_user_digital_artwork SET state=1,del_flg='1',opening_at=?,updated_at=?,deleted_at=? WHERE artwork_id=? AND state<>1 
 #----
\ No newline at end of file