统一上链时间和哈希值

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderListParam.java

@@ -27,8 +27,8 @@ public class GoblinNftOrderListParam {
     private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")
     private String orderCode;
-    @ApiModelProperty(value = "发放HASH")
-    private String tradingTxhash;
+    @ApiModelProperty(value = "哈希值")
+    private String nftId;
     @ApiModelProperty(value = "购买方式")
     private Integer orderType;
     @ApiModelProperty(value = "支付方式")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderRefundListParam.java

@@ -27,8 +27,8 @@ public class GoblinNftOrderRefundListParam {
     private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")
     private String orderCode;
-    @ApiModelProperty(value = "发放HASH")
-    private String tradingTxhash;
+    @ApiModelProperty(value = "哈希值")
+    private String nftId;
     @ApiModelProperty(value = "购买方式")
     private Integer orderType;
     @ApiModelProperty(value = "支付方式")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/dto/GoblinNftOrderListExcelDto.java

@@ -28,10 +28,10 @@ public class GoblinNftOrderListExcelDto implements Serializable, Cloneable {
     private String payTime;
     @Excel(name = "藏品名称")
     private String name;
-    @Excel(name = "发放时间")
-    private String releaseAt;
-    @Excel(name = "发放HASH")
-    private String tradingTxhash;
+    @Excel(name = "上链时间")
+    private String tradingAt;
+    @Excel(name = "哈希值")
+    private String nftId;
 
     private static final GoblinNftOrderListExcelDto obj = new GoblinNftOrderListExcelDto();
 
@@ -66,8 +66,8 @@ public class GoblinNftOrderListExcelDto implements Serializable, Cloneable {
         this.setStatus(DictUtils.getDictLabel("zhengzai_goblin_nft_order_status", String.valueOf(source.getStatus())));
         this.setPayTime(source.getPayTime());
         this.setName(source.getName());
-        this.setReleaseAt(source.getReleaseAt());
-        this.setTradingTxhash(source.getTradingTxhash());
+        this.setTradingAt(source.getTradingAt());
+        this.setNftId(source.getNftId());
         return this;
     }
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/admin/GoblinNftOrderListDto.java

@@ -11,7 +11,8 @@ public class GoblinNftOrderListDto {
     private String priceActual;
     private Integer status;
     private String payTime;
+    private String createdAt;
     private String name;
-    private String releaseAt;
-    private String tradingTxhash;
+    private String tradingAt;
+    private String nftId;
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/admin/GoblinNftOrderRefundListDto.java

@@ -16,7 +16,8 @@ public class GoblinNftOrderRefundListDto {
     private Integer orderType;
     private String payType;
     private String payTime;
+    private String orderCreatedAt;
     private String name;
-    private String releaseAt;
-    private String tradingTxhash;
+    private String tradingAt;
+    private String nftId;
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml

@@ -4,9 +4,9 @@
 
     <select id="searchList" resultType="com.liquidnet.service.goblin.dto.admin.GoblinNftOrderListDto">
         select
-        a.user_id,a.order_code,a.order_type,a.pay_type,a.price_actual,a.status,a.pay_time,
+        a.user_id,a.order_code,a.order_type,a.pay_type,a.price_actual,a.status,a.pay_time,a.created_at,
         b.name,
-        c.release_at, c.trading_txhash
+        c.trading_at, c.nft_id
         from goblin_nft_order as a
         left join goblin_goods_sku as b on b.sku_id = a.sku_id
         left join goblin_user_digital_artwork as c on c.order_id = a.order_id
@@ -23,8 +23,8 @@
             <if test="orderCode!=''">
                 and a.order_code = #{orderCode}
             </if>
-            <if test="tradingTxhash!=''">
-                and c.trading_txhash = #{tradingTxhash}
+            <if test="nftId!=''">
+                and c.nft_id = #{nftId}
             </if>
             <if test="orderType != null and orderType!=''">
                 and a.order_type = #{orderType}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderRefundMapper.xml

@@ -5,9 +5,9 @@
     <select id="searchList" resultType="com.liquidnet.service.goblin.dto.admin.GoblinNftOrderRefundListDto">
         select
         d.refund_code,d.price,d.status,d.refund_at,d.error_reason,d.created_at,
-        a.user_id,a.order_code,a.order_type,a.pay_type,a.pay_time,
+        a.user_id,a.order_code,a.order_type,a.pay_type,a.pay_time,a.created_at as order_created_at,
         b.name,
-        c.release_at, c.trading_txhash
+        c.trading_at, c.nft_id
         from goblin_nft_order_refund as d
         left join goblin_nft_order as a on a.order_id = d.order_id
         left join goblin_goods_sku as b on b.sku_id = a.sku_id
@@ -25,8 +25,8 @@
             <if test="orderCode!=''">
                 and a.order_code = #{orderCode}
             </if>
-            <if test="tradingTxhash!=''">
-                and c.trading_txhash = #{tradingTxhash}
+            <if test="nftId!=''">
+                and c.nft_id = #{nftId}
             </if>
             <if test="orderType != null and orderType!=''">
                 and a.order_type = #{orderType}