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
314204db
Commit
314204db
authored
Feb 23, 2020
by
宋毅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tj
parent
a7e9c6b1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
+1
-1
igirl-channel-web/app/config/routes/web.js
+6
-1
No files found.
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
View file @
314204db
...
@@ -571,7 +571,7 @@ class tmqueryCtl extends CtlBase {
...
@@ -571,7 +571,7 @@ class tmqueryCtl extends CtlBase {
if
([
"FW_GOODS-582206-1"
,
"FW_GOODS-582208-1"
,
"FW_GOODS-582207-1"
].
indexOf
(
pushData
.
skuId
)
>=
0
)
{
if
([
"FW_GOODS-582206-1"
,
"FW_GOODS-582208-1"
,
"FW_GOODS-582207-1"
].
indexOf
(
pushData
.
skuId
)
>=
0
)
{
param
.
actionType
=
pushData
.
skuId
==
"FW_GOODS-582206-1"
?
"updateOrderPayStatus"
:
"addOrderAndDelivery"
;
param
.
actionType
=
pushData
.
skuId
==
"FW_GOODS-582206-1"
?
"updateOrderPayStatus"
:
"addOrderAndDelivery"
;
}
//商标的产品订单
}
//商标的产品订单
else
{
else
{
param
.
actionBody
.
channelItemCode
=
pushData
.
serviceCode
;
param
.
actionBody
.
channelItemCode
=
pushData
.
serviceCode
;
param
.
actionType
=
"jdAddQifuOrder"
;
param
.
actionType
=
"jdAddQifuOrder"
;
}
//工商产品订单
}
//工商产品订单
...
...
igirl-channel-web/app/config/routes/web.js
View file @
314204db
...
@@ -40,7 +40,8 @@ module.exports = function (app) {
...
@@ -40,7 +40,8 @@ module.exports = function (app) {
});
});
app
.
get
(
"/jd/orderNotify"
,
async
function
(
req
,
res
)
{
app
.
get
(
"/jd/orderNotify"
,
async
function
(
req
,
res
)
{
req
.
query
.
actionProcess
=
"jd"
;
req
.
query
.
actionProcess
=
"jd"
;
var
result
=
await
tmqueryCtl
.
pushJdPayOrder
(
req
.
query
,
req
);
var
pushData
=
req
.
query
;
var
result
=
await
tmqueryCtl
.
pushJdPayOrder
(
pushData
,
req
);
if
(
result
.
status
!=
0
)
{
if
(
result
.
status
!=
0
)
{
res
.
end
(
JSON
.
stringify
(
result
));
res
.
end
(
JSON
.
stringify
(
result
));
return
;
return
;
...
@@ -53,6 +54,10 @@ module.exports = function (app) {
...
@@ -53,6 +54,10 @@ module.exports = function (app) {
adminUrl
:
"https://tm.plus.jdcloud.com"
adminUrl
:
"https://tm.plus.jdcloud.com"
}
}
};
};
if
([
"FW_GOODS-582206-1"
,
"FW_GOODS-582208-1"
,
"FW_GOODS-582207-1"
].
indexOf
(
pushData
.
skuId
)
<
0
)
{
params
.
appInfo
.
authUrl
=
"https://gs.plus.jdcloud.com/jd/skipPage?channelUserId="
+
req
.
query
.
jdPin
;
params
.
appInfo
.
adminUrl
=
"https://gs.plus.jdcloud.com"
;
}
//为工商产品
res
.
end
(
JSON
.
stringify
(
params
));
res
.
end
(
JSON
.
stringify
(
params
));
return
;
return
;
});
});
...
...
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