#48:admin

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 = "用户ID")
+    private String userId;
     @ApiModelProperty(value = "短订单编号")
     private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")

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 = "用户ID")
+    private String userId;
     @ApiModelProperty(value = "短订单编号")
     private String shortOrderCode;
     @ApiModelProperty(value = "订单编号")

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

@@ -14,6 +14,9 @@
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')
             </if>
+            <if test="userId!=''">
+                and a.user_id = #{userId}
+            </if>
             <if test="shortOrderCode!=''">
                 and a.order_code like concat('%', #{shortOrderCode}, '%')
             </if>
@@ -41,6 +44,7 @@
                 and a.pay_time <![CDATA[<=]]> #{payTimeEnd}
             </if>
         </where>
+        group by a.order_id
         order by a.created_at desc
     </select>
 </mapper>

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

@@ -16,6 +16,9 @@
             <if test="name!=''">
                 and b.name like concat('%', #{name}, '%')
             </if>
+            <if test="userId!=''">
+                and a.user_id = #{userId}
+            </if>
             <if test="shortOrderCode!=''">
                 and a.order_code like concat('%', #{shortOrderCode}, '%')
             </if>
@@ -35,6 +38,7 @@
                 and d.status = #{status}
             </if>
         </where>
+        group by a.order_id
         order by d.created_at desc
     </select>
 </mapper>