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
13f3b8a0
authored
Dec 16, 2021
by
Sixong.Zhu
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
comment
parent
7ede10fd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
13 deletions
model/order.ts
service/order.ts
model/order.ts
View file @
13f3b8a0
...
@@ -80,7 +80,7 @@ export const orderPredict = {
...
@@ -80,7 +80,7 @@ export const orderPredict = {
lastMsgContent
:
"UniplatLastMsgContent"
,
lastMsgContent
:
"UniplatLastMsgContent"
,
lastMsgTime
:
"UniplatLastMsgTime"
,
lastMsgTime
:
"UniplatLastMsgTime"
,
unreadCount
:
0
,
unreadCount
:
0
,
PayPaymentNum
:
"PayPaymentNum"
PayPaymentNum
:
"PayPaymentNum"
,
};
};
export
const
enum
PayStatus
{
export
const
enum
PayStatus
{
...
@@ -136,6 +136,15 @@ export interface OrderPayItem {
...
@@ -136,6 +136,15 @@ export interface OrderPayItem {
paymentItemId
?:
number
;
paymentItemId
?:
number
;
}
}
export
interface
OrderComment
{
id
:
number
;
content
:
string
;
user
:
string
;
attachment
:
string
;
attachment_label
:
string
;
time
:
string
;
}
export
const
orderPayItemPredict
=
{
export
const
orderPayItemPredict
=
{
status
:
"Status"
,
status
:
"Status"
,
time
:
"PaymentDate"
,
time
:
"PaymentDate"
,
...
@@ -153,7 +162,7 @@ export const orderPayItemPredict = {
...
@@ -153,7 +162,7 @@ export const orderPayItemPredict = {
OpenningBankName
:
"ProviderHandleId#ServiceProviderBank.OpenningBankName"
,
OpenningBankName
:
"ProviderHandleId#ServiceProviderBank.OpenningBankName"
,
bankAccountNo
:
"ProviderHandleId#ServiceProviderBank.AccountNo"
,
bankAccountNo
:
"ProviderHandleId#ServiceProviderBank.AccountNo"
,
paymentItemId
:
"PaymentItemId"
,
paymentItemId
:
"PaymentItemId"
,
}
}
;
export
const
enum
ChatOpenDirection
{
export
const
enum
ChatOpenDirection
{
/**
/**
...
...
service/order.ts
View file @
13f3b8a0
...
@@ -9,12 +9,14 @@ import {
...
@@ -9,12 +9,14 @@ import {
OrderPayItem
,
OrderPayItem
,
UploadImageItem
,
UploadImageItem
,
orderPayItemPredict
,
orderPayItemPredict
,
OrderComment
,
}
from
"../model"
;
}
from
"../model"
;
import
{
GeneralOrderDirection
}
from
'../model/order-product'
;
import
{
GeneralOrderDirection
}
from
"../model/order-product"
;
class
OrderService
{
class
OrderService
{
public
readonly
generalOrder
=
"general_order_info"
;
public
readonly
generalOrder
=
"general_order_info"
;
public
readonly
generalOrderPaymentModel
=
"general_order_payment_info"
;
public
readonly
generalOrderPaymentModel
=
"general_order_payment_info"
;
private
readonly
commentModel
=
"uniplat_model_remark@general_order"
;
private
readonly
handler
=
new
UniplatSdkExtender
();
private
readonly
handler
=
new
UniplatSdkExtender
();
private
innerSdk
:
UniplatSdk
|
null
=
null
;
private
innerSdk
:
UniplatSdk
|
null
=
null
;
...
@@ -65,17 +67,19 @@ class OrderService {
...
@@ -65,17 +67,19 @@ class OrderService {
}
}
/** 专项工单 */
/** 专项工单 */
public
getOrders
(
params
:
{
public
getOrders
(
params
:
{
productCode
?:
GeneralOrderDirection
;
productCode
?:
GeneralOrderDirection
;
index
:
number
;
index
:
number
;
size
?:
number
;
size
?:
number
;
},
},
isHrs
=
false
)
{
isHrs
=
false
)
{
const
list
=
this
.
getSdk
()
const
list
=
this
.
getSdk
()
.
model
(
this
.
generalOrder
)
.
model
(
this
.
generalOrder
)
.
list
(
isHrs
?
"hroOrgOrderList"
:
"userOrderList"
);
.
list
(
isHrs
?
"hroOrgOrderList"
:
"userOrderList"
);
if
(
params
.
productCode
)
{
if
(
params
.
productCode
)
{
list
.
addPrefilter
({
'ProductId#product.Code'
:
params
.
productCode
});
list
.
addPrefilter
({
"ProductId#product.Code"
:
params
.
productCode
});
}
}
return
list
return
list
.
query
({
item_size
:
params
.
size
||
100
,
pageIndex
:
params
.
index
})
.
query
({
item_size
:
params
.
size
||
100
,
pageIndex
:
params
.
index
})
...
@@ -99,7 +103,7 @@ class OrderService {
...
@@ -99,7 +103,7 @@ class OrderService {
.
model
(
this
.
generalOrder
)
.
model
(
this
.
generalOrder
)
.
list
(
"hroOrgDoingOrderList"
);
.
list
(
"hroOrgDoingOrderList"
);
if
(
params
.
productCode
)
{
if
(
params
.
productCode
)
{
list
.
addPrefilter
({
'ProductId#product.Code'
:
params
.
productCode
});
list
.
addPrefilter
({
"ProductId#product.Code"
:
params
.
productCode
});
}
}
return
list
return
list
.
query
({
item_size
:
params
.
size
||
100
,
pageIndex
:
params
.
index
})
.
query
({
item_size
:
params
.
size
||
100
,
pageIndex
:
params
.
index
})
...
@@ -207,13 +211,47 @@ class OrderService {
...
@@ -207,13 +211,47 @@ class OrderService {
}
}
public
sendPayAccountInfo
(
params
:
{
send
:
string
})
{
public
sendPayAccountInfo
(
params
:
{
send
:
string
})
{
return
this
.
getSdk
().
domainService
(
"hro_spview"
,
"OrderSetting"
,
"sendPayAccountInfo"
)
return
this
.
getSdk
()
.
request
(
"get"
,
{
params
})
.
domainService
(
"hro_spview"
,
"OrderSetting"
,
"sendPayAccountInfo"
)
.
request
(
"get"
,
{
params
});
}
public
sendPayAccountInfoForAgent
(
params
:
{
send
:
string
;
userOrderPaymentId
:
number
;
})
{
return
this
.
getSdk
()
.
domainService
(
"hro_spview"
,
"OrderSetting"
,
"sendPayAccountInfoForAgent"
)
.
request
(
"get"
,
{
params
});
}
}
public
sendPayAccountInfoForAgent
(
params
:
{
send
:
string
;
userOrderPaymentId
:
number
})
{
public
getComments
(
order
:
number
|
string
)
{
return
this
.
getSdk
().
domainService
(
"hro_spview"
,
"OrderSetting"
,
"sendPayAccountInfoForAgent"
)
return
this
.
getSdk
()
.
request
(
"get"
,
{
params
})
.
model
(
orderService
.
commentModel
)
.
list
(
"system_remark"
)
.
addPrefilter
({
associate_id
:
order
})
.
query
({
pageIndex
:
1
,
item_size
:
100
})
.
then
((
r
)
=>
{
if
(
r
&&
r
.
pageData
&&
r
.
pageData
.
rows
)
{
const
items
=
this
.
handler
.
buildRows
<
OrderComment
>
(
r
.
pageData
.
rows
,
{
id
:
""
,
time
:
"create_time"
,
attachment
:
"attachments_label"
,
user
:
"dealer_name"
,
content
:
""
,
}
);
return
items
;
}
return
[];
});
}
}
}
}
...
...
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