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
afe1214a
Commit
afe1214a
authored
Jun 03, 2020
by
孙亚楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d
parent
65742cde
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
4 deletions
+47
-4
xggsve-order/app/base/api/impl/op/action.js
+3
-3
xggsve-order/app/base/db/impl/saas/saasorderDao.js
+4
-0
xggsve-order/app/base/db/impl/saas/saasorderbusinessmenDao.js
+18
-0
xggsve-order/app/base/service/impl/saas/saasorderSve.js
+1
-1
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
+21
-0
No files found.
xggsve-order/app/base/api/impl/op/action.js
View file @
afe1214a
...
@@ -197,9 +197,9 @@ class ActionAPI extends APIBase {
...
@@ -197,9 +197,9 @@ class ActionAPI extends APIBase {
case
"saasorderbusinessmenPage"
:
// 订单信息
case
"saasorderbusinessmenPage"
:
// 订单信息
opResult
=
await
this
.
saasorderbusinessmenSve
.
saasorderbusinessmenPage
(
action_body
);
opResult
=
await
this
.
saasorderbusinessmenSve
.
saasorderbusinessmenPage
(
action_body
);
break
;
break
;
// case "queryBusinessmenByMerchantId": //根据商户ID,SAAS_ID查询所有的个体户
case
"businessmenByOrderIds"
:
// 根据订单IDS查询个体户记录
// opResult = await this.saasorderbusinessmenSve.queryBusinessmenByMerchantId
(action_body);
opResult
=
await
this
.
saasorderbusinessmenSve
.
businessmenByOrderIds
(
action_body
);
//
break;
break
;
case
"assorderBusinessmenInfo"
:
// 订单信息
case
"assorderBusinessmenInfo"
:
// 订单信息
opResult
=
await
this
.
saasorderbusinessmenSve
.
assorderBusinessmenInfo
(
action_body
);
opResult
=
await
this
.
saasorderbusinessmenSve
.
assorderBusinessmenInfo
(
action_body
);
break
;
break
;
...
...
xggsve-order/app/base/db/impl/saas/saasorderDao.js
View file @
afe1214a
...
@@ -59,6 +59,10 @@ class SaasOrderDao extends Dao {
...
@@ -59,6 +59,10 @@ class SaasOrderDao extends Dao {
sql
.
push
(
"AND t1.merchant_id = :merchant_id"
);
sql
.
push
(
"AND t1.merchant_id = :merchant_id"
);
}
}
if
(
params
.
channel_id
)
{
sql
.
push
(
"AND t1.channel_id = :channel_id"
);
}
if
(
params
.
pay_status
)
{
if
(
params
.
pay_status
)
{
sql
.
push
(
"AND t1.pay_status = :pay_status"
);
sql
.
push
(
"AND t1.pay_status = :pay_status"
);
}
}
...
...
xggsve-order/app/base/db/impl/saas/saasorderbusinessmenDao.js
View file @
afe1214a
...
@@ -99,6 +99,24 @@ class SaasorderbusinessmenDao extends Dao {
...
@@ -99,6 +99,24 @@ class SaasorderbusinessmenDao extends Dao {
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
}
}
/**
* 根据order_id 查个体户信息
* @param ids
* @returns {Promise<void>}
*/
async
getByOrderIds
(
ids
){
if
(
!
ids
||
ids
.
length
==
0
){
return
{};
}
let
sql
=
`select * from saas_order_businessmen where 1=1 and id in (:ids)`
;
let
list
=
await
this
.
customQuery
(
sql
,
{
ids
:
ids
});
let
map
=
{};
for
(
let
item
of
list
)
{
map
[
item
.
id
]
=
item
;
}
return
map
;
}
}
}
module
.
exports
=
SaasorderbusinessmenDao
;
module
.
exports
=
SaasorderbusinessmenDao
;
xggsve-order/app/base/service/impl/saas/saasorderSve.js
View file @
afe1214a
...
@@ -331,7 +331,7 @@ class SaasOrderService extends ServiceBase {
...
@@ -331,7 +331,7 @@ class SaasOrderService extends ServiceBase {
page
.
rows
=
await
this
.
dao
.
listByCondition
(
params
);
page
.
rows
=
await
this
.
dao
.
listByCondition
(
params
);
if
(
page
.
rows
)
{
if
(
page
.
rows
)
{
for
(
var
row
of
page
.
rows
)
{
for
(
var
row
of
page
.
rows
)
{
this
.
handleDate
(
row
,
[
"created_at"
],
null
);
this
.
handleDate
(
row
,
[
"created_at"
,
],
null
);
}
}
await
this
.
setBminfo
(
page
.
rows
);
await
this
.
setBminfo
(
page
.
rows
);
...
...
xggsve-order/app/base/service/impl/saas/saasorderbusinessmenSve.js
View file @
afe1214a
...
@@ -91,6 +91,27 @@ class SaasorderbusinessmenService extends ServiceBase {
...
@@ -91,6 +91,27 @@ class SaasorderbusinessmenService extends ServiceBase {
return
system
.
getResult
(
null
,
`系统错误`
);
return
system
.
getResult
(
null
,
`系统错误`
);
}
}
}
}
/**
* fn:根据订单IDS查询个体户(多个查询)
* @param params
* @returns {Promise<void>}
*/
async
businessmenByOrderIds
(
params
){
if
(
!
params
.
order_ids
||
params
.
order_ids
.
length
<=
0
){
return
system
.
getResult
({});
}
try
{
let
res
=
await
this
.
dao
.
getByOrderIds
(
params
.
order_ids
);
for
(
let
key
in
res
)
{
this
.
handleDate
(
res
[
key
],
[
"created_at"
,
"reg_date"
,
"service_begin_time"
,
"service_end_time"
,
"sign_time"
,
"tax_reg_day"
],
"YYYY-MM-DD HH:mm:ss"
);
}
return
system
.
getResult
(
res
);
}
catch
(
e
)
{
console
.
log
(
e
);
return
system
.
getResult
(
null
,
`系统错误`
);
}
}
}
}
...
...
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