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

Skip to content

L
liquidnet-bus-v1
Commit c8a6b462 authored by anjiabin's avatar anjiabin
Browse files
Options

nft修改购买逻辑

parent ead181a1
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 20 deletions
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/constant/ZxlnftEnum.java
View file @ c8a6b462
......@@ -76,8 +76,8 @@ public class ZxlnftEnum {
* 注册类型
*/
public enum RegisterTypeEnum{
PERSON("1","企业"),
COMPANY("2","个人");
COMPANY("1","企业"),
PERSON("2","个人");
private String code;
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractDataUtils.java
View file @ c8a6b462
......@@ -290,15 +290,19 @@ public abstract class AbstractDataUtils {
BeanUtil.copy(nftOrderBo,nftOrderVo);
this.getMongoTemplate().save(nftOrderVo,GalaxyNftOrderVo.class.getSimpleName());
// insert into galaxy_nft_order_info (mid, nft_order_pay_id, user_id, sku_id, series_name, series_id
// , nft_id, nft_price,from_address, to_address, nft_publish_task_id, nft_buy_task_id
// , nft_buy_pay_task_id,router_type, created_at, updated_at)
// insert into galaxy_nft_order_info (nft_order_pay_id, user_id, sku_id, series_name, series_id,
// series_code, nft_id,nft_price, nft_publish_task_id, nft_publish_from_address,
// nft_publish_to_address,nft_publish_chain_timestamp, nft_publish_status, nft_publish_trade_hash,nft_buy_task_id,
// nft_buy_from_address, nft_buy_to_address, nft_buy_chain_timestamp,nft_buy_status, nft_buy_trade_hash,
// nft_buy_pay_task_id, router_type, created_at,updated_at)
try{
this.getQueueUtil().sendMySqlRedis(
SqlMapping.get("galaxy_nft_order_info.insert"),
new Object[]{nftOrderPayId,nftOrderBo.getUserId(),nftOrderBo.getSkuId(),nftOrderBo.getSeriesName(),nftOrderBo.getSeriesId(),nftOrderBo.getSeriesCode()
,nftOrderBo.getNftId(),nftOrderBo.getNftPrice(),nftOrderBo.getNftPublishFromAddress(),nftOrderBo.getNftPublishToAddress(),nftOrderBo.getNftPublishTaskId()
,nftOrderBo.getNftBuyTaskId(),nftOrderBo.getNftBuyPayTaskId(),nftOrderBo.getRouterType(),LocalDateTime.now(),null
new Object[]{nftOrderPayId,nftOrderBo.getUserId(),nftOrderBo.getSkuId(),nftOrderBo.getSeriesName(),nftOrderBo.getSeriesId()
,nftOrderBo.getSeriesCode(),nftOrderBo.getNftId(),nftOrderBo.getNftPrice(),nftOrderBo.getNftPublishTaskId(),nftOrderBo.getNftPublishFromAddress()
,nftOrderBo.getNftPublishToAddress(),nftOrderBo.getNftPublishChainTimestamp(),nftOrderBo.getNftPublishStatus(),nftOrderBo.getNftPublishTradeHash(),nftOrderBo.getNftBuyTaskId()
,nftOrderBo.getNftBuyFromAddress(),nftOrderBo.getNftBuyToAddress(),nftOrderBo.getNftBuyChainTimestamp(),nftOrderBo.getNftBuyStatus(),nftOrderBo.getNftBuyTradeHash(),
nftOrderBo.getNftBuyPayTaskId(),nftOrderBo.getRouterType(),LocalDateTime.now(),null
}
, MQConst.GalaxyQueue.SQL_NFT_ORDER_INFO.getKey()
);
......@@ -357,8 +361,10 @@ public abstract class AbstractDataUtils {
try{
this.getQueueUtil().sendMySqlRedis(
SqlMapping.get("galaxy_nft_order_info.updateNftPublishInfo"),
new Object[]{nftOrderBo.getNftId(),LocalDateTime.now(),nftOrderBo.getNftOrderPayId()}
, MQConst.GalaxyQueue.SQL_NFT_TRADE_INFO.getKey()
new Object[]{nftOrderBo.getNftId(),nftOrderBo.getNftPublishTaskId(),nftOrderBo.getNftPublishChainTimestamp()
,nftOrderBo.getNftPublishStatus(),nftOrderBo.getNftPublishTradeHash()
,LocalDateTime.now(),nftOrderBo.getNftOrderPayId()}
, MQConst.GalaxyQueue.SQL_NFT_ORDER_INFO.getKey()
);
}catch(Exception e){
log.error(e.getMessage(),e);
......@@ -385,8 +391,10 @@ public abstract class AbstractDataUtils {
try{
this.getQueueUtil().sendMySqlRedis(
SqlMapping.get("galaxy_nft_order_info.updateNftBuyInfo"),
new Object[]{nftOrderBo.getNftBuyTaskId(),LocalDateTime.now(),nftOrderBo.getNftOrderPayId()}
, MQConst.GalaxyQueue.SQL_NFT_TRADE_INFO.getKey()
new Object[]{nftOrderBo.getNftBuyTaskId(),nftOrderBo.getNftBuyChainTimestamp(),nftOrderBo.getNftBuyStatus()
,nftOrderBo.getNftBuyTradeHash(),nftOrderBo.getNftBuyPayTaskId()
,LocalDateTime.now(),nftOrderBo.getNftOrderPayId()}
, MQConst.GalaxyQueue.SQL_NFT_ORDER_INFO.getKey()
);
}catch(Exception e){
log.error(e.getMessage(),e);
......@@ -473,7 +481,7 @@ public abstract class AbstractDataUtils {
this.getQueueUtil().sendMySqlRedis(
SqlMapping.get("galaxy_series_info.updateSeriesCrtCount"),
new Object[]{seriesInfoBo.getCrtCount()+1,LocalDateTime.now(),seriesCode}
, MQConst.GalaxyQueue.SQL_NFT_TRADE_INFO.getKey()
, MQConst.GalaxyQueue.SQL_SERIES_INFO.getKey()
);
}catch(Exception e){
log.error(e.getMessage(),e);
......@@ -503,7 +511,7 @@ public abstract class AbstractDataUtils {
this.getQueueUtil().sendMySqlRedis(
SqlMapping.get("galaxy_series_nft_info.updateSeriesNftCrtCount"),
new Object[]{seriesNftInfoBo.getNftCrtCount()+1,LocalDateTime.now(),skuId}
, MQConst.GalaxyQueue.SQL_NFT_TRADE_INFO.getKey()
, MQConst.GalaxyQueue.SQL_SERIES_INFO.getKey()
);
}catch(Exception e){
log.error(e.getMessage(),e);
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/resources/sqlmap.properties
View file @ c8a6b462
......@@ -5,7 +5,7 @@ galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series
# ------------------------数字藏品系列信息----------------------------
galaxy_series_nft_info.insert=insert into galaxy_series_nft_info (series_nft_info_id, series_info_id, sku_id, series_name, series_code,series_id, nft_total_count, nft_crt_count, nft_id_begin ,nft_id_begin_index ,nft_publish_number,original_nft_url, original_display_url,author, nft_name, nft_url, display_url, nft_desc, nft_flag, sell_count, nft_hash,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
# ------------------------数字藏品订单信息----------------------------
galaxy_nft_order_info.insert=insert into galaxy_nft_order_info (nft_order_pay_id, user_id, sku_id, series_name, series_id, series_code, nft_id, nft_price,from_address, to_address, nft_publish_task_id, nft_buy_task_id, nft_buy_pay_task_id,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
galaxy_nft_order_info.insert=insert into galaxy_nft_order_info (nft_order_pay_id, user_id, sku_id, series_name, series_id,series_code, nft_id,nft_price, nft_publish_task_id, nft_publish_from_address,nft_publish_to_address,nft_publish_chain_timestamp, nft_publish_status, nft_publish_trade_hash,nft_buy_task_id,nft_buy_from_address, nft_buy_to_address, nft_buy_chain_timestamp,nft_buy_status, nft_buy_trade_hash,nft_buy_pay_task_id, router_type, created_at,updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
# ------------------------数字藏品交易信息----------------------------
galaxy_nft_trade_info.insert=insert into galaxy_nft_trade_info (nft_id, nft_name, series_name, series_id, series_code, trade_hash, chain_timestamp, from_address, to_address,trade_price, trade_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?)
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlWalletSdkUtil.java
View file @ c8a6b462
......@@ -147,7 +147,7 @@ public class TestZxlWalletSdkUtil {
//stuff name goat health siren dumb gorilla antique board tenant buffalo present
req.setMnemonic("stuff name goat health siren dumb gorilla antique board tenant buffalo present");
req.setIndex(1l);
req.setIndex(0l);
// req.setMnemonic("region");
// req.setIndex(0l);
......@@ -156,7 +156,8 @@ public class TestZxlWalletSdkUtil {
// req.setIndex(2l);
//3045022072ba19d02f43ae883764ffa43d111ab62fd0bcd6ace31bc91356e7ce38756cbb022100deb5f7666f4768f297ccdf386a867d2a0d71227548f2595a62130e5016fb1d54
zxlWalletSdkUtil.deriveKeyPair(req);
DeriveKeyPairResp resp = zxlWalletSdkUtil.deriveKeyPair(req);
System.out.println(resp.toString());
}
/**
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftSdkUtil.java
View file @ c8a6b462
......@@ -204,7 +204,7 @@ public class TestZxlnftSdkUtil {
}
@Test
public void nft011UserQueryVerifyCode(){
public void nft011UserQueryVerifyCode_company(){
Nft011UserQueryVerifyCodeReqDto reqDto = Nft011UserQueryVerifyCodeReqDto.getNew();
//查询用户信息 发送手机验证码
reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
......@@ -220,13 +220,57 @@ public class TestZxlnftSdkUtil {
}
@Test
public void nft012UserQuery(){
public void nft011UserQueryVerifyCode_person(){
Nft011UserQueryVerifyCodeReqDto reqDto = Nft011UserQueryVerifyCodeReqDto.getNew();
//查询用户信息 发送手机验证码
reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.PERSON.getCode()));
reqDto.setCardNo(ID_CARD_1);
reqDto.setScene(Integer.valueOf(ZxlnftEnum.UseSceneEnum.QUERY.getCode()));
//nft平台绑定地址 发送邮箱验证码
// reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.PERSON.getCode()));
// reqDto.setCardNo(ID_CARD_1);
// reqDto.setScene(Integer.valueOf(ZxlnftEnum.UseSceneEnum.BINDING.getCode()));
ZxlnftResponseDto<Nft011UserQueryVerifyCodeRespDto> resp = zxlnftSdkUtil.nft011UserQueryVerifyCode(reqDto);
System.out.println(resp.toJson());
}
@Test
public void nft012UserQuery_person(){
//查询个人
Nft012UserQueryReqDto reqDto = Nft012UserQueryReqDto.getNew();
reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.PERSON.getCode()));
reqDto.setCardNo(ID_CARD_1);
reqDto.setVerifyCode("997339");
ZxlnftResponseDto<Nft012UserQueryRespDto> resp = zxlnftSdkUtil.nft012UserQuery(reqDto);
System.out.println(resp.toJson());
//查询企业
// Nft012UserQueryReqDto reqDto = Nft012UserQueryReqDto.getNew();
// reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
// reqDto.setCardNo(ID_CARD_1);
// reqDto.setVerifyCode("185026");
// ZxlnftResponseDto<Nft012UserQueryRespDto> resp = zxlnftSdkUtil.nft012UserQuery(reqDto);
// System.out.println(resp.toJson());
}
@Test
public void nft012UserQuery_company(){
//查询个人
Nft012UserQueryReqDto reqDto = Nft012UserQueryReqDto.getNew();
reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
reqDto.setCardNo(ID_CARD_1);
reqDto.setVerifyCode("045029");
reqDto.setVerifyCode("185026");
ZxlnftResponseDto<Nft012UserQueryRespDto> resp = zxlnftSdkUtil.nft012UserQuery(reqDto);
System.out.println(resp.toJson());
//查询企业
// Nft012UserQueryReqDto reqDto = Nft012UserQueryReqDto.getNew();
// reqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
// reqDto.setCardNo(ID_CARD_1);
// reqDto.setVerifyCode("185026");
// ZxlnftResponseDto<Nft012UserQueryRespDto> resp = zxlnftSdkUtil.nft012UserQuery(reqDto);
// System.out.println(resp.toJson());
}
@Test
......
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