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
8a0797f2
Commit
8a0797f2
authored
Jan 09, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dd
parent
a7eb3b4a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
17 deletions
+8
-17
xggsve-order/app/base/db/impl/order/oorderDao.js
+1
-4
xggsve-order/app/base/db/impl/order/oorderdeliverDao.js
+2
-2
xggsve-order/app/base/service/impl/order/oorderSve.js
+1
-1
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
+2
-2
xggsve-order/app/base/service/impl/order/paymentSve.js
+2
-8
No files found.
xggsve-order/app/base/db/impl/order/oorderDao.js
View file @
8a0797f2
...
@@ -24,7 +24,7 @@ class OorderDao extends Dao {
...
@@ -24,7 +24,7 @@ class OorderDao extends Dao {
let
sql
=
[];
let
sql
=
[];
sql
.
push
(
`SELECT * FROM o_order WHERE 1=1 `
);
sql
.
push
(
`SELECT * FROM o_order WHERE 1=1 `
);
this
.
setOrderCount
(
sql
,
params
);
this
.
setOrderCount
(
sql
,
params
);
sql
.
push
(
`limit
${
params
.
currentPage
}
,
${
params
.
pageSize
}
`
);
sql
.
push
(
`limit
${
params
.
startRow
}
,
${
params
.
pageSize
}
`
);
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
}
}
...
@@ -49,9 +49,6 @@ class OorderDao extends Dao {
...
@@ -49,9 +49,6 @@ class OorderDao extends Dao {
if
(
params
.
end
)
{
if
(
params
.
end
)
{
sql
.
push
(
`AND created_at <= :end`
);
sql
.
push
(
`AND created_at <= :end`
);
}
}
if
(
params
.
deliver_id
)
{
sql
.
push
(
`AND deliver_id = :deliver_id`
);
}
}
}
}
}
...
...
xggsve-order/app/base/db/impl/order/oorderdeliverDao.js
View file @
8a0797f2
...
@@ -14,7 +14,7 @@ class OorderdeliverDao extends Dao {
...
@@ -14,7 +14,7 @@ class OorderdeliverDao extends Dao {
return
[];
return
[];
}
}
let
sql
=
[];
let
sql
=
[];
sql
.
push
(
`SELECT * FROM o_order_deliver WHERE id in (:deliverIdList)`
);
sql
.
push
(
`SELECT * FROM o_order_deliver WHERE
deliver_
id in (:deliverIdList)`
);
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
{
deliverIdList
:
ids
});
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
{
deliverIdList
:
ids
});
}
}
...
@@ -23,7 +23,7 @@ class OorderdeliverDao extends Dao {
...
@@ -23,7 +23,7 @@ class OorderdeliverDao extends Dao {
let
list
=
await
this
.
listByIds
(
params
);
let
list
=
await
this
.
listByIds
(
params
);
var
result
=
{};
var
result
=
{};
for
(
let
item
of
list
)
{
for
(
let
item
of
list
)
{
result
[
item
.
id
]
=
item
;
result
[
item
.
deliver_
id
]
=
item
;
}
}
return
result
;
return
result
;
}
}
...
...
xggsve-order/app/base/service/impl/order/oorderSve.js
View file @
8a0797f2
...
@@ -396,7 +396,7 @@ class OorderService extends ServiceBase {
...
@@ -396,7 +396,7 @@ class OorderService extends ServiceBase {
//更新oorder订单记录
//更新oorder订单记录
await
self
.
dao
.
update
({
await
self
.
dao
.
update
({
deliver_id
:
self
.
trim
(
self
.
deliver_id
),
deliver_id
:
self
.
trim
(
params
.
deliver_id
),
id
:
self
.
trim
(
params
.
id
),
id
:
self
.
trim
(
params
.
id
),
status
:
self
.
trim
(
params
.
status
)
status
:
self
.
trim
(
params
.
status
)
},
t
);
},
t
);
...
...
xggsve-order/app/base/service/impl/order/oorderdeliverSve.js
View file @
8a0797f2
...
@@ -50,7 +50,7 @@ class OorderdeliverService extends ServiceBase {
...
@@ -50,7 +50,7 @@ class OorderdeliverService extends ServiceBase {
if
(
count
==
0
){
if
(
count
==
0
){
return
system
.
getResult
({
count
:
0
,
rows
:[]});
return
system
.
getResult
({
count
:
0
,
rows
:[]});
}
}
let
rows
=
await
this
.
d
ao
.
findAll
(
where
);
let
rows
=
await
this
.
oorderD
ao
.
findAll
(
where
);
//格式化交付商
//格式化交付商
await
this
.
formateDeliver
(
rows
);
await
this
.
formateDeliver
(
rows
);
//格式化订单状态
//格式化订单状态
...
@@ -78,7 +78,7 @@ class OorderdeliverService extends ServiceBase {
...
@@ -78,7 +78,7 @@ class OorderdeliverService extends ServiceBase {
}
}
let
deliverMap
=
await
this
.
dao
.
mapByIds
(
deliverIdList
);
let
deliverMap
=
await
this
.
dao
.
mapByIds
(
deliverIdList
);
for
(
let
item
of
deliverMap
)
{
for
(
let
item
of
orderList
)
{
item
.
odeliver
=
deliverMap
[
item
.
deliver_id
]
||
{}
item
.
odeliver
=
deliverMap
[
item
.
deliver_id
]
||
{}
}
}
}
}
...
...
xggsve-order/app/base/service/impl/order/paymentSve.js
View file @
8a0797f2
...
@@ -9,10 +9,4 @@ class PaymentService extends ServiceBase {
...
@@ -9,10 +9,4 @@ class PaymentService extends ServiceBase {
}
}
}
}
module
.
exports
=
PaymentService
;
module
.
exports
=
PaymentService
;
// var task=new UserService();
\ No newline at end of file
// task.getUserStatisticGroupByApp().then(function(result){
// console.log((result));
// }).catch(function(e){
// console.log(e);
// });
\ No newline at end of file
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