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
2255a40d
Commit
2255a40d
authored
Mar 30, 2020
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
206882e0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
bpo-admin/app/base/service/impl/esettleSve.js
+2
-2
bpo-admin/app/base/service/impl/esettleofflineSve.js
+2
-2
bpo-admin/app/config/localsettings.js
+1
-1
No files found.
bpo-admin/app/base/service/impl/esettleSve.js
View file @
2255a40d
...
...
@@ -912,8 +912,8 @@ class EsettleService extends ServiceBase {
sql
.
push
(
"id, deduct_amt "
);
sql
.
push
(
"FROM `tbl_order` "
);
sql
.
push
(
"WHERE busi_id = :busiId"
);
sql
.
push
(
"AND
pay_comple
te_time >= :begin"
);
sql
.
push
(
"AND
pay_comple
te_time <= :end"
);
sql
.
push
(
"AND
crea
te_time >= :begin"
);
sql
.
push
(
"AND
crea
te_time <= :end"
);
var
list
=
await
this
.
settledb
.
query
(
sql
.
join
(
" "
),
{
replacements
:
{
busiId
:
busiId
,
begin
:
begin
,
end
:
end
}
});
if
(
list
&&
list
.
length
>
0
)
{
...
...
bpo-admin/app/base/service/impl/esettleofflineSve.js
View file @
2255a40d
...
...
@@ -357,8 +357,8 @@ class EsettleofflineService extends ServiceBase {
sql
.
push
(
"id, amt as deduct_amt"
);
sql
.
push
(
"FROM `c_esettle_offline` "
);
sql
.
push
(
"WHERE ecompany_id = :companyId"
);
sql
.
push
(
"AND
pay_time
>= :begin"
);
sql
.
push
(
"AND
pay_time
<= :end"
);
sql
.
push
(
"AND
created_at
>= :begin"
);
sql
.
push
(
"AND
created_at
<= :end"
);
return
await
this
.
dao
.
customQuery
(
sql
.
join
(
" "
),
{
companyId
:
companyId
,
begin
:
begin
,
end
:
end
})
||
[];
}
...
...
bpo-admin/app/config/localsettings.js
View file @
2255a40d
...
...
@@ -3,7 +3,7 @@ var settings = {
host
:
"43.247.184.32"
,
port
:
8967
,
password
:
"Gongsibao2018"
,
db
:
1
2
,
db
:
1
1
,
},
database
:
{
// dbname : "bpo",
...
...
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