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
85ab96a6
Commit
85ab96a6
authored
Mar 14, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付失败时,上传错误信息;
parent
e554aa35
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
4 deletions
+24
-4
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+1
-0
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
+6
-2
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
+2
-0
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
...in/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
+4
-0
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+10
-1
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
+1
-1
No files found.
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
85ab96a6
...
...
@@ -288,6 +288,7 @@ public class C {
public
static
final
String
addOrderMis
=
ROOT_URL
+
"addOrderMis"
;
public
static
final
String
addOrderPayMis
=
ROOT_URL
+
"addOrderPayMis"
;
public
static
final
String
querySaleorderByVipId
=
ROOT_URL
+
"query"
;
public
static
final
String
addRemark
=
ROOT_URL
+
"update"
;
}
public
final
class
PAY
{
...
...
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @
85ab96a6
...
...
@@ -476,11 +476,14 @@ public final class ApiFactory {
return
run
(
Api
.
getInstance
().
service
.
addOrderMis
(
saleorderParam
));
}
public
static
Observable
<
com
.
xingdata
.
zzdpos
.
model
.
Saleorder
>
addOrderPayMis
(
com
.
xingdata
.
zzdpos
.
model
.
Saleorder
.
Pay
saleorderPay
)
{
public
static
Observable
<
com
.
xingdata
.
zzdpos
.
model
.
Saleorder
>
addOrderPayMis
(
com
.
xingdata
.
zzdpos
.
model
.
Saleorder
.
Pay
saleorderPay
)
{
return
run
(
Api
.
getInstance
().
service
.
addOrderPayMis
(
saleorderPay
));
}
public
static
Observable
<
String
>
addRemark
(
String
orderNo
,
String
remark
)
{
return
run
(
Api
.
getInstance
().
service
.
addRemark
(
orderNo
,
remark
));
}
public
static
Observable
<
Pager
<
com
.
xingdata
.
zzdpos
.
model
.
Saleorder
>>
querySaleorderByVipId
(
Long
vipId
,
int
pageNumber
,
int
pageSize
)
{
return
run
(
Api
.
getInstance
().
service
.
querySaleorderByVipId
(
vipId
,
pageNumber
,
...
...
@@ -605,6 +608,7 @@ public final class ApiFactory {
.
observeOn
(
AndroidSchedulers
.
mainThread
());
}
}
public
static
class
CsDetail
{
/**
* 添加库存盘点详情
...
...
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @
85ab96a6
...
...
@@ -284,6 +284,8 @@ interface ApiService {
(
"pageSize"
)
int
pageSize
);
@POST
(
C
.
URL
.
SALEORDER
.
addRemark
)
Observable
<
HttpMessage
<
String
>>
addRemark
(
@Query
(
"orderNo"
)
String
orderNo
,
@Query
(
"remark"
)
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/SettleActivity.java
View file @
85ab96a6
...
...
@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle;
import
android.view.MotionEvent
;
import
com.blankj.utilcode.util.ActivityUtils
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.zzdpos.C
;
import
com.xingdata.zzdpos.R
;
...
...
@@ -184,6 +185,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
@Override
public
void
showPayFailFragment
(
Throwable
throwable
,
Saleorder
saleorder
)
{
if
(
throwable
!=
null
)
{
LogUtils
.
e
(
throwable
.
getMessage
());
}
this
.
start
(
mPayResultFragment
.
setResult
(
false
).
setSaleorder
(
saleorder
));
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
TEXT
);
mViewBinding
.
tvTitle
.
setText
(
R
.
string
.
settle_pay_result_title
);
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
85ab96a6
...
...
@@ -265,11 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
();
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
();
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
}
);
...
...
@@ -321,11 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
();
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
();
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
}
);
...
...
@@ -396,7 +400,7 @@ public class SettlePresenter extends SettleContract.Presenter {
// }
// },
// throwable -> mView.showPayFailFragment(throwable, mSaleorder));
PayCenter
.
getInstance
().
query
()
PayCenter
.
getInstance
().
query
(
payType
)
.
doFinally
(()
->
mView
.
dismissLoadingDialog
())
.
subscribe
(
response
->
{
switch
(
response
.
getCode
())
{
...
...
@@ -410,9 +414,14 @@ public class SettlePresenter extends SettleContract.Presenter {
break
;
default
:
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
response
.
getMsg
()).
subscribe
();
mView
.
showPayFailFragment
(
null
,
mSaleorder
);
break
;
}
},
throwable
->
{
//支付失败
ApiFactory
.
Saleorder
.
addRemark
(
mSaleorder
.
getOrderNo
(),
throwable
.
getMessage
()).
subscribe
();
mView
.
showPayFailFragment
(
throwable
,
mSaleorder
);
});
}
...
...
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @
85ab96a6
...
...
@@ -57,7 +57,7 @@ public final class SystemUtil {
e
.
printStackTrace
();
}
}
return
"test201
9
"
;
return
"test201
8
"
;
// return deviceSN;
}
...
...
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