Skip to content

T
TangKuPos
Commit 9a4a1882 authored by zhang_z's avatar zhang_z
Browse files
Options

更新POS支付;

parent 4eae0d7d
Hide whitespace changes
Inline Side-by-side
Showing with 337 additions and 243 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 9a4a1882
...@@ -661,4 +661,49 @@ public class C { ...@@ -661,4 +661,49 @@ public class C {
public static final int USED = 2; public static final int USED = 2;
public static final int INVALID = 3; public static final int INVALID = 3;
} }
/**
* 支付系统
*/
public final class PAY_SYSTEM {
/**
* 当前支付系统
*/
public static final int CURRENT = PAX.APP;
/**
* 浙星
*/
public static final int ZX = 100101;
/**
* 拉卡拉
*/
public static final int LKL = 100201;
/**
* 百富
*/
public final class PAX {
/**
* 统一支付APP
*/
public static final int APP = 100301;
/**
* 接口
*/
public static final int API = 100302;
}
/**
* 交易类型
*/
public final class Trans_Type {
public static final int Trans_Type_Return = 0;
public static final int Trans_Type_Recharge = 1;
}
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java
View file @ 9a4a1882
...@@ -186,9 +186,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -186,9 +186,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
} }
@Override @Override
public void showPayFailFragment(Throwable throwable, Saleorder saleorder) { public void showPayFailFragment(String throwable, Saleorder saleorder) {
if (throwable != null) { if (throwable != null) {
LogUtils.e(throwable.getMessage()); LogUtils.e(throwable);
} }
this.start(mPayResultFragment.setResult(false).setSaleorder(saleorder)); this.start(mPayResultFragment.setResult(false).setSaleorder(saleorder));
this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT); this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleContract.java
View file @ 9a4a1882
...@@ -125,7 +125,7 @@ interface SettleContract { ...@@ -125,7 +125,7 @@ interface SettleContract {
* @param throwable 错误信息 * @param throwable 错误信息
* @param saleorder 订单信息 * @param saleorder 订单信息
*/ */
void showPayFailFragment(Throwable throwable, Saleorder saleorder); void showPayFailFragment(String throwable, Saleorder saleorder);
/** /**
* 显示支付中页面 * 显示支付中页面
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ 9a4a1882
package com.xingdata.zzdpos.ui.settle; package com.xingdata.zzdpos.ui.settle;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.StringUtils; 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;
...@@ -112,9 +111,11 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -112,9 +111,11 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override @Override
public void initSettle() { public void initSettle() {
DBFactory.Settle.queryPays().subscribe( mCompositeDisposable.add(DBFactory.Settle.queryPays()
pays -> mView.loadPays(pays), .subscribe(
throwable -> mView.showMsg(throwable.getMessage()) pays -> mView.loadPays(pays),
throwable -> mView.showMsg(throwable.getMessage())
)
); );
mView.setSettleFragmentBySettleMode(mSettleMode); mView.setSettleFragmentBySettleMode(mSettleMode);
} }
...@@ -124,16 +125,19 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -124,16 +125,19 @@ public class SettlePresenter extends SettleContract.Presenter {
mView.loadSaledetails(mSaledetails); mView.loadSaledetails(mSaledetails);
//设置订单详情 //设置订单详情
mSaleorder.setSaledetails(mSaledetails); mSaleorder.setSaledetails(mSaledetails);
DBFactory.Settle.queryMss().subscribe(ms -> { mCompositeDisposable.add(DBFactory.Settle.queryMss()
mMss = ms; .subscribe(ms -> {
for (int i = 0; i < mMss.size(); i++) { mMss = ms;
mMss.get(i).setOnApplyListener(mOnApplyListener); for (int i = 0; i < mMss.size(); i++) {
} mMss.get(i).setOnApplyListener(mOnApplyListener);
//处理营销活动 }
this.processMs(); //处理营销活动
//计算价格 this.processMs();
this.reprice(); //计算价格
}, throwable -> mView.showMsg(throwable.getMessage())); this.reprice();
}, throwable -> mView.showMsg(throwable.getMessage())
)
);
} }
@Override @Override
...@@ -151,13 +155,16 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -151,13 +155,16 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override @Override
public void searchVip(String keyword) { public void searchVip(String keyword) {
ApiFactory.User.queryUserDetailByKeyword(keyword).subscribe( mCompositeDisposable.add(ApiFactory.User.queryUserDetailByKeyword(keyword)
vip -> { .subscribe(
List<Vip> vips = new ArrayList<>(); vip -> {
vips.add(vip); List<Vip> vips = new ArrayList<>();
mView.loadVips(vips); vips.add(vip);
}, mView.loadVips(vips);
throwable -> mView.loadVips(new ArrayList<>())); },
throwable -> mView.loadVips(new ArrayList<>())
)
);
} }
@Override @Override
...@@ -174,12 +181,15 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -174,12 +181,15 @@ public class SettlePresenter extends SettleContract.Presenter {
this.reprice(); this.reprice();
// 获取订单 // 获取订单
ApiFactory.Ticket.query(mVip.getVipId()).subscribe( mCompositeDisposable.add(ApiFactory.Ticket.query(mVip.getVipId())
tickets -> { .subscribe(
this.mTickets = tickets.getList(); tickets -> {
this.searchAvlTicket(); this.mTickets = tickets.getList();
}, this.searchAvlTicket();
throwable -> mView.showMsg(throwable.getMessage())); },
throwable -> mView.showMsg(throwable.getMessage())
)
);
} }
@Override @Override
...@@ -219,185 +229,167 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -219,185 +229,167 @@ public class SettlePresenter extends SettleContract.Presenter {
@Override @Override
public void payInCash(Long inputAmt, Long changeAmt) { public void payInCash(Long inputAmt, Long changeAmt) {
// mView.showLoadingDialog();
// subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CASH))));
mView.showLoadingDialog(); mView.showLoadingDialog();
commitOrder( subscribePay(commitOrder()
).flatMap(orderNo -> { .flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CASH)))
//获取支付中心参数
return ApiFactory.Pay.getPayKey();
}).flatMap(json -> {
//初始化支付中心,并发送支付指令
return NeptuneCenter.getInstance().init(App.instance, json).pay(C.PAY_CHANNEL.ALI, mSaleorder.getOrderPayAmt());
}).doFinally(() -> {
mView.dismissLoadingDialog();
}).subscribe(
response -> {
switch (response.getCode()) {
case com.xingdata.zxpay.C.PAY_STATE.ING:
//支付中, 显示支付对话框
mView.showPayingDialog(C.PAY_CHANNEL.ALI);
break;
case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
//支付成功, 发送完成订单指令
subscribePay(ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(mSaleorder.getOrderNo(), C.PAY_CHANNEL.ALI)));
break;
default:
//支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder);
break;
}
},
throwable -> {
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder);
}
); );
} }
@Override @Override
public void payInAli(String payCode) { public void payInAli(String payCode) {
mView.showLoadingDialog(); switch (C.PAY_SYSTEM.CURRENT) {
commitOrder( case C.PAY_SYSTEM.PAX.API:
).flatMap(orderNo -> { this.payInPaxApi(C.PAY_CHANNEL.ALI, payCode);
//获取支付中心参数 break;
return ApiFactory.Pay.getPayKey(); case C.PAY_SYSTEM.PAX.APP:
}).flatMap(json -> { this.payInPaxApp(C.PAY_CHANNEL.ALI);
//初始化支付中心,并发送支付指令 break;
return PayCenter.getInstance().init(json).pay(C.PAY_CHANNEL.ALI, payCode, mSaleorder.getOrderPayAmt()); }
}).doFinally(() -> {
mView.dismissLoadingDialog();
}).subscribe(
response -> {
switch (response.getCode()) {
case com.xingdata.zxpay.C.PAY_STATE.ING:
//支付中, 显示支付对话框
mView.showPayingDialog(C.PAY_CHANNEL.ALI);
break;
case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
//支付成功, 发送完成订单指令
subscribePay(ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(mSaleorder.getOrderNo(), C.PAY_CHANNEL.ALI)));
break;
default:
//支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder);
break;
}
},
throwable -> {
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder);
}
);
} }
@Override @Override
public void payInWechat(String payCode) { public void payInWechat(String payCode) {
mView.showLoadingDialog(); switch (C.PAY_SYSTEM.CURRENT) {
//提交订单 case C.PAY_SYSTEM.PAX.API:
commitOrder( this.payInPaxApi(C.PAY_CHANNEL.WECHAT, payCode);
).flatMap(orderNo -> { break;
//获取支付中心参数 case C.PAY_SYSTEM.PAX.APP:
return ApiFactory.Pay.getPayKey(); this.payInPaxApp(C.PAY_CHANNEL.WECHAT);
}).flatMap(json -> { break;
//初始化支付中心,并发送支付指令 }
return PayCenter.getInstance().init(json).pay(C.PAY_CHANNEL.WECHAT, payCode, mSaleorder.getOrderPayAmt());
}).doFinally(() -> {
mView.dismissLoadingDialog();
}).subscribe(
response -> {
switch (response.getCode()) {
case com.xingdata.zxpay.C.PAY_STATE.ING:
//支付中, 显示支付对话框
mView.showPayingDialog(C.PAY_CHANNEL.WECHAT);
break;
case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
//支付成功, 发送完成订单指令
subscribePay(ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(mSaleorder.getOrderNo(), C.PAY_CHANNEL.WECHAT)));
break;
default:
//支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder);
break;
}
},
throwable -> {
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder);
}
);
} }
@Override @Override
public void payInBank() { public void payInBank() {
commitOrder( switch (C.PAY_SYSTEM.CURRENT) {
).flatMap(orderNo -> { case C.PAY_SYSTEM.PAX.APP:
//获取支付中心参数 this.payInPaxApp(C.PAY_CHANNEL.BANK);
return ApiFactory.Pay.getPayKey(); break;
}).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 @Override
public void payInCard(Long cardNo, String password) { public void payInCard(Long cardNo, String password) {
ApiFactory.Recard.checkPwd(mVip.getVipId(), null, password).subscribe( mCompositeDisposable.add(ApiFactory.Recard.checkPwd(mVip.getVipId(), null, password)
b -> { .subscribe(
mView.dismissPasswordDialog(); b -> {
mView.showLoadingDialog(); mView.dismissPasswordDialog();
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CARD, String.valueOf(cardNo))))); mView.showLoadingDialog();
}, subscribePay(commitOrder()
throwable -> mView.showMsg(throwable.getMessage()) .flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.CARD, String.valueOf(cardNo))))
);
},
throwable -> mView.showMsg(throwable.getMessage())
)
); );
} }
@Override @Override
public void payInTally(String password) { public void payInTally(String password) {
ApiFactory.Recard.checkPwd(mVip.getVipId(), String.valueOf(0L), password).subscribe( mCompositeDisposable.add(ApiFactory.Recard.checkPwd(mVip.getVipId(), String.valueOf(0L), password)
b -> { .subscribe(
mView.dismissPasswordDialog(); b -> {
mView.showLoadingDialog(); mView.dismissPasswordDialog();
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.TALLY)))); mView.showLoadingDialog();
}, subscribePay(commitOrder()
throwable -> mView.showMsg(throwable.getMessage()) .flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.TALLY)))
);
},
throwable -> mView.showMsg(throwable.getMessage())
)
);
}
/**
* 百富接口支付
*
* @param payChannel 支付渠道
* @param payCode 支付码
*/
private void payInPaxApi(int payChannel, String payCode) {
mView.showLoadingDialog();
mCompositeDisposable.add(commitOrder()
.flatMap(orderNo -> {
//获取支付中心参数
return ApiFactory.Pay.getPayKey();
})
.flatMap(json -> {
//初始化支付中心,并发送支付指令
return PayCenter.getInstance().init(C.PAY_SYSTEM.CURRENT).setPayKey(json).pay(payChannel, payCode, mSaleorder.getOrderPayAmt());
})
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(
response -> {
switch (response.getCode()) {
case com.xingdata.zxpay.C.PAY_STATE.ING:
//支付中, 显示支付对话框
mView.showPayingDialog(payChannel);
break;
case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
//支付成功, 发送完成订单指令
subscribePay(ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(mSaleorder.getOrderNo(), payChannel)));
break;
default:
//支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
this.payFail(response.getMsg());
break;
}
},
throwable -> {
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
this.payFail(throwable.getMessage());
}
)
); );
} }
/**
* 百富统一收银台APP支付
*
* @param payChannel 支付渠道
*/
private void payInPaxApp(int payChannel) {
mView.showLoadingDialog();
mCompositeDisposable.add(commitOrder()
.flatMap(orderNo -> {
//初始化支付中心,并发送支付指令
return NeptuneCenter.getInstance().init(App.instance).pay(orderNo, payChannel, mSaleorder.getOrderPayAmt());
})
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(
response -> {
switch (response.getCode()) {
case com.xingdata.zxpay.C.PAY_STATE.ING:
//支付中, 显示支付对话框
mView.showPayingDialog(payChannel);
break;
case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
//支付成功, 发送完成订单指令
subscribePay(ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(mSaleorder.getOrderNo(), payChannel)));
break;
default:
//支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
this.payFail(response.getMsg());
break;
}
},
throwable -> {
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
this.payFail(throwable.getMessage());
}
)
);
}
@Override @Override
public void checkPayState(int payType) { public void checkPayState(int payType) {
mView.showLoadingDialog(); mView.showLoadingDialog();
// JniFactory.Settle.query() mCompositeDisposable.add(PayCenter.getInstance().query(payType)
// .doFinally(() -> mView.dismissLoadingDialog())
// .subscribe(s -> {
// com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(s.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
// switch (r1.getResponseCode()) {
// case C.PAY_STATE.SUCC:
// subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, payType))));
// break;
// case C.PAY_STATE.PAYING:
// mView.showMsg("交易处理中");
// break;
// default:
// mView.showPayFailFragment(null, mSaleorder);
// break;
// }
// },
// throwable -> mView.showPayFailFragment(throwable, mSaleorder));
PayCenter.getInstance().query(payType)
.doFinally(() -> mView.dismissLoadingDialog()) .doFinally(() -> mView.dismissLoadingDialog())
.subscribe(response -> { .subscribe(response -> {
switch (response.getCode()) { switch (response.getCode()) {
...@@ -418,8 +410,9 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -418,8 +410,9 @@ public class SettlePresenter extends SettleContract.Presenter {
}, throwable -> { }, throwable -> {
//支付失败 //支付失败
subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage())); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder); this.payFail(throwable);
}); })
);
} }
@Override @Override
...@@ -457,8 +450,10 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -457,8 +450,10 @@ public class SettlePresenter extends SettleContract.Presenter {
*/ */
private void subscribePay(Observable<Saleorder> observable) { private void subscribePay(Observable<Saleorder> observable) {
mView.showLoadingDialog(); mView.showLoadingDialog();
observable.doFinally(() -> mView.dismissLoadingDialog()) mCompositeDisposable.add(observable
.subscribe(this::paySucc, this::payFail); .doFinally(() -> mView.dismissLoadingDialog())
.subscribe(this::paySucc, this::payFail)
);
} }
/** /**
...@@ -468,10 +463,11 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -468,10 +463,11 @@ public class SettlePresenter extends SettleContract.Presenter {
*/ */
private void subscribeRemark(Observable<String> observable) { private void subscribeRemark(Observable<String> observable) {
mView.showLoadingDialog(); mView.showLoadingDialog();
observable.doFinally(() -> mView.dismissLoadingDialog()) mCompositeDisposable.add(observable.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(s -> { .subscribe(s -> {
}, throwable -> { }, throwable -> {
}); })
);
} }
...@@ -523,10 +519,17 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -523,10 +519,17 @@ public class SettlePresenter extends SettleContract.Presenter {
/** /**
* 支付失败 * 支付失败
*/ */
private void payFail(Throwable throwable) { private void payFail(String throwable) {
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
} }
/**
* 支付失败
*/
private void payFail(Throwable throwable) {
mView.showPayFailFragment(throwable.getMessage(), mSaleorder);
}
/** /**
* 设置会员 * 设置会员
......
pay/src/main/java/com/xingdata/zxpay/C.java
View file @ 9a4a1882
...@@ -54,7 +54,9 @@ public class C { ...@@ -54,7 +54,9 @@ public class C {
public final static int QUERY = 400; public final static int QUERY = 400;
} }
/**
* 支付渠道
*/
public final class PAY_CHANNEL { public final class PAY_CHANNEL {
public static final int CASH = 1; public static final int CASH = 1;
public static final int WECHAT = 2; public static final int WECHAT = 2;
...@@ -65,13 +67,34 @@ public class C { ...@@ -65,13 +67,34 @@ public class C {
} }
/** /**
* 渠道 * 支付系统
*/ */
static final class HOST { final class PAY_SYSTEM {
/**
* 浙星
*/
static final int ZX = 100101;
/** /**
* 惠尔丰平台的渠道编号 * 拉卡拉
*/ */
final static int PAX = 100000; static final int LKL = 100201;
/**
* 百富
*/
final class PAX {
/**
* 统一支付APP
*/
static final int APP = 100301;
/**
* 接口
*/
static final int API = 100302;
}
} }
/** /**
......
pay/src/main/java/com/xingdata/zxpay/PayCenter.java
View file @ 9a4a1882
package com.xingdata.zxpay; package com.xingdata.zxpay;
import com.alibaba.fastjson.JSON; import com.blankj.utilcode.util.Utils;
import com.xingdata.zxpay.api.Response; import com.xingdata.zxpay.api.Response;
import com.xingdata.zxpay.model.Shopppp; import com.xingdata.zxpay.pax.PaxFactory;
import com.xingdata.zxpay.pax.Factory;
import io.reactivex.Observable; import io.reactivex.Observable;
...@@ -19,12 +18,32 @@ public class PayCenter { ...@@ -19,12 +18,32 @@ public class PayCenter {
} }
/** /**
* 交易基本信息 * 支付系统
*/ */
public Shopppp mShopppp; private int mPaySystem;
public PayCenter init(String json) { /**
mShopppp = JSON.parseObject(json, Shopppp.class); * 支付信息
*/
public String mShoppppJson;
/**
* 设置支付信息
*/
public PayCenter setPayKey(String json) {
mShoppppJson = json;
return this;
}
/**
* 初始化
*
* @param paySystem 支付系统
* @return this
*/
public PayCenter init(int paySystem) {
this.mPaySystem = paySystem;
return this; return this;
} }
...@@ -37,11 +56,11 @@ public class PayCenter { ...@@ -37,11 +56,11 @@ public class PayCenter {
* @return 支付结果的Observable * @return 支付结果的Observable
*/ */
public Observable<Response> pay(int payChannel, String payCode, Long orderAmt) { public Observable<Response> pay(int payChannel, String payCode, Long orderAmt) {
switch (mShopppp.getHost().getHostMapId()) { switch (mPaySystem) {
case C.HOST.PAX: case C.PAY_SYSTEM.PAX.API:
return Factory.microPay(payChannel, payCode, Util.fenToYuan(orderAmt)); return PaxFactory.getInstance().microPay(payChannel, payCode, Util.fenToYuan(orderAmt));
default: default:
return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, "未知渠道")); return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, Utils.getApp().getResources().getString(R.string.unknown_channels)));
} }
} }
...@@ -54,11 +73,11 @@ public class PayCenter { ...@@ -54,11 +73,11 @@ public class PayCenter {
* @return 支付结果的Observable * @return 支付结果的Observable
*/ */
public Observable<Response> pay(int payChannel, Long orderAmt) { public Observable<Response> pay(int payChannel, Long orderAmt) {
switch (mShopppp.getHost().getHostMapId()) { switch (mPaySystem) {
case C.HOST.PAX: case C.PAY_SYSTEM.PAX.API:
return Factory.qrPay(payChannel, Util.fenToYuan(orderAmt)); return PaxFactory.getInstance().qrPay(payChannel, Util.fenToYuan(orderAmt));
default: default:
return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, "未知渠道")); return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, Utils.getApp().getResources().getString(R.string.unknown_channels)));
} }
} }
...@@ -69,11 +88,11 @@ public class PayCenter { ...@@ -69,11 +88,11 @@ public class PayCenter {
* @return 查询结果的Observable * @return 查询结果的Observable
*/ */
public Observable<Response> query(int payChannel) { public Observable<Response> query(int payChannel) {
switch (mShopppp.getHost().getHostMapId()) { switch (mPaySystem) {
case C.HOST.PAX: case C.PAY_SYSTEM.PAX.API:
return Factory.query(payChannel); return PaxFactory.getInstance().query(payChannel);
default: default:
return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, "未知渠道")); return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, Utils.getApp().getResources().getString(R.string.unknown_channels)));
} }
} }
} }
pay/src/main/java/com/xingdata/zxpay/api/Factory.java
View file @ 9a4a1882
package com.xingdata.zxpay.api; package com.xingdata.zxpay.api;
public class Factory { import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class Factory {
protected static <T> Observable<T> run(Observable<T> observable) {
return observable.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
} }
pay/src/main/java/com/xingdata/zxpay/pax/Api.java
View file @ 9a4a1882
package com.xingdata.zxpay.pax; package com.xingdata.zxpay.pax;
import com.xingdata.zxpay.PayCenter;
class Api extends com.xingdata.zxpay.api.Api { class Api extends com.xingdata.zxpay.api.Api {
Service service; Service service;
...@@ -21,6 +19,6 @@ class Api extends com.xingdata.zxpay.api.Api { ...@@ -21,6 +19,6 @@ class Api extends com.xingdata.zxpay.api.Api {
@Override @Override
protected String getBaseUrl() { protected String getBaseUrl() {
return PayCenter.getInstance().mShopppp.getHost().getHostAddr(); return PaxFactory.getInstance().mShopppp.getHost().getHostAddr();
} }
} }
pay/src/main/java/com/xingdata/zxpay/pax/C.java
View file @ 9a4a1882
...@@ -6,16 +6,6 @@ class C { ...@@ -6,16 +6,6 @@ class C {
*/ */
static final String VERSION = "V1.0"; static final String VERSION = "V1.0";
/**
* 重试次数
*/
static final int RETRY_COUNT = 6;
/**
* 重试延迟时间
*/
static final int RETRY_DELAY_TIME = 5 * 1000;
/** /**
* 测试数据 * 测试数据
*/ */
......
pay/src/main/java/com/xingdata/zxpay/pax/Request.java
View file @ 9a4a1882
...@@ -3,7 +3,6 @@ package com.xingdata.zxpay.pax; ...@@ -3,7 +3,6 @@ package com.xingdata.zxpay.pax;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.blankj.utilcode.util.EncryptUtils; import com.blankj.utilcode.util.EncryptUtils;
import com.xingdata.zxpay.PayCenter;
class Request { class Request {
...@@ -14,9 +13,9 @@ class Request { ...@@ -14,9 +13,9 @@ class Request {
this.signType = C.SIGN_TYPE.MD5; this.signType = C.SIGN_TYPE.MD5;
this.version = C.VERSION; this.version = C.VERSION;
this.agentId = PayCenter.getInstance().mShopppp.getHost().getHostAcqCode(); this.agentId = PaxFactory.getInstance().mShopppp.getHost().getHostAcqCode();
this.mchId = PayCenter.getInstance().mShopppp.getPosppp().getHshopNo(); this.mchId = PaxFactory.getInstance().mShopppp.getPosppp().getHshopNo();
this.terId = PayCenter.getInstance().mShopppp.getPosppp().getHposNo(); this.terId = PaxFactory.getInstance().mShopppp.getPosppp().getHposNo();
} }
/** /**
...@@ -147,7 +146,6 @@ class Request { ...@@ -147,7 +146,6 @@ class Request {
@JSONField(name = "sign") @JSONField(name = "sign")
private String sign; private String sign;
String getVersion() { String getVersion() {
return version; return version;
} }
...@@ -204,7 +202,6 @@ class Request { ...@@ -204,7 +202,6 @@ class Request {
this.timeStart = timeStart; this.timeStart = timeStart;
} }
String getSubject() { String getSubject() {
return subject; return subject;
} }
...@@ -213,7 +210,6 @@ class Request { ...@@ -213,7 +210,6 @@ class Request {
this.subject = subject; this.subject = subject;
} }
String getBody() { String getBody() {
return body; return body;
} }
...@@ -238,7 +234,6 @@ class Request { ...@@ -238,7 +234,6 @@ class Request {
this.authCode = authCode; this.authCode = authCode;
} }
String getCurrency() { String getCurrency() {
return currency; return currency;
} }
...@@ -255,7 +250,6 @@ class Request { ...@@ -255,7 +250,6 @@ class Request {
this.totalAmount = totalAmount; this.totalAmount = totalAmount;
} }
String getFeeAmount() { String getFeeAmount() {
return feeAmount; return feeAmount;
} }
...@@ -264,7 +258,6 @@ class Request { ...@@ -264,7 +258,6 @@ class Request {
this.feeAmount = feeAmount; this.feeAmount = feeAmount;
} }
String getReserved() { String getReserved() {
return reserved; return reserved;
} }
...@@ -273,7 +266,6 @@ class Request { ...@@ -273,7 +266,6 @@ class Request {
this.reserved = reserved; this.reserved = reserved;
} }
String getExpTime() { String getExpTime() {
return expTime; return expTime;
} }
......
pay/src/main/java/com/xingdata/zxpay/pax/Response.java
View file @ 9a4a1882
...@@ -33,13 +33,27 @@ class Response { ...@@ -33,13 +33,27 @@ class Response {
@JSONField(name = "msg") @JSONField(name = "msg")
private String msg; private String msg;
public Long getTime_start() {
return time_start;
}
public void setTime_start(Long time_start) {
this.time_start = time_start;
}
/**
* 交易时间
*/
@JSONField(name = "time_start")
private Long time_start;
/** /**
* 二维码地址 * 二维码地址
*/ */
@JSONField(name = "code_url") @JSONField(name = "code_url")
private String codeUrl; private String codeUrl;
String getMethod() { public String getMethod() {
return method; return method;
} }
...@@ -47,7 +61,7 @@ class Response { ...@@ -47,7 +61,7 @@ class Response {
this.method = method; this.method = method;
} }
String getAgentId() { public String getAgentId() {
return agentId; return agentId;
} }
...@@ -55,7 +69,7 @@ class Response { ...@@ -55,7 +69,7 @@ class Response {
this.agentId = agentId; this.agentId = agentId;
} }
String getMchId() { public String getMchId() {
return mchId; return mchId;
} }
...@@ -63,7 +77,7 @@ class Response { ...@@ -63,7 +77,7 @@ class Response {
this.mchId = mchId; this.mchId = mchId;
} }
String getCode() { public String getCode() {
return code; return code;
} }
...@@ -71,7 +85,7 @@ class Response { ...@@ -71,7 +85,7 @@ class Response {
this.code = code; this.code = code;
} }
String getMsg() { public String getMsg() {
return msg; return msg;
} }
...@@ -79,7 +93,7 @@ class Response { ...@@ -79,7 +93,7 @@ class Response {
this.msg = msg; this.msg = msg;
} }
String getCodeUrl() { public String getCodeUrl() {
return codeUrl; return codeUrl;
} }
......
pay/src/main/java/com/xingdata/zxpay/pax/ResultFilter.java
View file @ 9a4a1882
package com.xingdata.zxpay.pax; package com.xingdata.zxpay.pax;
import com.alibaba.fastjson.JSON;
import io.reactivex.functions.Function; import io.reactivex.functions.Function;
class ResultFilter implements Function<Response, com.xingdata.zxpay.api.Response> { class ResultFilter implements Function<Response, com.xingdata.zxpay.api.Response> {
...@@ -24,7 +26,7 @@ class ResultFilter implements Function<Response, com.xingdata.zxpay.api.Response ...@@ -24,7 +26,7 @@ class ResultFilter implements Function<Response, com.xingdata.zxpay.api.Response
} }
switch (response.getMethod()) { switch (response.getMethod()) {
case C.METHOD.QRPAY: case C.METHOD.QRPAY:
r.setBody(response.getCodeUrl()); r.setBody(JSON.toJSONString(response));
break; break;
} }
return r; return r;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment