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
eeac30b3
Commit
eeac30b3
authored
Jun 04, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
69afca5c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
13 deletions
+21
-13
fqboss/app/base/api/impl/channelreceiveApi.js
+21
-13
No files found.
fqboss/app/base/api/impl/channelreceiveApi.js
View file @
eeac30b3
...
@@ -4,6 +4,7 @@ const querystring = require('querystring');
...
@@ -4,6 +4,7 @@ const querystring = require('querystring');
const
md5
=
require
(
"MD5"
);
const
md5
=
require
(
"MD5"
);
const
uuidv4
=
require
(
'uuid/v4'
);
const
uuidv4
=
require
(
'uuid/v4'
);
var
settings
=
require
(
"../../../config/settings"
);
var
settings
=
require
(
"../../../config/settings"
);
const
logCtl
=
system
.
getObject
(
"web.oplogCtl"
);
/**
/**
* 接收渠道提报数据
* 接收渠道提报数据
* 2020.03.04
* 2020.03.04
...
@@ -36,7 +37,7 @@ class ChannelReceiveApi {
...
@@ -36,7 +37,7 @@ class ChannelReceiveApi {
}
}
return
uuid
.
join
(
''
);
return
uuid
.
join
(
''
);
}
}
async
checkAndLogin
(
userInfo
,
appInfo
)
{
async
checkAndLogin
(
userInfo
,
appInfo
)
{
if
(
!
userInfo
||
!
userInfo
.
channel_userid
)
{
if
(
!
userInfo
||
!
userInfo
.
channel_userid
)
{
return
{
code
:
-
1
,
msg
:
"未知渠道用户"
};
return
{
code
:
-
1
,
msg
:
"未知渠道用户"
};
}
}
...
@@ -52,10 +53,10 @@ class ChannelReceiveApi {
...
@@ -52,10 +53,10 @@ class ChannelReceiveApi {
}
}
var
openid
=
appInfo
.
app_code
+
"_"
+
userInfo
.
channel_userid
;
var
openid
=
appInfo
.
app_code
+
"_"
+
userInfo
.
channel_userid
;
var
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
var
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
where
:{
where
:
{
openid
:
openid
,
app_id
:
app
.
id
openid
:
openid
,
app_id
:
app
.
id
},
},
raw
:
true
raw
:
true
});
});
if
(
!
user
)
{
if
(
!
user
)
{
var
name
=
await
this
.
getUidStr
(
8
,
62
);
var
name
=
await
this
.
getUidStr
(
8
,
62
);
...
@@ -74,10 +75,10 @@ class ChannelReceiveApi {
...
@@ -74,10 +75,10 @@ class ChannelReceiveApi {
await
this
.
userSve
.
loginWithoutGift
(
user
);
await
this
.
userSve
.
loginWithoutGift
(
user
);
// user = await this.userSve.getUserByOpenId(openid, "2e787bbaacda4c6488b9fae58fff30ba");
// user = await this.userSve.getUserByOpenId(openid, "2e787bbaacda4c6488b9fae58fff30ba");
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
where
:{
where
:
{
openid
:
openid
,
app_id
:
app
.
id
openid
:
openid
,
app_id
:
app
.
id
},
},
raw
:
true
raw
:
true
});
});
}
}
return
{
code
:
1
,
data
:
user
};
return
{
code
:
1
,
data
:
user
};
...
@@ -85,6 +86,13 @@ class ChannelReceiveApi {
...
@@ -85,6 +86,13 @@ class ChannelReceiveApi {
//商标自动提报(渠道)
//商标自动提报(渠道)
async
createChannelOrder
(
pobj
,
obj
)
{
async
createChannelOrder
(
pobj
,
obj
)
{
//日志记录
logCtl
.
info
({
optitle
:
"接收渠道推送过来的订单信息"
,
op
:
"/api/channelreceiveApi/createChannelOrder"
,
content
:
JSON
.
stringify
(
obj
),
clientIp
:
""
});
var
userInfo
=
obj
.
userInfo
;
var
userInfo
=
obj
.
userInfo
;
var
appInfo
=
obj
.
appInfo
;
var
appInfo
=
obj
.
appInfo
;
if
(
!
appInfo
||
!
appInfo
.
app_code
)
{
if
(
!
appInfo
||
!
appInfo
.
app_code
)
{
...
@@ -117,7 +125,7 @@ class ChannelReceiveApi {
...
@@ -117,7 +125,7 @@ class ChannelReceiveApi {
return
{
code
:
-
200
,
msg
:
"操作失败"
,
err
:
e
.
stack
};
return
{
code
:
-
200
,
msg
:
"操作失败"
,
err
:
e
.
stack
};
}
}
}
}
async
getUserInfo
(
userInfo
,
appInfo
,
app
)
{
async
getUserInfo
(
userInfo
,
appInfo
,
app
)
{
if
(
!
userInfo
||
!
userInfo
.
channel_userid
)
{
if
(
!
userInfo
||
!
userInfo
.
channel_userid
)
{
return
{
code
:
-
1
,
msg
:
"未知渠道用户"
};
return
{
code
:
-
1
,
msg
:
"未知渠道用户"
};
}
}
...
@@ -129,10 +137,10 @@ class ChannelReceiveApi {
...
@@ -129,10 +137,10 @@ class ChannelReceiveApi {
return
{
code
:
-
100
,
msg
:
"未知应用"
};
return
{
code
:
-
100
,
msg
:
"未知应用"
};
}
}
var
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
var
user
=
await
this
.
userSve
.
dao
.
model
.
findOne
({
where
:{
where
:
{
openid
:
openid
,
app_id
:
app
.
id
openid
:
openid
,
app_id
:
app
.
id
},
},
raw
:
true
raw
:
true
});
});
return
user
;
return
user
;
};
};
...
@@ -159,7 +167,7 @@ class ChannelReceiveApi {
...
@@ -159,7 +167,7 @@ class ChannelReceiveApi {
}
else
{
}
else
{
return
{
code
:
-
101
,
msg
:
"未知渠道"
};
return
{
code
:
-
101
,
msg
:
"未知渠道"
};
}
}
var
user
=
await
this
.
getUserInfo
(
userInfo
,
appInfo
,
app
);
var
user
=
await
this
.
getUserInfo
(
userInfo
,
appInfo
,
app
);
if
(
user
)
{
if
(
user
)
{
obj
[
"user"
]
=
user
;
obj
[
"user"
]
=
user
;
}
else
{
}
else
{
...
@@ -193,7 +201,7 @@ class ChannelReceiveApi {
...
@@ -193,7 +201,7 @@ class ChannelReceiveApi {
}
else
{
}
else
{
return
{
code
:
-
101
,
msg
:
"未知渠道"
};
return
{
code
:
-
101
,
msg
:
"未知渠道"
};
}
}
var
user
=
await
this
.
getUserInfo
(
userInfo
,
appInfo
,
app
);
var
user
=
await
this
.
getUserInfo
(
userInfo
,
appInfo
,
app
);
if
(
user
)
{
if
(
user
)
{
obj
[
"user"
]
=
user
;
obj
[
"user"
]
=
user
;
}
else
{
}
else
{
...
...
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