记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9ccacef6 authored by 张国柄's avatar 张国柄
Browse files
Options

~合并Galaxy到Goblin，接口调用调整;

parent ac00bc74
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 138 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserBusiAcctServiceImpl.java
View file @ 9ccacef6
......@@ -38,8 +38,8 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
private IAdamUserService adamUserService;
@Value("${liquidnet.service.galaxy.url}")
private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")
// private String serviceGalaxyUrl;
@Value("${liquidnet.service.goblin.url}")
private String serviceGoblinUrl;
......@@ -122,7 +122,8 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
postBodyNode.put("userName", name);
postBodyNode.put("mobile", mobile);
postBodyNode.put("userId", uid);
String postUrl = serviceGalaxyUrl + "/galaxy/user/register", blockChainAddress;
// String postUrl = serviceGalaxyUrl + "/galaxy/user/register", blockChainAddress;
String postUrl = serviceGoblinUrl + "/goblin/user/register", blockChainAddress;
try {
String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null);
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkClqRdsReceiver.java
View file @ 9ccacef6
......@@ -36,8 +36,10 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece
private MongoTemplate mongoTemplate;
@Value("${liquidnet.service.galaxy.url}")
private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")
// private String serviceGalaxyUrl;
@Value("${liquidnet.service.goblin.url}")
private String serviceGoblinUrl;
private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,series_id=?,series_hash=?,nft_hash=?,declare_at=?,updated_at=? WHERE sku_id=? ";
......@@ -140,7 +142,8 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece
artSeriesClaimResultQueryReqDto.setSkuId(skuId);
artSeriesClaimResultQueryReqDto.setRouterType(routerType);
String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaimResultQuery";
// String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaimResultQuery";
String postUrl = serviceGoblinUrl + "/goblin/artwork/seriesClaimResultQuery";
String postBoby = JsonUtils.toJson(artSeriesClaimResultQueryReqDto);
try {
String postRespStr = HttpUtil.postRaw(postUrl, postBoby, null);
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkUplRdsReceiver.java
View file @ 9ccacef6
......@@ -39,8 +39,10 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
private MongoTemplate mongoTemplate;
@Value("${liquidnet.service.galaxy.url}")
private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")
// private String serviceGalaxyUrl;
@Value("${liquidnet.service.goblin.url}")
private String serviceGoblinUrl;
private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,display_url=?,nft_url=? WHERE sku_id=? AND upchain=0 ";
......@@ -160,7 +162,8 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
* @return GalaxyNftUploadRespDto
*/
public GalaxyNftUploadRespDto uploadNftMaterial(GalaxyNftUploadReqDto nftUploadReqDto) {
String postUrl = serviceGalaxyUrl + "/galaxy/artwork/nftUpload";
// String postUrl = serviceGalaxyUrl + "/galaxy/artwork/nftUpload";
String postUrl = serviceGoblinUrl + "/goblin/artwork/nftUpload";
String postBody = JsonUtils.toJson(nftUploadReqDto);
try {
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
......@@ -183,7 +186,8 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
* @return GalaxyArtSeriesClaimRespDto
*/
public GalaxyArtSeriesClaimRespDto claimNftSeries(GalaxyArtSeriesClaimReqDto seriesClaimReqDto) {
String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaim";
// String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaim";
String postUrl = serviceGoblinUrl + "/goblin/artwork/seriesClaim";
String postBody = JsonUtils.toJson(seriesClaimReqDto);
try {
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinUserDigitalArtworkServiceImpl.java
View file @ 9ccacef6
......@@ -6,12 +6,14 @@ import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.dto.GoblinQueueBizArtworkGenDto;
import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyResultQueryReqDto;
import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyResultQueryRespDto;
import com.liquidnet.service.galaxy.service.IGalaxyTradeService;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.service.IGoblinUserDigitalArtworkService;
import com.liquidnet.service.goblin.service.impl.inner.GoblinGalaxyService;
import com.liquidnet.service.goblin.util.GoblinMongoUtils;
import com.liquidnet.service.goblin.util.GoblinRedisUtils;
import com.liquidnet.service.goblin.util.ObjectUtil;
......@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.LinkedList;
import java.util.List;
......@@ -34,8 +37,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
private GoblinRedisUtils goblinRedisUtils;
@Autowired
private GoblinMongoUtils goblinMongoUtils;
@Autowired
private GoblinGalaxyService goblinGalaxyService;
// @Autowired
// private GoblinGalaxyService goblinGalaxyService;
@Resource(name = "galaxyTradeServiceImpl")
private IGalaxyTradeService galaxyTradeService;
@Override
public GoblinUserDigitalArtworkPageVo page(String uid, Integer pageNum, Integer pageSize) {
......@@ -80,13 +85,15 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
listVo.setOpeningTime(goodsSkuInfoVo.getOpeningTime());
if ("0".equals(listVo.getUnbox()) && 1 != listVo.getState() && listVo.getCreatedAt().isBefore(toCheckTime)) {// 15秒前创建的藏品，去主动核实发行交易状态
List<String> checkRespDataList = goblinGalaxyService.checkNftTradeResult(uid, userDigitalArtworkVo.getOrderId(), goodsSkuInfoVo.getRouteType());
this.updateUserDigitalArtworkByChainTrade(userDigitalArtworkVo, listVo, checkRespDataList, now);
} else if (1 == listVo.getState() && "1".equals(listVo.getUnbox())) {// 盲盒已开启的，直接展示开出的藏品封面
GoblinNftOrderVo goblinNftOrder = goblinRedisUtils.getGoblinNftOrder(userDigitalArtworkVo.getOrderId());
goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftOrder.getBoxSkuId());
listVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
// List<String> checkRespDataList = goblinGalaxyService.checkNftTradeResult(uid, userDigitalArtworkVo.getOrderId(), goodsSkuInfoVo.getRouteType());
// this.updateUserDigitalArtworkByChainTrade(userDigitalArtworkVo, listVo, checkRespDataList, now);
this.updateUserDigitalArtworkByChainTrade(userDigitalArtworkVo, listVo, goodsSkuInfoVo.getRouteType(), now);
}
// else if (1 == listVo.getState() && "1".equals(listVo.getUnbox())) {// 盲盒已开启的，直接展示开出的藏品封面
// GoblinNftOrderVo goblinNftOrder = goblinRedisUtils.getGoblinNftOrder(userDigitalArtworkVo.getOrderId());
// goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(goblinNftOrder.getBoxSkuId());
// listVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
// }
list.add(listVo);
}
......@@ -245,24 +252,59 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
/* -------------------------------------------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------------------------------------------- */
// private void updateUserDigitalArtworkByChainTrade(GoblinUserDigitalArtworkVo userDigitalArtworkVo, GoblinUserDigitalArtworkListVo listVo,
// List<String> checkRespDataList, LocalDateTime now) {
// if (!CollectionUtils.isEmpty(checkRespDataList)) {
// String nftId = checkRespDataList.get(0);
// String nftPublishChainTimestamp = checkRespDataList.get(1);
// String nftPublishTxHash = checkRespDataList.get(2);
// String nftBuyChainTimestamp = checkRespDataList.get(3);
// String nftBuyTxHash = checkRespDataList.get(4);
//
// listVo.setState(1);
// listVo.setEditionSn(Integer.valueOf(nftId.substring(nftId.indexOf("_") + 1)));
//
// userDigitalArtworkVo.setEditionSn(listVo.getEditionSn());
// userDigitalArtworkVo.setNftId(nftId);
// userDigitalArtworkVo.setReleaseAt(nftPublishChainTimestamp);
// userDigitalArtworkVo.setReleaseTxhash(nftPublishTxHash);
// userDigitalArtworkVo.setTradingAt(nftBuyChainTimestamp);
// userDigitalArtworkVo.setTradingTxhash(nftBuyTxHash);
// userDigitalArtworkVo.setState(1);
// userDigitalArtworkVo.setUpdatedAt(now);
//
// goblinRedisUtils.setUserDigitalArtworkVo(userDigitalArtworkVo);
// goblinMongoUtils.updateUserDigitalArtworkVoByChainTrade(userDigitalArtworkVo);
//
// queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(),
// SqlMapping.get("goblin_user_digital_artwork.update_for_chain",
// userDigitalArtworkVo.getEditionSn(), userDigitalArtworkVo.getNftId(), userDigitalArtworkVo.getReleaseTxhash(),
// userDigitalArtworkVo.getReleaseAt(), userDigitalArtworkVo.getTradingTxhash(), userDigitalArtworkVo.getTradingAt(),
// userDigitalArtworkVo.getState(), userDigitalArtworkVo.getUpdatedAt(), userDigitalArtworkVo.getArtworkId())
// );
// }
// }
private void updateUserDigitalArtworkByChainTrade(GoblinUserDigitalArtworkVo userDigitalArtworkVo, GoblinUserDigitalArtworkListVo listVo,
List<String> checkRespDataList, LocalDateTime now) {
if (!CollectionUtils.isEmpty(checkRespDataList)) {
String nftId = checkRespDataList.get(0);
String nftPublishChainTimestamp = checkRespDataList.get(1);
String nftPublishTxHash = checkRespDataList.get(2);
String nftBuyChainTimestamp = checkRespDataList.get(3);
String nftBuyTxHash = checkRespDataList.get(4);
String routerType, LocalDateTime now) {
GalaxyNftPublishAndBuyResultQueryReqDto nftTradeQueryReqDto = GalaxyNftPublishAndBuyResultQueryReqDto.getNew();
nftTradeQueryReqDto.setUserId(userDigitalArtworkVo.getUid());
nftTradeQueryReqDto.setNftOrderPayId(userDigitalArtworkVo.getOrderId());
nftTradeQueryReqDto.setRouterType(routerType);
ResponseDto<GalaxyNftPublishAndBuyResultQueryRespDto> nftTradeQueryRespDto = galaxyTradeService.nftPublishAndBuyResultQuery(nftTradeQueryReqDto);
if (nftTradeQueryRespDto.isSuccess()) {
GalaxyNftPublishAndBuyResultQueryRespDto nftTradeQueryRespDtoData = nftTradeQueryRespDto.getData();
String nftId = nftTradeQueryRespDtoData.getNftId();
listVo.setState(1);
listVo.setEditionSn(Integer.valueOf(nftId.substring(nftId.indexOf("_") + 1)));
userDigitalArtworkVo.setEditionSn(listVo.getEditionSn());
userDigitalArtworkVo.setNftId(nftId);
userDigitalArtworkVo.setReleaseAt(nftPublishChainTimestamp);
userDigitalArtworkVo.setReleaseTxhash(nftPublishTxHash);
userDigitalArtworkVo.setTradingAt(nftBuyChainTimestamp);
userDigitalArtworkVo.setTradingTxhash(nftBuyTxHash);
userDigitalArtworkVo.setReleaseAt(nftTradeQueryRespDtoData.getNftPublishChainTimestamp());
userDigitalArtworkVo.setReleaseTxhash(nftTradeQueryRespDtoData.getNftPublishTradeHash());
userDigitalArtworkVo.setTradingAt(nftTradeQueryRespDtoData.getNftBuyChainTimestamp());
userDigitalArtworkVo.setTradingTxhash(nftTradeQueryRespDtoData.getNftBuyTradeHash());
userDigitalArtworkVo.setState(1);
userDigitalArtworkVo.setUpdatedAt(now);
......
liquidnet-bus-service/liquidnet-service-goblin/pom.xml
View file @ 9ccacef6
......@@ -13,6 +13,7 @@
<packaging>pom</packaging>
<modules>
<module>liquidnet-service-goblin-impl</module>
<module>liquidnet-service-goblin-common</module>
</modules>
<properties>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment