Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
353761ec
Commit
353761ec
authored
May 20, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
957a8cbc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
19 deletions
+19
-19
xggsve-order/app/base/service/impl/order/obusinessmenSve.js
+4
-4
xggsve-order/app/base/service/impl/order/oorderSve.js
+8
-8
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
+1
-1
xggsve-order/app/base/service/impl/saas/saasorderSve.js
+5
-5
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
+1
-1
No files found.
xggsve-order/app/base/service/impl/order/obusinessmenSve.js
View file @
353761ec
...
...
@@ -20,7 +20,7 @@ class ObusinessmenService extends ServiceBase {
async
queryObusinessmen
(
params
)
{
try
{
let
obj
=
await
this
.
findById
(
this
.
trim
(
params
.
id
));
this
.
handleDate
(
obj
,
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
,
8
);
this
.
handleDate
(
obj
,
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
);
let
attributes
=
[
"source_no"
,
"saas_deliver_api"
];
let
order
=
await
this
.
oorderDao
.
model
.
findOne
({
where
:{
...
...
@@ -70,7 +70,7 @@ class ObusinessmenService extends ServiceBase {
try
{
let
obj
=
await
this
.
dao
.
findByCreditCode
(
credit_code
,
saas_id
);
if
(
obj
&&
obj
.
length
>
0
){
this
.
handleDate
(
obj
[
0
],
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
,
8
);
this
.
handleDate
(
obj
[
0
],
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
);
}
else
{
obj
=
{};
}
...
...
@@ -247,7 +247,7 @@ class ObusinessmenService extends ServiceBase {
let
list
=
await
this
.
dao
.
listByCondition
(
params
);
if
(
list
)
{
for
(
var
row
of
list
)
{
this
.
handleDate
(
row
,
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
,
8
);
this
.
handleDate
(
row
,
[
"created_at"
,
"assignTime"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
);
row
.
service_rate
=
system
.
f2y
(
row
.
service_rate
);
row
.
cost_rate
=
system
.
f2y
(
row
.
cost_rate
);
row
.
tax_rate
=
system
.
f2y
(
row
.
tax_rate
);
...
...
@@ -401,7 +401,7 @@ class ObusinessmenService extends ServiceBase {
try
{
await
this
.
dao
.
update
(
_obusinessmen
);
let
res
=
await
this
.
dao
.
getById
(
_obusinessmen
.
id
);
this
.
handleDate
(
res
,
[
"created_at"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
,
0
);
this
.
handleDate
(
res
,
[
"created_at"
,
"reg_date"
,
"tax_reg_day"
,
"updated_at"
],
null
);
return
system
.
getResult
(
res
);
}
catch
(
error
)
{
console
.
log
(
error
);
...
...
xggsve-order/app/base/service/impl/order/oorderSve.js
View file @
353761ec
...
...
@@ -188,7 +188,7 @@ class OorderService extends ServiceBase {
row
.
next_status
=
JSON
.
parse
(
statusObj
.
next_status
||
"[]"
);
row
.
status_name
=
statusObj
.
name
;
this
.
handleDate
(
row
,
[
"created_at"
,
"assign_time"
],
null
,
8
);
this
.
handleDate
(
row
,
[
"created_at"
,
"assign_time"
],
null
);
return
system
.
getResultSuccess
(
row
);
}
...
...
@@ -206,9 +206,9 @@ class OorderService extends ServiceBase {
await
this
.
formateSource
([
order
]);
await
this
.
formateProduct
([
order
]);
this
.
handleDate
(
order
,
[
"created_at"
,
"sign_time"
,
"assign_time"
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
businessmen
,
[
"tax_reg_day"
,
"created_at"
,
'reg_date'
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
orderInfo
,
[
"created_at"
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
order
,
[
"created_at"
,
"sign_time"
,
"assign_time"
],
"YYYY-MM-DD HH:mm:ss"
);
this
.
handleDate
(
businessmen
,
[
"tax_reg_day"
,
"created_at"
,
'reg_date'
],
"YYYY-MM-DD HH:mm:ss"
);
this
.
handleDate
(
orderInfo
,
[
"created_at"
],
"YYYY-MM-DD HH:mm:ss"
);
orderDeliver
.
deliver_divide
=
system
.
f2y
(
orderDeliver
.
deliver_divide
);
orderInfo
.
capital
=
system
.
f2y
(
orderInfo
.
capital
);
...
...
@@ -435,7 +435,7 @@ class OorderService extends ServiceBase {
//格式化状态
// await this.formateStatus(page.rows);
for
(
let
item
of
page
.
rows
)
{
this
.
handleDate
(
item
,
[
"created_at"
,
"sign_time"
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
item
,
[
"created_at"
,
"sign_time"
],
"YYYY-MM-DD HH:mm:ss"
);
}
return
system
.
getResult
(
page
);
...
...
@@ -850,9 +850,9 @@ class OorderService extends ServiceBase {
//格式化产品服务项
await
this
.
formateProduct
(
list
);
for
(
let
element
of
list
){
this
.
handleDate
(
element
,
[
"created_at"
,
"assign_time"
],
null
,
8
);
this
.
handleDate
(
element
.
odeliver
,
[
"created_at"
,
"completed_at"
],
null
,
8
);
this
.
handleDate
(
element
.
obusinessmen
,
[
"created_at"
,
"reg_date"
,
"tax_reg_day"
,
"service_begin_time"
,
"service_end_time"
,
"sign_time"
,
"create_account_time"
],
null
,
8
);
this
.
handleDate
(
element
,
[
"created_at"
,
"assign_time"
],
null
);
this
.
handleDate
(
element
.
odeliver
,
[
"created_at"
,
"completed_at"
],
null
);
this
.
handleDate
(
element
.
obusinessmen
,
[
"created_at"
,
"reg_date"
,
"tax_reg_day"
,
"service_begin_time"
,
"service_end_time"
,
"sign_time"
,
"create_account_time"
],
null
);
if
(
element
.
obusinessmen
.
common_tax_ladder
){
element
.
obusinessmen
.
common_tax_ladder
=
JSON
.
parse
(
element
.
obusinessmen
.
common_tax_ladder
);
}
...
...
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
View file @
353761ec
...
...
@@ -74,7 +74,7 @@ class OorderdeliverService extends ServiceBase {
await
this
.
formateServiceItems
(
rows
);
for
(
var
row
of
rows
)
{
this
.
handleDate
(
row
,
[
"created_at"
,
"completed_at"
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
row
,
[
"created_at"
,
"completed_at"
],
"YYYY-MM-DD HH:mm:ss"
);
}
let
res
=
{
...
...
xggsve-order/app/base/service/impl/saas/saasorderSve.js
View file @
353761ec
...
...
@@ -30,7 +30,7 @@ class SaasOrderService extends ServiceBase {
order
.
bminfo
=
await
this
.
saasorderbminfoDao
.
getById
(
params
.
id
);
order
.
saasOrderDeliverInfo
=
await
this
.
saasorderdeliverinfoDao
.
getById
(
params
.
id
);
this
.
handleDate
(
order
,
[
"created_at"
],
null
,
8
);
this
.
handleDate
(
order
,
[
"created_at"
],
null
);
await
this
.
setOrderStatus
([
order
]);
return
system
.
getResultSuccess
(
order
);
}
...
...
@@ -47,14 +47,14 @@ class SaasOrderService extends ServiceBase {
if
(
!
order
)
{
return
system
.
getResult
(
null
,
"订单不存在"
);
}
this
.
handleDate
(
order
,
[
"created_at"
],
null
,
8
);
this
.
handleDate
(
order
,
[
"created_at"
],
null
);
await
this
.
setOrderStatus
([
order
]);
let
bminfo
=
await
this
.
saasorderbminfoDao
.
getById
(
params
.
id
)
||
{};
let
deliverInfo
=
await
this
.
saasorderdeliverinfoDao
.
getById
(
params
.
id
)
||
{};
let
payList
=
await
this
.
saasorderpayDao
.
findByOrderId
(
params
.
id
)
||
[];
let
payInfo
=
payList
.
length
>
0
?
payList
[
0
]
:
{};
this
.
handleDate
(
payInfo
,
[
"created_at"
],
null
,
8
);
this
.
handleDate
(
payInfo
,
[
"created_at"
],
null
);
let
result
=
{
baseInfo
:
{
...
...
@@ -123,7 +123,7 @@ class SaasOrderService extends ServiceBase {
let
payList
=
await
this
.
saasorderpayDao
.
findByOrderId
(
params
.
id
)
||
[];
let
payInfo
=
payList
.
length
>
0
?
payList
[
0
]
:
{};
this
.
handleDate
(
payInfo
,
[
"created_at"
],
null
,
8
);
this
.
handleDate
(
payInfo
,
[
"created_at"
],
null
);
let
result
=
{
baseInfo
:
{
...
...
@@ -636,7 +636,7 @@ class SaasOrderService extends ServiceBase {
page
.
rows
=
await
this
.
saasorderdeliverinfoDao
.
listByCondition
(
params
);
if
(
page
.
rows
)
{
for
(
var
row
of
page
.
rows
)
{
this
.
handleDate
(
row
,
[
"created_at"
],
null
,
8
);
this
.
handleDate
(
row
,
[
"created_at"
],
null
);
}
}
return
system
.
getResultSuccess
(
page
);
...
...
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
View file @
353761ec
...
...
@@ -40,7 +40,7 @@ class SaasorderbusinessmenService extends ServiceBase {
let
res
=
await
this
.
dao
.
saasorderbusinessmenPage
(
params
);
for
(
let
item
of
res
)
{
this
.
handleDate
(
item
,
[
"created_at"
,
"reg_date"
,
"service_begin_time"
,
"service_end_time"
,
"sign_time"
],
"YYYY-MM-DD HH:mm:ss"
,
8
);
this
.
handleDate
(
item
,
[
"created_at"
,
"reg_date"
,
"service_begin_time"
,
"service_end_time"
,
"sign_time"
],
"YYYY-MM-DD HH:mm:ss"
);
item
.
is_bank_name
=
item
.
is_bank
?
"已开户"
:
"未开户"
;
item
.
common_tax_ladder
=
JSON
.
parse
(
item
.
common_tax_ladder
);
item
.
common_other_ladder
=
JSON
.
parse
(
item
.
common_other_ladder
);
...
...
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