nft修改购买逻辑

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

@@ -290,7 +290,7 @@ public class MQConst {
         SQL_NFT_ORDER_INFO("galaxy:stream:rk.sql.nftOrderInfo", "group.sql.nftOrderInfo", "订单信息"),
         SQL_NFT_TRADE_INFO("galaxy:stream:rk.sql.nftTradeInfo", "group.sql.nftTradeInfo", "交易信息"),
 //        JSON_NFT_PUBLISH_AND_BUY("galaxy:stream:rk.json.nftPublishAndBuy", "group.sql.nftPublishAndBuy", "NFT发行和购买"),
-        JSON_NFT_PUBLISH_AND_BUY("galaxy:stream:rk.json.nftPublishAndBuyLocal", "group.sql.nftPublishAndBuyLocal", "NFT发行和购买"),
+        JSON_NFT_PUBLISH_AND_BUY("galaxy:stream:rk.json.nftPublishAndBuy", "group.sql.nftPublishAndBuy", "NFT发行和购买"),
         ;
         private final String key;
         private final String group;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/pom.xml

@@ -73,6 +73,17 @@
             <artifactId>liquidnet-service-galaxy-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-galaxy-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.liquidnet</groupId>
+                    <artifactId>liquidnet-common-web</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/utils/DataUtils.java

 package com.liquidnet.service.consumer.kylin.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.BeanUtil;
-import com.liquidnet.commons.lang.util.DateUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.galaxy.constant.GalaxyConstant;
-import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
-import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
-import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
-import com.liquidnet.service.galaxy.dto.vo.mongo.GalaxyNftOrderVo;
-import com.liquidnet.service.galaxy.dto.vo.mongo.GalaxySeriesNftInfoVo;
-import com.liquidnet.service.galaxy.dto.vo.mongo.GalaxyUserInfoVo;
-import com.mongodb.client.result.UpdateResult;
+import com.liquidnet.service.galaxy.utils.AbstractDataUtils;
+import com.liquidnet.service.galaxy.utils.QueueUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
-
 @Slf4j
 @Component
-public class DataUtils {
+public class DataUtils extends AbstractDataUtils {
     @Autowired
     private RedisUtil redisUtil;
 
@@ -39,76 +22,19 @@ public class DataUtils {
 
     private long keyExpireTime = 3600*24*30;
 
-    public GalaxyUserInfoBo getGalaxyUserInfo(String routerType, String userId) {
-        Object obj = redisUtil.get(GalaxyConstant.REDIS_KEY_GALAXY_USER.concat(routerType).concat(":") + userId);
-        if(obj!=null){
-            return (GalaxyUserInfoBo) obj;
-        }else {
-            GalaxyUserInfoVo userInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("userId").is(userId)), GalaxyUserInfoVo.class, GalaxyUserInfoVo.class.getSimpleName());
-            if (userInfoVo == null) {
-                return null;
-            }
-            GalaxyUserInfoBo userInfoBo = GalaxyUserInfoBo.getNew();
-            BeanUtil.copy(userInfoVo,userInfoBo);
-
-            redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_USER.concat(routerType).concat(":") + userId, userInfoBo);
-            return userInfoBo;
-        }
-    }
 
-    public GalaxyNftOrderBo getNftOrderBo(String routerType, String nftOrderPayId) {
-        Object obj = redisUtil.get(GalaxyConstant.REDIS_KEY_GALAXY_TRADE.concat(routerType).concat(":") + nftOrderPayId);
-        if(obj!=null){
-            return (GalaxyNftOrderBo) obj;
-        }else {
-            GalaxyNftOrderVo nftOrderVo = mongoTemplate.findOne(Query.query(Criteria.where("nftOrderPayId").is(nftOrderPayId)), GalaxyNftOrderVo.class, GalaxyNftOrderVo.class.getSimpleName());
-            if (nftOrderVo == null) {
-                return null;
-            }
-            GalaxyNftOrderBo nftOrderBo = GalaxyNftOrderBo.getNew();
-            BeanUtil.copy(nftOrderVo,nftOrderBo);
-            redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_TRADE.concat(routerType).concat(":") + nftOrderPayId, nftOrderBo);
-            return nftOrderBo;
-        }
+    @Override
+    public RedisUtil getRedisUtil() {
+        return redisUtil;
     }
 
-    public GalaxySeriesNftInfoBo getSeriesNftInfoBo(String routerType, String skuId) {
-        Object obj = redisUtil.get(GalaxyConstant.REDIS_KEY_GALAXY_SERIES_NFT.concat(routerType).concat(":") + skuId);
-        if(obj!=null){
-            return (GalaxySeriesNftInfoBo) obj;
-        }else {
-            GalaxySeriesNftInfoVo seriesNftInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId)), GalaxySeriesNftInfoVo.class, GalaxySeriesNftInfoVo.class.getSimpleName());
-            if (seriesNftInfoVo == null) {
-                return null;
-            }
-            GalaxySeriesNftInfoBo seriesNftInfoBo = GalaxySeriesNftInfoBo.getNew();
-            BeanUtil.copy(seriesNftInfoVo,seriesNftInfoBo);
-            redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_SERIES_NFT.concat(routerType).concat(":") + skuId, seriesNftInfoBo);
-            return seriesNftInfoBo;
-        }
+    @Override
+    public MongoTemplate getMongoTemplate() {
+        return mongoTemplate;
     }
 
