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
5e18b93a
Commit
5e18b93a
authored
Jan 26, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
常量;
parent
5b0832cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+5
-0
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+4
-5
No files found.
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
5e18b93a
...
@@ -581,4 +581,9 @@ public class C {
...
@@ -581,4 +581,9 @@ public class C {
public
static
final
int
ADD_SKU
=
7
;
public
static
final
int
ADD_SKU
=
7
;
public
static
final
int
SKU_EDITOR
=
8
;
public
static
final
int
SKU_EDITOR
=
8
;
}
}
public
final
class
PAY_STATE
{
public
static
final
String
PAYING
=
"0098"
;
public
static
final
String
SUCC
=
"0000"
;
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
5e18b93a
...
@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.settle;
...
@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.settle;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.blankj.utilcode.util.StringUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.api.print.ZX_PrintPOS
;
import
com.xingdata.api.print.ZX_PrintPOS
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.C
;
...
@@ -259,10 +258,10 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -259,10 +258,10 @@ public class SettlePresenter extends SettleContract.Presenter {
response
->
{
response
->
{
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
r1
=
JSON
.
parseObject
(
response
.
replace
(
"\\"
,
""
),
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
.
class
);
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
r1
=
JSON
.
parseObject
(
response
.
replace
(
"\\"
,
""
),
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
.
class
);
switch
(
r1
.
getResponseCode
())
{
switch
(
r1
.
getResponseCode
())
{
case
"0000"
:
case
C
.
PAY_STATE
.
SUCC
:
subscribePay
(
commitOrder
().
flatMap
(
orderNo
->
ApiFactory
.
Saleorder
.
addOrderPayMis
(
mSaleorder
.
pay
(
orderNo
,
C
.
PAY_CHANNEL
.
WECHAT
)).
doFinally
(()
->
mView
.
dismissLoadingDialog
())));
subscribePay
(
commitOrder
().
flatMap
(
orderNo
->
ApiFactory
.
Saleorder
.
addOrderPayMis
(
mSaleorder
.
pay
(
orderNo
,
C
.
PAY_CHANNEL
.
WECHAT
)).
doFinally
(()
->
mView
.
dismissLoadingDialog
())));
break
;
break
;
case
"0098"
:
case
C
.
PAY_STATE
.
PAYING
:
mView
.
showPayingDialog
(
C
.
PAY_CHANNEL
.
WECHAT
,
r1
);
mView
.
showPayingDialog
(
C
.
PAY_CHANNEL
.
WECHAT
,
r1
);
break
;
break
;
default
:
default
:
...
@@ -309,10 +308,10 @@ public class SettlePresenter extends SettleContract.Presenter {
...
@@ -309,10 +308,10 @@ public class SettlePresenter extends SettleContract.Presenter {
.
subscribe
(
s
->
{
.
subscribe
(
s
->
{
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
r1
=
JSON
.
parseObject
(
s
.
replace
(
"\\"
,
""
),
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
.
class
);
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
r1
=
JSON
.
parseObject
(
s
.
replace
(
"\\"
,
""
),
com
.
xingdata
.
zzdpos
.
api
.
Pay
.
Response
.
class
);
switch
(
r1
.
getResponseCode
())
{
switch
(
r1
.
getResponseCode
())
{
case
"0000"
:
case
C
.
PAY_STATE
.
SUCC
:
subscribePay
(
commitOrder
().
flatMap
(
orderNo
->
ApiFactory
.
Saleorder
.
addOrderPayMis
(
mSaleorder
.
pay
(
orderNo
,
payType
)).
doFinally
(()
->
mView
.
dismissLoadingDialog
())));
subscribePay
(
commitOrder
().
flatMap
(
orderNo
->
ApiFactory
.
Saleorder
.
addOrderPayMis
(
mSaleorder
.
pay
(
orderNo
,
payType
)).
doFinally
(()
->
mView
.
dismissLoadingDialog
())));
break
;
break
;
case
"0098"
:
case
C
.
PAY_STATE
.
PAYING
:
mView
.
showMsg
(
"交易处理中"
);
mView
.
showMsg
(
"交易处理中"
);
break
;
break
;
default
:
default
:
...
...
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