记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
c7863509
Commit
c7863509
authored
Apr 02, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin 后台管理 藏品订单、退款列表完善
parent
31520d57
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
26 deletions
+24
-26
GoblinNftOrderListParam.java
...t/service/goblin/param/admin/GoblinNftOrderListParam.java
+1
-1
GoblinNftOrderRefundListParam.java
...ice/goblin/param/admin/GoblinNftOrderRefundListParam.java
+1
-1
GoblinNftOrderListDto.java
...idnet/service/goblin/dto/admin/GoblinNftOrderListDto.java
+2
-2
GoblinNftOrderRefundListDto.java
...service/goblin/dto/admin/GoblinNftOrderRefundListDto.java
+2
-2
GoblinNftOrderMapper.xml
....liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml
+9
-10
GoblinNftOrderRefundMapper.xml
...dnet.service.goblin.mapper/GoblinNftOrderRefundMapper.xml
+9
-10
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderListParam.java
View file @
c7863509
...
@@ -30,7 +30,7 @@ public class GoblinNftOrderListParam {
...
@@ -30,7 +30,7 @@ public class GoblinNftOrderListParam {
@ApiModelProperty
(
value
=
"购买方式"
)
@ApiModelProperty
(
value
=
"购买方式"
)
private
Integer
orderType
;
private
Integer
orderType
;
@ApiModelProperty
(
value
=
"支付方式"
)
@ApiModelProperty
(
value
=
"支付方式"
)
private
Integer
payType
;
private
String
payType
;
@ApiModelProperty
(
value
=
"订单状态"
)
@ApiModelProperty
(
value
=
"订单状态"
)
private
Integer
status
;
private
Integer
status
;
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderRefundListParam.java
View file @
c7863509
...
@@ -30,7 +30,7 @@ public class GoblinNftOrderRefundListParam {
...
@@ -30,7 +30,7 @@ public class GoblinNftOrderRefundListParam {
@ApiModelProperty
(
value
=
"购买方式"
)
@ApiModelProperty
(
value
=
"购买方式"
)
private
Integer
orderType
;
private
Integer
orderType
;
@ApiModelProperty
(
value
=
"支付方式"
)
@ApiModelProperty
(
value
=
"支付方式"
)
private
Integer
payType
;
private
String
payType
;
@ApiModelProperty
(
value
=
"订单状态"
)
@ApiModelProperty
(
value
=
"订单状态"
)
private
Integer
status
;
private
Integer
status
;
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/admin/GoblinNftOrderListDto.java
View file @
c7863509
...
@@ -6,10 +6,10 @@ import lombok.Data;
...
@@ -6,10 +6,10 @@ import lombok.Data;
public
class
GoblinNftOrderListDto
{
public
class
GoblinNftOrderListDto
{
private
String
userId
;
private
String
userId
;
private
String
orderCode
;
private
String
orderCode
;
private
String
orderType
;
private
Integer
orderType
;
private
String
payType
;
private
String
payType
;
private
String
priceActual
;
private
String
priceActual
;
private
String
status
;
private
Integer
status
;
private
String
payTime
;
private
String
payTime
;
private
String
name
;
private
String
name
;
private
String
releaseAt
;
private
String
releaseAt
;
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/admin/GoblinNftOrderRefundListDto.java
View file @
c7863509
...
@@ -6,14 +6,14 @@ import lombok.Data;
...
@@ -6,14 +6,14 @@ import lombok.Data;
public
class
GoblinNftOrderRefundListDto
{
public
class
GoblinNftOrderRefundListDto
{
private
String
refundCode
;
private
String
refundCode
;
private
String
price
;
private
String
price
;
private
String
status
;
private
Integer
status
;
private
String
refundAt
;
private
String
refundAt
;
private
String
errorReason
;
private
String
errorReason
;
private
String
createdAt
;
private
String
createdAt
;
private
String
userId
;
private
String
userId
;
private
String
orderCode
;
private
String
orderCode
;
private
String
orderType
;
private
Integer
orderType
;
private
String
payType
;
private
String
payType
;
private
String
payTime
;
private
String
payTime
;
private
String
name
;
private
String
name
;
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml
View file @
c7863509
...
@@ -8,30 +8,29 @@
...
@@ -8,30 +8,29 @@
b.name,
b.name,
c.release_at, c.trading_txhash
c.release_at, c.trading_txhash
from goblin_nft_order as a
from goblin_nft_order as a
join goblin_goods_sku as b on b.sku_id = a.sku_id
left
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_user_digital_artwork as c on c.order_id = a.order_id
<where>
<where>
<if
test=
"name!=''"
>
<if
test=
"name!=''"
>
and b.name like concat('%', #{name}, '%')
and b.name like concat('%', #{name}, '%')
</if>
</if>
<if
test=
"shortOrderCode!=''"
>
<if
test=
"shortOrderCode!=''"
>
and
b
.order_code like concat('%', #{shortOrderCode}, '%')
and
a
.order_code like concat('%', #{shortOrderCode}, '%')
</if>
</if>
<if
test=
"orderCode!=''"
>
<if
test=
"orderCode!=''"
>
and
b
.order_code = #{orderCode}
and
a
.order_code = #{orderCode}
</if>
</if>
<if
test=
"tradingTxhash!=''"
>
<if
test=
"tradingTxhash!=''"
>
and
b
.trading_txhash = #{tradingTxhash}
and
c
.trading_txhash = #{tradingTxhash}
</if>
</if>
<if
test=
"orderType != null and orderType!=''"
>
<if
test=
"orderType != null and orderType!=''"
>
and
b
.order_type = #{orderType}
and
a
.order_type = #{orderType}
</if>
</if>
<if
test=
"payType
!= null and payType
!=''"
>
<if
test=
"payType!=''"
>
and
b
.pay_type = #{payType}
and
a
.pay_type = #{payType}
</if>
</if>
<if
test=
"status != null and status!=''"
>
<if
test=
"status != null and status!=''"
>
and
b
.status = #{status}
and
a
.status = #{status}
</if>
</if>
</where>
</where>
order by a.created_at desc
order by a.created_at desc
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderRefundMapper.xml
View file @
c7863509
...
@@ -9,29 +9,28 @@
...
@@ -9,29 +9,28 @@
b.name,
b.name,
c.release_at, c.trading_txhash
c.release_at, c.trading_txhash
from goblin_nft_order_refund as d
from goblin_nft_order_refund as d
join goblin_nft_order as a on a.order_id = d.order_id
left
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
left
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_user_digital_artwork as c on c.order_id = a.order_id
<where>
<where>
<if
test=
"name!=''"
>
<if
test=
"name!=''"
>
and b.name like concat('%', #{name}, '%')
and b.name like concat('%', #{name}, '%')
</if>
</if>
<if
test=
"shortOrderCode!=''"
>
<if
test=
"shortOrderCode!=''"
>
and
b
.order_code like concat('%', #{shortOrderCode}, '%')
and
a
.order_code like concat('%', #{shortOrderCode}, '%')
</if>
</if>
<if
test=
"orderCode!=''"
>
<if
test=
"orderCode!=''"
>
and
b
.order_code = #{orderCode}
and
a
.order_code = #{orderCode}
</if>
</if>
<if
test=
"tradingTxhash!=''"
>
<if
test=
"tradingTxhash!=''"
>
and
b
.trading_txhash = #{tradingTxhash}
and
c
.trading_txhash = #{tradingTxhash}
</if>
</if>
<if
test=
"orderType != null and orderType!=''"
>
<if
test=
"orderType != null and orderType!=''"
>
and
b
.order_type = #{orderType}
and
a
.order_type = #{orderType}
</if>
</if>
<if
test=
"payType
!= null and payType
!=''"
>
<if
test=
"payType!=''"
>
and
b
.pay_type = #{payType}
and
a
.pay_type = #{payType}
</if>
</if>
<if
test=
"status != null and status!=''"
>
<if
test=
"status != null and status!=''"
>
and d.status = #{status}
and d.status = #{status}
</if>
</if>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment