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
650fa8fb
Commit
650fa8fb
authored
Mar 14, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一个查询的问题;
parent
808de093
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
+1
-1
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+20
-6
No files found.
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @
650fa8fb
...
...
@@ -285,7 +285,7 @@ interface ApiService {
pageSize
);
@POST
(
C
.
URL
.
SALEORDER
.
addRemark
)
Observable
<
HttpMessage
<
String
>>
addRemark
(
@Query
(
"orderNo"
)
String
orderNo
,
@Query
(
"
remark
"
)
String
remark
);
Observable
<
HttpMessage
<
String
>>
addRemark
(
@Query
(
"orderNo"
)
String
orderNo
,
@Query
(
"
orderDesc1
"
)
String
remark
);
@POST
(
C
.
URL
.
USER
.
query
)
Observable
<
HttpMessage
<
Pager
<
Vip
>>>
queryDetailByWD
(
@Query
(
"wd"
)
String
keyword
,
@Query
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
650fa8fb
...
...
@@ -265,13 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
())
);
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
())
);
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
}
);
...
...
@@ -323,13 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
())
);
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
())
);
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
}
);
...
...
@@ -414,13 +414,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
())
);
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
(
);
subscribeRemark
(
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
())
);
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
});
}
...
...
@@ -464,6 +464,20 @@ public class SettlePresenter extends SettleContract.Presenter {
.
subscribe
(
this
::
paySucc
,
this
::
payFail
);
}
/**
* 订阅支付
*
* @param observable 数据源
*/
private
void
subscribeRemark
(
Observable
<
String
>
observable
)
{
mView
.
showLoadingDialog
();
observable
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
s
->
{
},
throwable
->
{
});
}
/**
* 提交订单
*/
...
...
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