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
97f621a6
Commit
97f621a6
authored
Jan 09, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
a6560128
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
5 deletions
+29
-5
xggsve-order/app/base/db/impl/order/oorderprocessDao.js
+27
-3
xggsve-order/app/base/service/impl/order/oorderSve.js
+2
-2
No files found.
xggsve-order/app/base/db/impl/order/oorderprocessDao.js
View file @
97f621a6
const
system
=
require
(
"../../../system"
);
const
system
=
require
(
"../../../system"
);
const
Dao
=
require
(
"../../dao.base"
);
const
Dao
=
require
(
"../../dao.base"
);
class
OorderprocessDao
extends
Dao
{
class
OorderprocessDao
extends
Dao
{
constructor
()
{
constructor
()
{
super
(
Dao
.
getModelName
(
OorderprocessDao
));
super
(
Dao
.
getModelName
(
OorderprocessDao
));
}
}
async
mapByOrderIdsAndStatus
(
orderIds
,
statuses
)
{
async
findByOrderIdAndStatus
(
orderId
,
status
)
{
if
(
!
orderId
||
!
status
)
{
return
null
;
}
let
sql
=
[];
sql
.
push
(
"SELECT"
);
sql
.
push
(
"*"
);
sql
.
push
(
"FROM `o_order_process`"
);
sql
.
push
(
"WHERE order_id = :orderId"
);
sql
.
push
(
"AND `status` = :status"
);
let
list
=
await
this
.
customQuery
(
sql
.
join
(
" "
),
{
orderId
:
orderId
,
status
:
status
});
if
(
!
list
||
list
.
length
==
0
)
{
return
null
;
}
return
list
[
0
];
}
async
listByOrderIdsAndStatus
(
orderIds
,
statuses
)
{
var
result
=
{};
var
result
=
{};
if
(
!
orderIds
||
orderIds
.
length
==
0
||
!
statuses
||
statuses
.
length
==
0
)
{
if
(
!
orderIds
||
orderIds
.
length
==
0
||
!
statuses
||
statuses
.
length
==
0
)
{
return
result
;
return
result
;
}
}
let
sql
=
[];
let
sql
=
[];
...
@@ -17,8 +36,12 @@ class OorderprocessDao extends Dao {
...
@@ -17,8 +36,12 @@ class OorderprocessDao extends Dao {
sql
.
push
(
"WHERE order_id IN (:orderIds)"
);
sql
.
push
(
"WHERE order_id IN (:orderIds)"
);
sql
.
push
(
"AND `status` IN (:statuses)"
);
sql
.
push
(
"AND `status` IN (:statuses)"
);
let
list
=
await
this
.
customQuery
(
sql
.
join
(
" "
),
{
orderIds
:
orderIds
,
statuses
:
statuses
});
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
{
orderIds
:
orderIds
,
statuses
:
statuses
});
}
async
mapByOrderIdsAndStatus
(
orderIds
,
statuses
)
{
var
result
=
{};
let
list
=
await
this
.
listByOrderIdsAndStatus
(
orderIds
,
statuses
);
if
(
!
list
||
list
.
length
==
0
)
{
if
(
!
list
||
list
.
length
==
0
)
{
return
result
;
return
result
;
}
}
...
@@ -29,4 +52,5 @@ class OorderprocessDao extends Dao {
...
@@ -29,4 +52,5 @@ class OorderprocessDao extends Dao {
return
result
;
return
result
;
}
}
}
}
module
.
exports
=
OorderprocessDao
;
module
.
exports
=
OorderprocessDao
;
xggsve-order/app/base/service/impl/order/oorderSve.js
View file @
97f621a6
...
@@ -369,7 +369,7 @@ class OorderService extends ServiceBase {
...
@@ -369,7 +369,7 @@ class OorderService extends ServiceBase {
* @deliver_id String 交付商ID
* @deliver_id String 交付商ID
* @deliver_name String 交付商名称
* @deliver_name String 交付商名称
* @deliver_deliver String 交付商分成
* @deliver_deliver String 交付商分成
* @status String 下一个状态码
* @status String 下一个状态码
*/
*/
async
assignDeliver
(
params
)
{
async
assignDeliver
(
params
)
{
//参数验证
//参数验证
...
@@ -409,7 +409,7 @@ class OorderService extends ServiceBase {
...
@@ -409,7 +409,7 @@ class OorderService extends ServiceBase {
}
}
}
}
}
}
...
...
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