Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
foreign
/
customer-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c8d4a66c
authored
Dec 02, 2021
by
Sixong.Zhu
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
ad
parent
515362e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
17 deletions
model/order.ts
service/order.ts
model/order.ts
View file @
c8d4a66c
...
@@ -54,12 +54,12 @@ export interface OrderTableListItem {
...
@@ -54,12 +54,12 @@ export interface OrderTableListItem {
export
const
orderPredict
=
{
export
const
orderPredict
=
{
id
:
"ID"
,
id
:
"ID"
,
v
:
'uniplat_version'
,
v
:
"uniplat_version"
,
no
:
'OrderDocNo'
,
no
:
"OrderDocNo"
,
title
:
"ProductId#product.OuterName"
,
title
:
"ProductId#product.OuterName"
,
status
:
"Status"
,
status
:
"Status"
,
time
:
"CreatedDate"
,
time
:
"CreatedDate"
,
createTime
:
'CreatedDate'
,
createTime
:
"CreatedDate"
,
PayAmount
:
"PayAmount"
,
PayAmount
:
"PayAmount"
,
PaidAmount
:
"PaidAmount"
,
PaidAmount
:
"PaidAmount"
,
RefundAmount
:
"RefundAmount"
,
RefundAmount
:
"RefundAmount"
,
...
@@ -107,6 +107,9 @@ export interface OrderPayItem {
...
@@ -107,6 +107,9 @@ export interface OrderPayItem {
value
:
number
;
value
:
number
;
status
:
PayStatus
;
status
:
PayStatus
;
method
:
PayMethod
;
method
:
PayMethod
;
createdTime
:
string
;
v
:
number
;
actions
?:
any
[];
}
}
export
const
enum
ChatOpenDirection
{
export
const
enum
ChatOpenDirection
{
...
...
service/order.ts
View file @
c8d4a66c
...
@@ -72,7 +72,12 @@ class OrderService {
...
@@ -72,7 +72,12 @@ class OrderService {
);
);
}
}
public
getPayments
(
id
:
number
)
{
/**
* 获取订单支付记录
* @param id 订单id
* @param withActions 是否获取行数据中action条目
*/
public
getPayments
(
id
:
number
,
withActions
=
false
)
{
return
this
.
getSdk
()
return
this
.
getSdk
()
.
model
(
orderService
.
generalOrderPaymentModel
)
.
model
(
orderService
.
generalOrderPaymentModel
)
.
list
()
.
list
()
...
@@ -80,7 +85,7 @@ class OrderService {
...
@@ -80,7 +85,7 @@ class OrderService {
.
query
({
pageIndex
:
1
,
item_size
:
100
})
.
query
({
pageIndex
:
1
,
item_size
:
100
})
.
then
((
r
)
=>
{
.
then
((
r
)
=>
{
if
(
r
&&
r
.
pageData
&&
r
.
pageData
.
rows
)
{
if
(
r
&&
r
.
pageData
&&
r
.
pageData
.
rows
)
{
return
this
.
handler
.
buildRows
<
OrderPayItem
>
(
const
items
=
this
.
handler
.
buildRows
<
OrderPayItem
>
(
r
.
pageData
.
rows
,
r
.
pageData
.
rows
,
{
{
status
:
"Status"
,
status
:
"Status"
,
...
@@ -90,8 +95,18 @@ class OrderService {
...
@@ -90,8 +95,18 @@ class OrderService {
deadLine
:
"PaymentDueDate"
,
deadLine
:
"PaymentDueDate"
,
value
:
"Amount"
,
value
:
"Amount"
,
method
:
"PaymentFunction"
,
method
:
"PaymentFunction"
,
createdTime
:
"CreatedDate"
,
v
:
"uniplat_version"
,
}
}
);
);
if
(
withActions
)
{
for
(
let
i
=
0
;
i
<
r
.
pageData
.
rows
.
length
;
i
++
)
{
items
[
i
].
actions
=
r
.
pageData
.
rows
[
i
].
actions
;
}
}
return
items
;
}
}
return
[];
return
[];
});
});
...
@@ -121,7 +136,9 @@ class OrderService {
...
@@ -121,7 +136,9 @@ class OrderService {
return
this
.
getSdk
()
return
this
.
getSdk
()
.
model
(
orderService
.
generalOrderPaymentModel
)
.
model
(
orderService
.
generalOrderPaymentModel
)
.
action
(
"addImages"
)
.
action
(
"addImages"
)
.
updateInitialParams
({
selected_list
:
[{
v
,
id
:
payment
as
number
}]
})
.
updateInitialParams
({
selected_list
:
[{
v
,
id
:
payment
as
number
}],
})
.
addInputs_parameter
({
images
:
path
})
.
addInputs_parameter
({
images
:
path
})
.
execute
();
.
execute
();
}
}
...
@@ -132,17 +149,13 @@ class OrderService {
...
@@ -132,17 +149,13 @@ class OrderService {
.
list
()
.
list
()
.
addPrefilter
({
PaymentId
:
payment
})
.
addPrefilter
({
PaymentId
:
payment
})
.
query
({
item_size
:
10
,
pageIndex
:
1
})
.
query
({
item_size
:
10
,
pageIndex
:
1
})
.
then
(
.
then
((
r
)
=>
(
r
)
=>
this
.
handler
.
buildRows
<
UploadImageItem
>
(
r
.
pageData
.
rows
,
{
this
.
handler
.
buildRows
<
UploadImageItem
>
(
time
:
"CreatedDate"
,
r
.
pageData
.
rows
,
fileSize
:
"FileSize"
,
{
fileName
:
"FileName"
,
time
:
"CreatedDate"
,
url
:
"Url"
,
fileSize
:
"FileSize"
,
})
fileName
:
"FileName"
,
url
:
"Url"
,
}
)
);
);
}
}
...
...
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