-    public void updateNftOrderBuyTaskId(String routerType,String nftOrderPayId,GalaxyNftOrderBo nftOrderBo) {
-        redisUtil.set(GalaxyConstant.REDIS_KEY_GALAXY_TRADE.concat(routerType).concat(":") + nftOrderPayId,nftOrderBo,keyExpireTime);
-
-        Query query = Query.query(Criteria.where("nftOrderPayId").is(nftOrderPayId));
-        Update update = Update.fromDocument(Document.parse(JsonUtils.toJson(nftOrderBo)));
-        update.set("nftBuyTaskId", nftOrderBo.getNftBuyTaskId());
-        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now());
-        update.set("updatedAt",nowTimeStr);
-        UpdateResult result = mongoTemplate.updateFirst(query,update, GalaxyNftOrderVo.class,GalaxyNftOrderVo.class.getSimpleName());
-        log.info("updateNftOrderInfo result:{}",result.toString());
-
-        try{
-            queueUtil.sendMySqlRedis(
-                    SqlMapping.get("galaxy_nft_order_info.updateNftBuyTaskId"),
-                    new Object[]{nftOrderBo.getNftBuyTaskId(),LocalDateTime.now(),nftOrderBo.getNftOrderPayId()}
-                    , MQConst.GalaxyQueue.SQL_NFT_TRADE_INFO.getKey()
-            );
-        }catch(Exception e){
-            log.error(e.getMessage(),e);
-            log.error("#setNftTradeInfo error ==> MESSAGE:{}",e.getMessage());
-        }
+    @Override
+    public com.liquidnet.service.galaxy.utils.QueueUtil getQueueUtil() {
+        return queueUtil;
     }
-
 }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/utils/QueueUtil.java

-package com.liquidnet.service.consumer.kylin.utils;
-
-import com.liquidnet.service.base.SqlMapping;
-import com.liquidnet.service.galaxy.utils.ObjectUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.stream.MapRecord;
-import org.springframework.data.redis.connection.stream.StreamRecords;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-
-/**
- * @author AnJiabin <anjiabin@zhengzai.tv>
- * @version V1.0
- * @Description: TODO
- * @class: QueueUtil
- * @Package com.liquidnet.service.galaxy.utils
- * @Copyright: LightNet @ Copyright (c) 2022
- * @date 2022/3/25 15:35
- */
-@Component
-public class QueueUtil {
-    @Autowired
-    StringRedisTemplate stringRedisTemplate;
-
-    /**
-     * 给 REDIS 队列发送消息 数据库相关
-     *
-     * @param sql  sql语句
-     * @param data 需要操作的数据
-     * @return
-     */
-    public boolean sendMySqlRedis(String sql, Object[] data , String redisKey) {
-        try {
-            LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
-            sqls.add(sql);
-            LinkedList<Object[]> sqlsData = ObjectUtil.cloneLinkedListObj();
-            sqlsData.add(data);
-            String sqlData = SqlMapping.gets(sqls, sqlsData);
-
-            HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
-            map.put("message", sqlData);
-            MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
-            stringRedisTemplate.opsForStream().add(record);
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-}

liquidnet-bus-service/liquidnet-service-consumer-all/pom.xml

@@ -17,7 +17,6 @@
         <module>liquidnet-service-consumer-sweet</module>
         <module>liquidnet-service-consumer-stone</module>
         <module>liquidnet-service-consumer-candy</module>
-        <module>liquidnet-service-consumer-galaxy</module>
     </modules>
 
     <dependencies>

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-service-galaxy</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-service-galaxy-common</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-third-zxlnft</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-third-antchain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-galaxy-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinCommonBiz.java → liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyBeanTransferBiz.java

-package com.liquidnet.service.galaxy.router.zxin.biz;
+package com.liquidnet.service.galaxy.biz;
 
 import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
@@ -14,18 +14,18 @@ import java.time.LocalDateTime;
  * @author AnJiabin <anjiabin@zhengzai.tv>
  * @version V1.0
  * @Description: TODO
- * @class: ZxinCommonBiz
- * @Package com.liquidnet.service.galaxy.router.zxin.biz
+ * @class: GalaxyCommonBiz
+ * @Package com.liquidnet.service.galaxy.router.strategy.biz
  * @Copyright: LightNet @ Copyright (c) 2022
- * @date 2022/3/30 17:51
+ * @date 2022/3/23 11:20
  */
 @Slf4j
 @Component
-public class ZxinCommonBiz {
+public class GalaxyBeanTransferBiz {
     @Autowired
     private ZxlnftConfig zxlnftConfig;
 
-    public GalaxyNftOrderBo buildNftOrderBo(String nftOrderPayId,GalaxyUserInfoBo userInfoBo, GalaxySeriesNftInfoBo seriesNftInfoBo){
+    public GalaxyNftOrderBo buildNftOrderBo(String nftOrderPayId, GalaxyUserInfoBo userInfoBo, GalaxySeriesNftInfoBo seriesNftInfoBo){
         GalaxyNftOrderBo nftOrderBo = GalaxyNftOrderBo.getNew();
         nftOrderBo.setUserId(userInfoBo.getUserId());
         nftOrderBo.setSkuId(seriesNftInfoBo.getSkuId());

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/biz/GalaxyEnumBiz.java → liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyEnumBiz.java

-package com.liquidnet.service.galaxy.router.strategy.biz;
+package com.liquidnet.service.galaxy.biz;
 
 import com.liquidnet.common.third.antchain.constant.AntchainEnum;
 import com.liquidnet.common.third.zxlnft.constant.ZxlnftEnum;
@@ -17,7 +17,7 @@ public class GalaxyEnumBiz {
 
     /**
      * 任务状态转换
-     * @param routerTypeEnum
+     * @param routerType
      * @param code
      * @return
      */

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/utils/QueueUtil.java → liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractQueueUtil.java

@@ -2,11 +2,9 @@ package com.liquidnet.service.galaxy.utils;
 
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.SqlMapping;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.MapRecord;
 import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -20,10 +18,10 @@ import java.util.LinkedList;
  * @Copyright: LightNet @ Copyright (c) 2022
  * @date 2022/3/25 15:35
  */
-@Component
-public class QueueUtil {
-    @Autowired
-    StringRedisTemplate stringRedisTemplate;
+
+public abstract class AbstractQueueUtil {
+
+    abstract StringRedisTemplate getStringRedisTemplate();
 
     /**
      * 给 REDIS 队列发送消息 数据库相关
@@ -43,7 +41,7 @@ public class QueueUtil {
             HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
             map.put("message", sqlData);
             MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
-            stringRedisTemplate.opsForStream().add(record);
+            this.getStringRedisTemplate().opsForStream().add(record);
             return true;
         } catch (Exception e) {
             e.printStackTrace();
@@ -60,6 +58,6 @@ public class QueueUtil {
     public void sendMsgByRedis(String streamKey, String jsonMsg) {
         HashMap<String, String> map = CollectionUtil.mapStringString();
         map.put("message", jsonMsg);
-        stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
+        this.getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 }

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/utils/ObjectUtil.java → liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/java/com/liquidnet/service/galaxy/utils/ObjectUtil.java

-//package com.liquidnet.service.galaxy.utils;
+package com.liquidnet.service.galaxy.utils;//package com.liquidnet.service.galaxy.utils;
 //
 //import com.alibaba.fastjson.JSONObject;
 //import org.springframework.stereotype.Component;

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

+package com.liquidnet.service.galaxy.utils;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: QueueUtil
+ * @Package com.liquidnet.service.galaxy.utils
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/3/25 15:35
+ */
+@Component
+public class QueueUtil extends AbstractQueueUtil{
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    StringRedisTemplate getStringRedisTemplate() {
+        return stringRedisTemplate;
+    }
+}

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/bootstrap-dev.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: dev
+  security:
+    username: user
+    password: user123
+  eureka:
+#    host: 172.17.192.42:7001
+    host: 127.0.0.1:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-galaxy

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/bootstrap-prod.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: prod
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.189:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-galaxy
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/bootstrap-service-galaxy.yml

+#eurekaServer配置
+eureka:
+  client:
+    register-with-eureka: false
+    fetch-registry: true
+    serviceUrl:
+      defaultZone: http://${liquidnet.security.username}:${liquidnet.security.password}@${liquidnet.eureka.host}/eureka-server/eureka
+#configServer配置
+spring:
+  cloud:
+    config:
+#      uri: http://39.105.38.151:7002/support-config
+#      uri: http://39.106.122.201:7002/support-config
+#      uri: http://127.0.0.1:7002/support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      name: ${spring.application.name} #默认为spring.application.name
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/bootstrap-test.yml

+# begin-dev-这里是配置信息基本值
+liquidnet:
+  cloudConfig:
+    profile: test
+  security:
+    username: user
+    password: user123
+  eureka:
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
+    #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+    #host: 192.168.193.41:7001
+# end-dev-这里是配置信息基本值
+
+spring:
+  profiles:
+    include: service-galaxy

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: liquidnet-service-galaxy
+  profiles:
+    active: dev

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

+40001=登录信息有误
+40002=账号已在另一台设备登录
+40003=登录已过期
+# ------------------------ 4开头错误码作系统保留

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-common/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 (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+# ------------------------数字藏品系列信息----------------------------
+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_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 (?,?,?,?,?,?,?,?,?,?,?,?,?)
+
+#更新信息
+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 = ?
+
+galaxy_series_nft_info.updateSeriesIdAndStatus=update galaxy_series_nft_info t set t.series_id = ?,t.updated_at =? where t.sku_id = ?
+
+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 = ?
+
+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 = ?
+#更新已发行个数
+galaxy_series_nft_info.updateSeriesNftCrtCount=update galaxy_series_nft_info t set t.nft_crt_count = ?,t.updated_at =? where t.sku_id = ?
+

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>liquidnet-service-galaxy-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-galaxy-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/strategy/biz/GalaxyCommonBiz.java

-package com.liquidnet.service.galaxy.router.strategy.biz;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-/**
- * @author AnJiabin <anjiabin@zhengzai.tv>
- * @version V1.0
- * @Description: TODO
- * @class: GalaxyCommonBiz
- * @Package com.liquidnet.service.galaxy.router.strategy.biz
- * @Copyright: LightNet @ Copyright (c) 2022
- * @date 2022/3/23 11:20
- */
-@Slf4j
-@Component
-public class GalaxyCommonBiz {
-    @Value("${liquidnet.galaxy.temp-file-path:/Users/anjiabin/mdsky_gitlab/galaxy/tempFilePath}")
-    private String tempFilePath;
-
-    /**
-     * 通过URL上传
-     * @param url
-     * @param name
-     * @return
-     */
-    public File inputStreamToFile(String url, String name) {
-        try {
-            HttpURLConnection httpUrl = (HttpURLConnection) new URL(url).openConnection();
-            httpUrl.connect();
-            InputStream ins = httpUrl.getInputStream();
-//            File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
-            File file = new File(tempFilePath + File.separator + name);
-            if (file.exists()) {
-                return file;
-            }
-            OutputStream os = new FileOutputStream(file);
-            int bytesRead;
-            int len = 8192;
-            byte[] buffer = new byte[len];
-            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
-                os.write(buffer, 0, bytesRead);
-            }
-            os.close();
-            ins.close();
-            return file;
-        } catch (Exception e) {
-            log.error("inputStreamToFileUrlError", e);
-            return null;
-        }
-    }
-}

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinArtworkBiz.java

@@ -15,6 +15,8 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.galaxy.biz.GalaxyCommonBiz;
+import com.liquidnet.service.galaxy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.constant.GalaxyConstant;
 import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum;
@@ -22,8 +24,6 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftUploadBo;
 import com.liquidnet.service.galaxy.dto.param.*;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyCommonBiz;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinPublishBiz.java

@@ -8,6 +8,8 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.galaxy.biz.GalaxyBeanTransferBiz;
+import com.liquidnet.service.galaxy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBindBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
@@ -17,7 +19,6 @@ import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishRespDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishResultQueryReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishResultQueryRespDto;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +47,7 @@ public class ZxinPublishBiz {
     private DataUtils dataUtils;
 
     @Autowired
-    private ZxinCommonBiz zxinCommonBiz;
+    private GalaxyBeanTransferBiz galaxyBeanTransferBiz;
 
     /**
      * nft发行
@@ -149,7 +150,7 @@ public class ZxinPublishBiz {
 
         //构造缓存数据
         if(nftOrderBo==null){
-            nftOrderBo = zxinCommonBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
+            nftOrderBo = galaxyBeanTransferBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
             nftOrderBo.setNftId(nftId);
             nftOrderBo.setNftPublishTaskId(taskId);
             dataUtils.setNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId(),nftOrderBo);
@@ -330,7 +331,7 @@ public class ZxinPublishBiz {
 
         //构造缓存数据
         if(nftOrderBo==null){
-            nftOrderBo = zxinCommonBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
+            nftOrderBo = galaxyBeanTransferBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
             nftOrderBo.setNftId(nftId);
             nftOrderBo.setNftPublishTaskId(taskId);
             //设置时间

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinTradeBiz.java

@@ -8,6 +8,8 @@ import com.liquidnet.common.third.zxlnft.dto.*;
 import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.galaxy.biz.GalaxyBeanTransferBiz;
+import com.liquidnet.service.galaxy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.constant.GalaxyErrorEnum;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBindBo;
@@ -15,7 +17,6 @@ import com.liquidnet.service.galaxy.dto.bo.GalaxyNftOrderBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxySeriesNftInfoBo;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.*;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,7 @@ public class ZxinTradeBiz {
     private DataUtils dataUtils;
 
     @Autowired
-    private ZxinCommonBiz zxinCommonBiz;
+    private GalaxyBeanTransferBiz galaxyBeanTransferBiz;
 
     @Autowired
     private ZxinPublishBiz zxinPublishBiz;
@@ -101,7 +102,7 @@ public class ZxinTradeBiz {
 
         //初始化订单数据
         if(nftOrderBo==null){
-            nftOrderBo = zxinCommonBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
+            nftOrderBo = galaxyBeanTransferBiz.buildNftOrderBo(reqDto.getNftOrderPayId(),userInfoBo,seriesNftInfoBo);
             dataUtils.setNftOrderBo(reqDto.getRouterType(),reqDto.getNftOrderPayId(),nftOrderBo);
         }
 

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/main/java/com/liquidnet/service/galaxy/router/zxin/biz/ZxinUserBiz.java

 package com.liquidnet.service.galaxy.router.zxin.biz;
 
 import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
-import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
 import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
 import com.liquidnet.common.third.zxlnft.dto.*;
 import com.liquidnet.common.third.zxlnft.dto.nft.Nft016QueryRsData;
@@ -15,13 +14,13 @@ import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.BASE64Util;
 import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.galaxy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.constant.GalaxyEnum;
 import com.liquidnet.service.galaxy.dto.bo.GalaxyUserInfoBo;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserBindStatusQueryReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserBindStatusQueryRespDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterReqDto;
 import com.liquidnet.service.galaxy.dto.param.GalaxyUserRegisterRespDto;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyEnumBiz;
 import com.liquidnet.service.galaxy.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,9 +50,6 @@ public class ZxinUserBiz {
     @Autowired
     private ZxlnftBiz zxlnftBiz;
 
-    @Autowired
-    private ZxlnftConfig zxlnftConfig;
-
     @Autowired
     private DataUtils dataUtils;
 

liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlWalletSdkUtil.java

@@ -11,7 +11,7 @@ import com.liquidnet.common.third.zxlnft.util.ZxlnftSdkUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.StringUtil;
-import com.liquidnet.service.galaxy.router.strategy.biz.GalaxyCommonBiz;
+import com.liquidnet.service.galaxy.biz.GalaxyCommonBiz;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;

liquidnet-bus-service/liquidnet-service-galaxy/pom.xml

@@ -12,9 +12,9 @@
     <artifactId>liquidnet-service-galaxy</artifactId>
     <packaging>pom</packaging>
     <modules>
+        <module>liquidnet-service-galaxy-common</module>
         <module>liquidnet-service-galaxy-impl</module>
     </modules>
-
     <dependencies>
         <dependency>
             <groupId>com.liquidnet</groupId>