Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TangKuPos
Project overview
Project overview
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
王海
TangKuPos
Commits
b0b87b98
Commit
b0b87b98
authored
Jan 26, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一个支付失败之后,无法再次支付的问题;
parent
da02adb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+8
-2
app/src/main/java/com/xingdata/zzdpos/ui/settle/dialog/PayingDialog.java
...va/com/xingdata/zzdpos/ui/settle/dialog/PayingDialog.java
+0
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
b0b87b98
...
@@ -229,7 +229,10 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -229,7 +229,10 @@ public class SettlePresenter extends SettleContract.Presenter {
public
void
payInAli
(
String
payCode
)
{
public
void
payInAli
(
String
payCode
)
{
mView
.
showLoadingDialog
();
mView
.
showLoadingDialog
();
commitOrder
()
commitOrder
()
.
flatMap
(
orderNo
->
JniFactory
.
Settle
.
pay
(
C
.
PAY_CHANNEL
.
ALI
,
payCode
,
mSaleorder
.
getOrderPayAmt
(),
orderNo
))
.
flatMap
(
orderNo
->
{
mSaleorder
.
setOrderNoOrg
(
String
.
valueOf
(
System
.
currentTimeMillis
()));
return
JniFactory
.
Settle
.
pay
(
C
.
PAY_CHANNEL
.
ALI
,
payCode
,
mSaleorder
.
getOrderPayAmt
(),
mSaleorder
.
getOrderNoOrg
());
})
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
.
subscribe
(
response
->
{
response
->
{
...
@@ -253,7 +256,10 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -253,7 +256,10 @@ public class SettlePresenter extends SettleContract.Presenter {
public
void
payInWechat
(
String
payCode
)
{
public
void
payInWechat
(
String
payCode
)
{
mView
.
showLoadingDialog
();
mView
.
showLoadingDialog
();
commitOrder
()
commitOrder
()
.
flatMap
(
orderNo
->
JniFactory
.
Settle
.
pay
(
C
.
PAY_CHANNEL
.
WECHAT
,
payCode
,
mSaleorder
.
getOrderPayAmt
(),
orderNo
))
.
flatMap
(
orderNo
->
{
mSaleorder
.
setOrderNoOrg
(
String
.
valueOf
(
System
.
currentTimeMillis
()));
return
JniFactory
.
Settle
.
pay
(
C
.
PAY_CHANNEL
.
WECHAT
,
payCode
,
mSaleorder
.
getOrderPayAmt
(),
mSaleorder
.
getOrderNoOrg
());
})
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
.
subscribe
(
response
->
{
response
->
{
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/dialog/PayingDialog.java
View file @
b0b87b98
...
@@ -26,7 +26,6 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying
...
@@ -26,7 +26,6 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying
@Override
@Override
public
void
initView
()
{
public
void
initView
()
{
mViewBinding
.
tvCheck
.
setOnClickListener
(
view
->
mPresenter
.
checkPayState
(
mType
));
mViewBinding
.
tvCheck
.
setOnClickListener
(
view
->
mPresenter
.
checkPayState
(
mType
));
switch
(
mType
)
{
switch
(
mType
)
{
case
C
.
PAY_CHANNEL
.
ALI
:
case
C
.
PAY_CHANNEL
.
ALI
:
...
...
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