Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
87a82ef8
Commit
87a82ef8
authored
Apr 12, 2017
by
wudi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
d3208344
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
WeChatController.java
...group/xyqb/controller/external/user/WeChatController.java
+2
-4
PlatformAPIController.java
...b/controller/internal/platform/PlatformAPIController.java
+0
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
View file @
87a82ef8
...
...
@@ -425,19 +425,17 @@ public class WeChatController implements IBaseController {
if
(
"baitiao"
.
equals
(
merchant
.
getName
()))
{
return
userUIAddr
+
"/landing?key=baitiao&target=cashTarget5&channelId=222®isterFrom=198"
;
}
else
if
(
"wechat-pay"
.
equals
(
merchant
.
getName
()))
{
return
userUIAddr
+
"/landing?key=wechat-pay&target=cashTarget
4
&channelId=1®isterFrom"
+
registerFrom
;
return
userUIAddr
+
"/landing?key=wechat-pay&target=cashTarget
5
&channelId=1®isterFrom"
+
registerFrom
;
}
else
{
return
userUIAddr
+
"/landing?key=xyqb&target=cashTarget4&channelId=1®isterFrom="
+
registerFrom
;
}
}
private
String
assembleWechatRedirectUrl
(
Merchant
merchant
,
WechatUserInfo
userInfo
,
Long
registerFrom
)
{
LOGGER
.
info
(
"merchantName={}"
,
merchant
.
getName
());
if
(
"baitiao"
.
equals
(
merchant
.
getName
()))
{
return
userUIAddr
+
"/landing?key=baitiao&target=cashTarget5®isterFrom=198&channelId=222&isWechat=true&openId="
+
userInfo
.
getOpenId
();
}
else
if
(
"wechat-pay"
.
equals
(
merchant
.
getName
()))
{
LOGGER
.
info
(
"url={}"
,
userUIAddr
+
"/landing?key=wechat-pay&target=cashTarget4®isterFrom= "
+
registerFrom
+
"&channelId=1&isWechat=true&openId="
+
userInfo
.
getOpenId
());
return
userUIAddr
+
"/landing?key=wechat-pay&target=cashTarget4®isterFrom= "
+
registerFrom
+
"&channelId=1&isWechat=true&openId="
+
userInfo
.
getOpenId
();
return
userUIAddr
+
"/landing?key=wechat-pay&target=cashTarget5®isterFrom= "
+
registerFrom
+
"&channelId=1&isWechat=true&openId="
+
userInfo
.
getOpenId
();
}
else
{
return
userUIAddr
+
"/landing?key=xyqb&target=cashTarget4®isterFrom= "
+
registerFrom
+
"&channelId=1&isWechat=true&openId="
+
userInfo
.
getOpenId
();
}
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java
View file @
87a82ef8
...
...
@@ -63,7 +63,6 @@ public class PlatformAPIController implements IBaseController {
if
(
merchantConfig
==
null
)
{
return
JsonResult
.
buildSuccessResult
(
""
,
null
);
}
LOGGER
.
info
(
"merchantConfig={}"
,
merchantConfig
);
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
}
if
(
StringUtils
.
isEmpty
(
nextPage
))
{
...
...
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