修改galaxy交易消费相关

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

@@ -42,6 +42,10 @@ public class GalaxyNftOrderBo implements Serializable,Cloneable {
      * nftId
      */
     private String nftId;
+    /**
+     * nftId
+     */
+    private String nftName;
     /**
      * nft价格
      */

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/dto/vo/mongo/GalaxyNftOrderVo.java

@@ -42,6 +42,12 @@ public class GalaxyNftOrderVo implements Serializable,Cloneable {
      * nftId
      */
     private String nftId;
+
+    /**
+     * nftId
+     */
+    private String nftName;
+
     /**
      * nft价格
      */

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/SqlMapping.java

@@ -32,6 +32,19 @@ public class SqlMapping {
         return sqlsProperties;
     }
 
+    public static Properties reloadExtends(String configName) {
+        Properties extendsPro = new Properties();
+        InputStream in = ErrorMapping.class.getClassLoader().getResourceAsStream("sqlmap-".concat(configName).concat(".properties"));
+        try {
+            extendsPro.load(new InputStreamReader(in, StandardCharsets.UTF_8));
+            log.info("reloadExtends sqlsProperties init count:{}", extendsPro.size());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        sqlsProperties.putAll(extendsPro);
+        return sqlsProperties;
+    }
+
     public static String get(String sql) {
         return (String) sqlsProperties.get(sql);
     }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/resources/sqlmap.properties

@@ -3,33 +3,4 @@ goblin_order.close.order=UPDATE goblin_store_order SET status = ? ,updated_at =
 goblin_order.close.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_user_coupon.updateState=UPDATE goblin_user_coupon SET state = ? , used_for = ? ,updated_at = ? where ucoupon_id = ?
 #-------- NFT -------
-goblin_nft_order.update.close=UPDATE goblin_nft_order SET status = ?, updated_at = ?, cancel_time = ?, cancel_reason = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-
-# ------------------------用户注册信息----------------------------
-galaxy_user_info.insert=insert into galaxy_user_info (user_id, user_name, user_type, mobile, id_card_type, id_card, mnemonic, mnemonic_index,user_identification, user_pub_key, user_pri_key, block_chain_address, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品系列信息----------------------------
-galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series_name, series_code, series_id, total_count, crt_count,series_claim_task_id, series_claim_status, cover_url, series_desc, nft_count,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品系列NFT信息----------------------------
-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, 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 (user_id, nft_id, nft_name, series_name, series_id, series_code, trade_hash,chain_timestamp, from_address, to_address, trade_price, trade_type, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品发行购买失败记录----------------------------
-galaxy_nft_order_fail_log.insert=insert into galaxy_nft_order_fail_log (nft_order_pay_id, user_id, nft_id, nft_name, series_name, series_id,series_code, taskId, fail_reason_desc, fail_reason_desc_second, deal_with_status, trade_type,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-
-# ------------------------更新系列声明信息----------------------------
-galaxy_series_info.updateSeriesIdAndStatus=update galaxy_series_info t set t.series_id = ?,t.chain_timestamp = ?,t.trade_hash = ?,t.series_claim_status = ? ,t.updated_at =? where t.series_code = ?
-# ------------------------更新系列NFT信息----------------------------
-galaxy_series_nft_info.updateSeriesIdAndStatus=update galaxy_series_nft_info t set t.series_id = ?,t.updated_at =? where t.sku_id = ?
-# ------------------------更新NFT发行信息----------------------------
-galaxy_nft_order_info.updateNftPublishInfo=update galaxy_nft_order_info t set t.nft_id = ? ,t.nft_publish_task_id = ?,t.nft_publish_chain_timestamp = ?,t.nft_publish_status = ?,t.nft_publish_trade_hash = ?,t.updated_at =? where t.nft_order_pay_id = ?
-# ------------------------更新NFT购买信息----------------------------
-galaxy_nft_order_info.updateNftBuyInfo=update galaxy_nft_order_info t set t.nft_buy_task_id = ? ,t.nft_buy_chain_timestamp = ? ,t.nft_buy_status = ? ,t.nft_buy_trade_hash = ? ,t.nft_buy_pay_task_id = ? ,t.updated_at =? where t.nft_order_pay_id = ?
-# ------------------------更新系列已发行个数----------------------------
-galaxy_series_info.updateSeriesCrtCount=update galaxy_series_info t set t.crt_count = ?,t.updated_at =? where t.series_code = ?
-# ------------------------更新系列NFT已发行个数----------------------------
-galaxy_series_nft_info.updateSeriesNftCrtCount=update galaxy_series_nft_info t set t.nft_crt_count = ?,t.updated_at =? where t.sku_id = ?
-# ------------------------更新发行购买处理结果----------------------------
-galaxy_nft_order_fail_log.updateDealWithStatus=update galaxy_nft_order_fail_log t set t.deal_with_status = ?,t.updated_at =? where t.nft_order_pay_id = ? and t.router_type = ?
-
+goblin_nft_order.update.close=UPDATE goblin_nft_order SET status = ?, updated_at = ?, cancel_time = ?, cancel_reason = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyBeanTransferBiz.java

@@ -44,6 +44,7 @@ public class GalaxyBeanTransferBiz {
         nftOrderBo.setSeriesCode(seriesNftInfoBo.getSeriesCode());
         nftOrderBo.setNftOrderPayId(nftOrderPayId);
         nftOrderBo.setNftId(null);
+        nftOrderBo.setNftName(seriesNftInfoBo.getNftName());
         nftOrderBo.setNftPrice(seriesNftInfoBo.getSellCount().longValue());
         nftOrderBo.setNftPublishTaskId(null);
         nftOrderBo.setNftPublishFromAddress(zxlnftConfig.getNftPlatformAddress());
@@ -112,7 +113,7 @@ public class GalaxyBeanTransferBiz {
         GalaxyNftTradeVo nftTradeVo = GalaxyNftTradeVo.getNew();
         nftTradeVo.setUserId(nftOrderBo.getUserId());
         nftTradeVo.setNftId(nftOrderBo.getNftId());
-        nftTradeVo.setNftName("");
+        nftTradeVo.setNftName(nftOrderBo.getNftName());
         nftTradeVo.setSeriesName(nftOrderBo.getSeriesName());
         nftTradeVo.setSeriesId(nftOrderBo.getSeriesId());
         nftTradeVo.setSeriesCode(nftOrderBo.getSeriesCode());

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractDataUtils.java

@@ -300,7 +300,7 @@ public abstract class AbstractDataUtils {
             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.getNftPublishTaskId(),nftOrderBo.getNftPublishFromAddress()
+                            ,nftOrderBo.getSeriesCode(),nftOrderBo.getNftId(),nftOrderBo.getNftName(),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

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/utils/GalaxyDataUtils.java

 package com.liquidnet.service.galaxy.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.base.SqlMapping;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -18,6 +19,9 @@ public class GalaxyDataUtils extends AbstractDataUtils{
     @Autowired
     private QueueUtil queueUtil;
 
+    static{
+        initSqlMapping();
+    }
 
     @Override
     public RedisUtil getRedisUtil() {
@@ -33,4 +37,9 @@ public class GalaxyDataUtils extends AbstractDataUtils{
     public QueueUtil getQueueUtil() {
         return queueUtil;
     }
+
+    public static void initSqlMapping() {
+        log.info("初始化initSqlMapping");
+        SqlMapping.reloadExtends("galaxy");
+    }
 }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/sqlmap-galaxy.properties

+# ------------------------用户注册信息----------------------------
+galaxy_user_info.insert=insert into galaxy_user_info (user_id, user_name, user_type, mobile, id_card_type, id_card, mnemonic, mnemonic_index,user_identification, user_pub_key, user_pri_key, block_chain_address, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+# ------------------------数字藏品系列信息----------------------------
+galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series_name, series_code, series_id, total_count, crt_count,series_claim_task_id, series_claim_status, cover_url, series_desc, nft_count,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+# ------------------------数字藏品系列NFT信息----------------------------
+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_name,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 (user_id, nft_id, nft_name, series_name, series_id, series_code, trade_hash,chain_timestamp, from_address, to_address, trade_price, trade_type, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+# ------------------------数字藏品发行购买失败记录----------------------------
+galaxy_nft_order_fail_log.insert=insert into galaxy_nft_order_fail_log (nft_order_pay_id, user_id, nft_id, nft_name, series_name, series_id,series_code, taskId, fail_reason_desc, fail_reason_desc_second, deal_with_status, trade_type,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+
+# ------------------------更新系列声明信息----------------------------
+galaxy_series_info.updateSeriesIdAndStatus=update galaxy_series_info t set t.series_id = ?,t.chain_timestamp = ?,t.trade_hash = ?,t.series_claim_status = ? ,t.updated_at =? where t.series_code = ?
+# ------------------------更新系列NFT信息----------------------------
+galaxy_series_nft_info.updateSeriesIdAndStatus=update galaxy_series_nft_info t set t.series_id = ?,t.updated_at =? where t.sku_id = ?
+# ------------------------更新NFT发行信息----------------------------
+galaxy_nft_order_info.updateNftPublishInfo=update galaxy_nft_order_info t set t.nft_id = ? ,t.nft_publish_task_id = ?,t.nft_publish_chain_timestamp = ?,t.nft_publish_status = ?,t.nft_publish_trade_hash = ?,t.updated_at =? where t.nft_order_pay_id = ?
+# ------------------------更新NFT购买信息----------------------------
+galaxy_nft_order_info.updateNftBuyInfo=update galaxy_nft_order_info t set t.nft_buy_task_id = ? ,t.nft_buy_chain_timestamp = ? ,t.nft_buy_status = ? ,t.nft_buy_trade_hash = ? ,t.nft_buy_pay_task_id = ? ,t.updated_at =? where t.nft_order_pay_id = ?
+# ------------------------更新系列已发行个数----------------------------
+galaxy_series_info.updateSeriesCrtCount=update galaxy_series_info t set t.crt_count = ?,t.updated_at =? where t.series_code = ?
+# ------------------------更新系列NFT已发行个数----------------------------
+galaxy_series_nft_info.updateSeriesNftCrtCount=update galaxy_series_nft_info t set t.nft_crt_count = ?,t.updated_at =? where t.sku_id = ?
+# ------------------------更新发行购买处理结果----------------------------
+galaxy_nft_order_fail_log.updateDealWithStatus=update galaxy_nft_order_fail_log t set t.deal_with_status = ?,t.updated_at =? where t.nft_order_pay_id = ? and t.router_type = ?
+

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/docu/mysql_db_ddl.sql

@@ -87,6 +87,7 @@ create table galaxy_nft_order_info
     series_id varchar(200) COMMENT '系列的唯一Id',
     series_code varchar(200) NOT NULL COMMENT '本地系列唯一编码',
     nft_id varchar(200)   COMMENT 'nftId',
+    nft_name varchar(200)   COMMENT 'nft名字(sku名称)',
     nft_price varchar(50)   COMMENT 'nft购买价格',
     nft_publish_task_id varchar(100)   COMMENT 'nft发行任务id',
     nft_publish_from_address varchar(200)   COMMENT 'nft发行转出方地址',
@@ -106,6 +107,7 @@ create table galaxy_nft_order_info
     updated_at timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB comment '数字藏品订单信息';
+-- alter table galaxy_nft_order_info add nft_name varchar(200) comment 'nft名字' after nft_id;
 
 drop TABLE if exists `galaxy_nft_trade_info`;
 create table galaxy_nft_trade_info

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

-# ------------------------用户注册信息----------------------------
-galaxy_user_info.insert=insert into galaxy_user_info (user_id, user_name, user_type, mobile, id_card_type, id_card, mnemonic, mnemonic_index,user_identification, user_pub_key, user_pri_key, block_chain_address, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品系列信息----------------------------
-galaxy_series_info.insert=insert into galaxy_series_info (series_info_id, series_name, series_code, series_id, total_count, crt_count,series_claim_task_id, series_claim_status, cover_url, series_desc, nft_count,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品系列NFT信息----------------------------
-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, 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 (user_id, nft_id, nft_name, series_name, series_id, series_code, trade_hash,chain_timestamp, from_address, to_address, trade_price, trade_type, router_type,created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-# ------------------------数字藏品发行购买失败记录----------------------------
-galaxy_nft_order_fail_log.insert=insert into galaxy_nft_order_fail_log (nft_order_pay_id, user_id, nft_id, nft_name, series_name, series_id,series_code, taskId, fail_reason_desc, fail_reason_desc_second, deal_with_status, trade_type,router_type, created_at, updated_at)values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-
-# ------------------------更新系列声明信息----------------------------
-galaxy_series_info.updateSeriesIdAndStatus=update galaxy_series_info t set t.series_id = ?,t.chain_timestamp = ?,t.trade_hash = ?,t.series_claim_status = ? ,t.updated_at =? where t.series_code = ?
-# ------------------------更新系列NFT信息----------------------------
-galaxy_series_nft_info.updateSeriesIdAndStatus=update galaxy_series_nft_info t set t.series_id = ?,t.updated_at =? where t.sku_id = ?
-# ------------------------更新NFT发行信息----------------------------
-galaxy_nft_order_info.updateNftPublishInfo=update galaxy_nft_order_info t set t.nft_id = ? ,t.nft_publish_task_id = ?,t.nft_publish_chain_timestamp = ?,t.nft_publish_status = ?,t.nft_publish_trade_hash = ?,t.updated_at =? where t.nft_order_pay_id = ?
-# ------------------------更新NFT购买信息----------------------------
-galaxy_nft_order_info.updateNftBuyInfo=update galaxy_nft_order_info t set t.nft_buy_task_id = ? ,t.nft_buy_chain_timestamp = ? ,t.nft_buy_status = ? ,t.nft_buy_trade_hash = ? ,t.nft_buy_pay_task_id = ? ,t.updated_at =? where t.nft_order_pay_id = ?
-# ------------------------更新系列已发行个数----------------------------
-galaxy_series_info.updateSeriesCrtCount=update galaxy_series_info t set t.crt_count = ?,t.updated_at =? where t.series_code = ?
-# ------------------------更新系列NFT已发行个数----------------------------
-galaxy_series_nft_info.updateSeriesNftCrtCount=update galaxy_series_nft_info t set t.nft_crt_count = ?,t.updated_at =? where t.sku_id = ?
-# ------------------------更新发行购买处理结果----------------------------
-galaxy_nft_order_fail_log.updateDealWithStatus=update galaxy_nft_order_fail_log t set t.deal_with_status = ?,t.updated_at =? where t.nft_order_pay_id = ? and t.router_type = ?
-
+abss = insert
\ No newline at end of file