admin 后台管理 藏品订单、退款列表完善

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

@@ -30,7 +30,7 @@ public class GoblinNftOrderListParam {
     @ApiModelProperty(value = "购买方式")
     private Integer orderType;
     @ApiModelProperty(value = "支付方式")
-    private Integer payType;
+    private String payType;
     @ApiModelProperty(value = "订单状态")
     private Integer status;
 }

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

@@ -30,7 +30,7 @@ public class GoblinNftOrderRefundListParam {
     @ApiModelProperty(value = "购买方式")
     private Integer orderType;
     @ApiModelProperty(value = "支付方式")
-    private Integer payType;
+    private String payType;
     @ApiModelProperty(value = "订单状态")
     private Integer status;
 }

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

@@ -6,10 +6,10 @@ import lombok.Data;
 public class GoblinNftOrderListDto {
     private String userId;
     private String orderCode;
-    private String orderType;
+    private Integer orderType;
     private String payType;
     private String priceActual;
-    private String status;
+    private Integer status;
     private String payTime;
     private String name;
     private String releaseAt;

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

@@ -6,14 +6,14 @@ import lombok.Data;
 public class GoblinNftOrderRefundListDto {
     private String refundCode;
     private String price;
-    private String status;
+    private Integer status;
     private String refundAt;
     private String errorReason;
     private String createdAt;
 
     private String userId;
     private String orderCode;
-    private String orderType;
+    private Integer orderType;
     private String payType;
     private String payTime;
     private String name;

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

@@ -8,30 +8,29 @@
         b.name,
         c.release_at, c.trading_txhash
         from goblin_nft_order as a
-        join goblin_goods_sku as b on b.sku_id = a.sku_id
-        join goblin_user_digital_artwork as c on c.order_id = a.order_id
+        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
         <where>
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')
             </if>
             <if test="shortOrderCode!=''">
-                and b.order_code like concat('%', #{shortOrderCode}, '%')
+                and a.order_code like concat('%', #{shortOrderCode}, '%')
             </if>
             <if test="orderCode!=''">
-                and b.order_code = #{orderCode}
+                and a.order_code = #{orderCode}
             </if>
             <if test="tradingTxhash!=''">
-                and b.trading_txhash = #{tradingTxhash}
+                and c.trading_txhash = #{tradingTxhash}
             </if>
             <if test="orderType != null and orderType!=''">
-                and b.order_type = #{orderType}
+                and a.order_type = #{orderType}
             </if>
-            <if test="payType != null and payType!=''">
-                and b.pay_type = #{payType}
+            <if test="payType!=''">
+                and a.pay_type = #{payType}
             </if>
-
             <if test="status != null and status!=''">
-                and b.status = #{status}
+                and a.status = #{status}
             </if>
         </where>
         order by a.created_at desc

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

@@ -9,29 +9,28 @@
         b.name,
         c.release_at, c.trading_txhash
         from goblin_nft_order_refund as d
-        join goblin_nft_order as a on a.order_id = d.order_id
-        join goblin_goods_sku as b on b.sku_id = a.sku_id
-        join goblin_user_digital_artwork as c on c.order_id = a.order_id
+        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
+        left join goblin_user_digital_artwork as c on c.order_id = a.order_id
         <where>
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')
             </if>
             <if test="shortOrderCode!=''">
-                and b.order_code like concat('%', #{shortOrderCode}, '%')
+                and a.order_code like concat('%', #{shortOrderCode}, '%')
             </if>
             <if test="orderCode!=''">
-                and b.order_code = #{orderCode}
+                and a.order_code = #{orderCode}
             </if>
             <if test="tradingTxhash!=''">
-                and b.trading_txhash = #{tradingTxhash}
+                and c.trading_txhash = #{tradingTxhash}
             </if>
             <if test="orderType != null and orderType!=''">
-                and b.order_type = #{orderType}
+                and a.order_type = #{orderType}
             </if>
-            <if test="payType != null and payType!=''">
-                and b.pay_type = #{payType}
+            <if test="payType!=''">
+                and a.pay_type = #{payType}
             </if>
-
             <if test="status != null and status!=''">
                 and d.status = #{status}
             </if>