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
4c409c10
Commit
4c409c10
authored
Jul 08, 2020
by
zhaoxiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsb
parent
cffe9c82
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
4 deletions
+39
-4
bpo-admin/app/base/api/impl/channelApi.js
+0
-0
bpo-admin/app/base/db/impl/busistatDao.js
+20
-0
bpo-admin/app/base/service/impl/busistatSve.js
+6
-0
bpo-admin/app/base/service/impl/channelSve.js
+9
-1
bpo-admin/app/config/localsettings.js
+1
-1
bpo-admin/app/config/settings.js
+3
-2
No files found.
bpo-admin/app/base/api/impl/channelApi.js
View file @
4c409c10
This diff is collapsed.
Click to expand it.
bpo-admin/app/base/db/impl/busistatDao.js
View file @
4c409c10
...
...
@@ -63,6 +63,26 @@ class BusistatDao extends Dao {
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
params
);
}
async
gettomonthList
(
param
){
let
sql
=
[];
sql
.
push
(
"SELECT"
);
sql
.
push
(
"*"
);
sql
.
push
(
"FROM `c_busi_stat`"
);
sql
.
push
(
"WHERE 1 = 1"
);
if
(
param
.
busiId
){
sql
.
push
(
"AND busi_id IN (:busiId)"
);
}
if
(
param
.
begin
)
{
sql
.
push
(
"AND stat_day >= :begin"
);
}
if
(
param
.
end
)
{
sql
.
push
(
"AND stat_day <= :end"
);
}
return
await
this
.
customQuery
(
sql
.
join
(
" "
),
param
);
}
async
setCondition
(
sql
,
params
)
{
if
(
!
sql
||
!
params
)
{
return
;
...
...
bpo-admin/app/base/service/impl/busistatSve.js
View file @
4c409c10
...
...
@@ -50,6 +50,12 @@ class BusistatService extends ServiceBase {
item
.
added_value_tax
=
system
.
f2y
(
item
.
added_value_tax
);
}
}
async
gettomonthList
(
busiId
,
begin
,
end
)
{
return
await
this
.
dao
.
gettomonthList
({
busiId
:
busiId
,
begin
:
begin
,
end
:
end
});
}
}
module
.
exports
=
BusistatService
;
bpo-admin/app/base/service/impl/channelSve.js
View file @
4c409c10
...
...
@@ -39,7 +39,10 @@ class ChannelService extends microService {
}
async
bindPlatform
(
params
){
return
await
this
.
callms
(
"channel"
,
"bindPlatform"
,
params
);
}
async
getchannelIds
(
params
){
return
await
this
.
callms
(
"channel"
,
"channelIds"
,
params
);
}
async
pushbindingchannel
(
params
){
...
...
@@ -50,6 +53,9 @@ class ChannelService extends microService {
async
merchantInfo
(
params
)
{
return
await
this
.
callms
(
"channel"
,
"merchantInfo"
,
params
);
}
async
getchannelmerchantIds
(
params
)
{
return
await
this
.
callms
(
"channel"
,
"getchannelmerchantIds"
,
params
);
}
async
merchantSave
(
params
)
{
return
await
this
.
callms
(
"channel"
,
"merchantSave"
,
params
);
}
...
...
@@ -63,5 +69,7 @@ class ChannelService extends microService {
async
getPushMerchantIds
(
params
){
return
await
this
.
callms
(
"channel"
,
"getPushMerchantIds"
,
params
);
}
}
module
.
exports
=
ChannelService
;
bpo-admin/app/config/localsettings.js
View file @
4c409c10
...
...
@@ -9,7 +9,7 @@ var settings = {
// dbname : "bpo",
// user : "write",
// password : "write",
dbname
:
"bpo
2
"
,
dbname
:
"bpo"
,
user
:
"write"
,
password
:
"write"
,
config
:
{
...
...
bpo-admin/app/config/settings.js
View file @
4c409c10
...
...
@@ -36,6 +36,7 @@ var settings = {
v
:
"crkyej0xlmqa6bmvqijun6ltxparllyn"
,
productId
:
"5e6b02cc3290c3000a3a63dc"
,
// 云服产品id
pushOrderApi
:
"http://yunfuapi-dev.gongsibao.com/crm/order/submit"
,
// 云服产品id
pushOrderSum
:
"http://yunfuapi-dev.gongsibao.com/cloudapi/bpo/pushBill"
,
};
}
else
{
return
{
...
...
@@ -43,6 +44,7 @@ var settings = {
v
:
"e5e2ytnn6nrkr9qnqk4w5e6z0xlhkznu"
,
productId
:
"5e6c89d54c52bf000a750bc5"
,
// 云服产品id (生产环境)
pushOrderApi
:
"http://yunfuapi.gongsibao.com/crm/order/submit"
,
// 云服产品id (生产环境)
pushOrderSum
:
"http://yunfuapi.gongsibao.com/cloudapi/bpo/pushBill"
,
};
}
},
...
...
@@ -187,4 +189,4 @@ var settings = {
}
};
settings
.
ENVINPUT
=
ENVINPUT
;
module
.
exports
=
settings
;
\ No newline at end of file
module
.
exports
=
settings
;
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