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
5d2f97a7
Commit
5d2f97a7
authored
May 11, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dd
parent
f808846b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
9 deletions
+42
-9
xggsve-order/app/base/api/impl/op/action.js
+3
-0
xggsve-order/app/base/db/impl/saas/saasorderbusinessmenDao.js
+9
-2
xggsve-order/app/base/service/impl/saas/saasorderSve.js
+1
-0
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
+29
-7
No files found.
xggsve-order/app/base/api/impl/op/action.js
View file @
5d2f97a7
...
...
@@ -197,6 +197,9 @@ class ActionAPI extends APIBase {
case
"saasorderbusinessmenPage"
:
// 订单信息
opResult
=
await
this
.
saasorderbusinessmenSve
.
saasorderbusinessmenPage
(
action_body
);
break
;
case
"assorderBusinessmenInfo"
:
// 订单信息
opResult
=
await
this
.
saasorderbusinessmenSve
.
assorderBusinessmenInfo
(
action_body
);
break
;
//******************************************************************** */
...
...
xggsve-order/app/base/db/impl/saas/saasorderbusinessmenDao.js
View file @
5d2f97a7
...
...
@@ -66,6 +66,12 @@ class SaasorderbusinessmenDao extends Dao {
if
(
params
.
merchant_id
)
{
sql
.
push
(
`AND merchant_id = :merchant_id `
);
}
if
(
params
.
merchant_app_user_id
)
{
sql
.
push
(
`AND merchant_app_user_id = :merchant_app_user_id `
);
}
if
(
params
.
merchant_id
)
{
sql
.
push
(
`AND merchant_id = :merchant_id `
);
}
}
...
...
@@ -82,5 +88,7 @@ class SaasorderbusinessmenDao extends Dao {
sql
.
push
(
`limit
${
params
.
startRow
}
,
${
params
.
pageSize
}
`
);
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
}
}
module
.
exports
=
SaasorderbusinessmenDao
;
\ No newline at end of file
module
.
exports
=
SaasorderbusinessmenDao
;
xggsve-order/app/base/service/impl/saas/saasorderSve.js
View file @
5d2f97a7
...
...
@@ -237,6 +237,7 @@ class SaasOrderService extends ServiceBase {
saasorderbusinessmen
.
merchant_id
=
order
.
merchant_id
;
saasorderbusinessmen
.
product_id
=
order
.
product_id
;
saasorderbusinessmen
.
saas_order_id
=
order
.
saas_order_id
;
saasorderbusinessmen
.
merchant_app_user_id
=
order
.
merchant_app_user_id
||
""
;
await
this
.
saasorderbusinessmenDao
.
create
(
saasorderbusinessmen
);
}
return
system
.
getResultSuccess
();
...
...
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
View file @
5d2f97a7
...
...
@@ -17,7 +17,7 @@ class SaasorderbusinessmenService extends ServiceBase {
* @param params
* @returns {Promise<{msg: *, data, bizmsg: *|string, status: number}>}
*/
async
saasorderbusinessmenPage
(
params
){
async
saasorderbusinessmenPage
(
params
)
{
let
where
=
{};
if
(
params
.
credit_code
)
{
where
.
credit_code
=
this
.
trim
(
params
.
credit_code
);
...
...
@@ -33,9 +33,9 @@ class SaasorderbusinessmenService extends ServiceBase {
params
.
startRow
=
(
params
.
currentPage
-
1
)
*
params
.
pageSize
;
try
{
let
countRes
=
await
this
.
dao
.
saasorderbusinessmenCount
(
params
);
if
(
countRes
.
count
==
0
)
{
return
system
.
getResult
({
count
:
0
,
rows
:
[]});
let
countRes
=
await
this
.
dao
.
saasorderbusinessmenCount
(
params
);
if
(
countRes
.
count
==
0
)
{
return
system
.
getResult
({
count
:
0
,
rows
:
[]});
}
let
res
=
await
this
.
dao
.
saasorderbusinessmenPage
(
params
);
...
...
@@ -47,14 +47,35 @@ class SaasorderbusinessmenService extends ServiceBase {
item
.
special_tax_ladder
=
JSON
.
parse
(
item
.
special_tax_ladder
);
item
.
special_other_ladder
=
JSON
.
parse
(
item
.
special_other_ladder
);
}
return
system
.
getResult
({
count
:
countRes
.
count
,
rows
:
res
});
}
catch
(
e
)
{
return
system
.
getResult
({
count
:
countRes
.
count
,
rows
:
res
});
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResult
(
nul
,
`系统错误`
);
}
}
/**
* 获取个体户信息
* @param params
* @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>}
*/
async
assorderBusinessmenInfo
(
params
){
try
{
let
res
=
await
this
.
dao
.
model
.
findAll
({
where
:{
merchant_app_user_id
:
this
.
trim
(
params
.
merchant_app_user_id
),
merchant_id
:
this
.
trim
(
params
.
merchant_id
)
},
attributes
:
params
.
attrs
});
return
system
.
getResult
(
res
||
[]);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResult
(
null
,
`系统错误`
);
}
}
}
module
.
exports
=
SaasorderbusinessmenService
;
\ 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