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
3735bcc4
Commit
3735bcc4
authored
Mar 13, 2018
by
zhang_z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改;
parent
8d3b7dfd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
8 deletions
+27
-8
app/src/main/java/com/xingdata/zzdpos/C.java
app/src/main/java/com/xingdata/zzdpos/C.java
+4
-4
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
...in/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
+1
-0
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
...n/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
+18
-0
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
+2
-2
pay/src/main/java/com/xingdata/zxpay/C.java
pay/src/main/java/com/xingdata/zxpay/C.java
+2
-2
No files found.
app/src/main/java/com/xingdata/zzdpos/C.java
View file @
3735bcc4
...
...
@@ -66,22 +66,22 @@ public class C {
/**
* 测试环境(客户演示使用)sn:test01,设备号:AECRC10
*/
p
ublic
static
final
String
URL_TEST
=
"http://121.40.56.52
:8080/"
;
p
rivate
static
final
String
URL_TEST
=
"http://tk.51zzd.cn
:8080/"
;
/**
* 开发平台(开发人员使用)
*/
static
final
String
URL_DEMO
=
"http://demo.51zzd.cn:8080/"
;
private
static
final
String
URL_DEMO
=
"http://demo.51zzd.cn:8080/"
;
/**
* 生产平台
*/
p
ublic
static
final
String
URL_ONLINE
=
"http://tk.51zzd.com/"
;
p
rivate
static
final
String
URL_ONLINE
=
"http://tk.51zzd.com/"
;
/**
* 地址
*/
public
static
final
String
BASE_URL
=
URL_
DEMO
;
public
static
final
String
BASE_URL
=
URL_
TEST
;
private
static
final
String
PKG
=
"/tk/"
;
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @
3735bcc4
...
...
@@ -135,6 +135,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
mPasswordDialog
.
setSaleorder
(
saleorder
).
show
(
this
);
break
;
case
C
.
PAY_CHANNEL
.
BANK
:
// mPresenter.payInBank();
break
;
case
C
.
PAY_CHANNEL
.
ALI
:
this
.
showTitleBarByTitleMode
(
C
.
TITLE_MODE
.
TEXT
);
...
...
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @
3735bcc4
package
com
.
xingdata
.
zzdpos
.
ui
.
settle
;
import
com.blankj.utilcode.util.LogUtils
;
import
com.blankj.utilcode.util.StringUtils
;
import
com.blankj.utilcode.util.ToastUtils
;
import
com.xingdata.api.print.ZX_PrintPOS
;
...
...
@@ -332,6 +333,23 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override
public
void
payInBank
()
{
commitOrder
(
).
flatMap
(
orderNo
->
{
//获取支付中心参数
return
ApiFactory
.
Pay
.
getPayKey
();
}).
flatMap
(
json
->
{
//初始化支付中心,并发送支付指令
return
PayCenter
.
getInstance
().
init
(
json
).
pay
(
C
.
PAY_CHANNEL
.
WECHAT
,
mSaleorder
.
getOrderPayAmt
());
}).
doFinally
(()
->
{
mView
.
dismissLoadingDialog
();
}).
subscribe
(
response
->
{
LogUtils
.
d
(
response
.
getMsg
());
},
throwable
->
{
LogUtils
.
e
(
throwable
.
getMessage
());
}
);
}
@Override
...
...
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @
3735bcc4
...
...
@@ -57,8 +57,8 @@ public final class SystemUtil {
e
.
printStackTrace
();
}
}
return
"0818562"
;
// return "test898
8";
//
return "0818562";
return
"test201
8"
;
}
/**
...
...
pay/src/main/java/com/xingdata/zxpay/C.java
View file @
3735bcc4
...
...
@@ -67,11 +67,11 @@ public class C {
/**
* 渠道
*/
public
static
final
class
HOST
{
static
final
class
HOST
{
/**
* 惠尔丰平台的渠道编号
*/
public
final
static
int
PAX
=
1
0000
;
final
static
int
PAX
=
10
0000
;
}
/**
...
...
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