admin NFT订单管理增加短订单号查询

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

@@ -21,6 +21,8 @@ public class GoblinNftOrderListParam {
 
     @ApiModelProperty(value = "藏品名称")
     private String name;
+    @ApiModelProperty(value = "短订单编号")
+    private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")
     private String orderCode;
     @ApiModelProperty(value = "发放HASH")

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

@@ -21,6 +21,8 @@ public class GoblinNftOrderRefundListParam {
 
     @ApiModelProperty(value = "藏品名称")
     private String name;
+    @ApiModelProperty(value = "短订单编号")
+    private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")
     private String orderCode;
     @ApiModelProperty(value = "发放HASH")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinNftOrderController.java

@@ -33,14 +33,13 @@ public class GoblinNftOrderController extends BaseController {
     private GoblinNftOrderAdminServiceImpl goblinNftOrderAdminService;
 
     // NFT订单列表
-    @RequiresPermissions("goblin:nftOrder:list:view")
     @GetMapping("/orderView")
     public String orderView() {
         return prefix + "/orderView";
     }
 
     @Log(title = "NFT订单", businessType = BusinessType.LIST)
-    @RequiresPermissions("goblin:nftOrder:list:data")
+    @RequiresPermissions("goblin:nftOrder:list")
     @PostMapping("/orderList")
     @ResponseBody
     public TableDataInfo orderList(GoblinNftOrderListParam listParam) {
@@ -50,14 +49,13 @@ public class GoblinNftOrderController extends BaseController {
     }
 
     // NFT订单列表退款
-    @RequiresPermissions("goblin:nftOrderRefund:list:view")
     @GetMapping("/orderRefundView")
     public String orderRefundView() {
         return prefix + "/orderRefundView";
     }
 
-    @Log(title = "NFT订单", businessType = BusinessType.LIST)
-    @RequiresPermissions("goblin:nftOrderRefund:list:data")
+    @Log(title = "NFT退款订单", businessType = BusinessType.LIST)
+    @RequiresPermissions("goblin:nftOrderRefund:list")
     @PostMapping("/refundList")
     @ResponseBody
     public TableDataInfo refundList(GoblinNftOrderRefundListParam listParam) {

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

@@ -9,15 +9,18 @@
         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_digital_artwork as c on c.order_id = a.order_id
+        join goblin_user_digital_artwork as c on c.order_id = a.order_id
         <where>
-            <if test="name != null and name!=''">
+            <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')
             </if>
-            <if test="orderCode != null and orderCode!=''">
+            <if test="shortOrderCode!=''">
+                and b.order_code like concat('%', #{shortOrderCode}, '%')
+            </if>
+            <if test="orderCode!=''">
                 and b.order_code = #{orderCode}
             </if>
-            <if test="tradingTxhash != null and tradingTxhash!=''">
+            <if test="tradingTxhash!=''">
                 and b.trading_txhash = #{tradingTxhash}
             </if>
             <if test="orderType != null and orderType!=''">

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

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