Skip to content

S
supplier
Commit 75ed3aab by 宁斌
Options

1、pos支付代碼注釋

parent 5eebf3c9
Showing with 324 additions and 320 deletions
component-main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java
......@@ -132,11 +132,11 @@ public class ComponentMain implements IComponent {
}
private void openActivity(CC cc) {
Intent intent = new Intent(cc.getContext(), MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
cc.getContext().startActivity(intent);
// CCUtil.createNavigateIntent(cc, NewMainActivity.class);
// CC.sendCCResult(cc.getCallId(), CCResult.success());
// Intent intent = new Intent(cc.getContext(), MainActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// cc.getContext().startActivity(intent);
CCUtil.createNavigateIntent(cc, NewMainActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success());
}
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/HomePresenter.java
......@@ -245,33 +245,33 @@ public class HomePresenter extends BasePresenter<HomeContract.Model, HomeContrac
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
PosPay.settlement(IActivity, IActivity, new OnPosActionListener() {
@Override
public void onPosSuccess(HywebPosResponse response) {
mRootView.showMessage("清機成功!");
updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
}
@Override
public void onPosException(HywebPosResponse response,Exception e) {
mRootView.showMessage("清機Exception :" + e.getMessage());
updateSettlementOperation(restaurantId, e.getMessage(), 0);
}
@Override
public void onPosInvalid(String e) {
mRootView.showMessage(e);
updateSettlementOperation(restaurantId, e, 2);
}
@Override
public void onUpdateStatusSuccess(HywebPosResponse response) {
}
@Override
public void onUpdateStatusError(Throwable e) {
}
});
// PosPay.settlement(IActivity, IActivity, new OnPosActionListener() {
// @Override
// public void onPosSuccess(HywebPosResponse response) {
// mRootView.showMessage("清機成功!");
// updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
// }
//
// @Override
// public void onPosException(HywebPosResponse response,Exception e) {
// mRootView.showMessage("清機Exception :" + e.getMessage());
// updateSettlementOperation(restaurantId, e.getMessage(), 0);
// }
//
// @Override
// public void onPosInvalid(String e) {
// mRootView.showMessage(e);
// updateSettlementOperation(restaurantId, e, 2);
// }
//
// @Override
// public void onUpdateStatusSuccess(HywebPosResponse response) {
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// }
// });
}
} else {
mRootView.showMessage("調起POS清機失敗");
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
......@@ -180,33 +180,33 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
PosPay.settlement(IActivity, IActivity, new OnPosActionListener() {
@Override
public void onPosSuccess(HywebPosResponse response) {
mRootView.showMessage("清機成功!");
updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
}
@Override
public void onPosException(HywebPosResponse response,Exception e) {
mRootView.showMessage("清機Exception :" + e.getMessage());
updateSettlementOperation(restaurantId, e.getMessage(), 0);
}
@Override
public void onPosInvalid(String e) {
mRootView.showMessage(e);
updateSettlementOperation(restaurantId, e, 2);
}
@Override
public void onUpdateStatusSuccess(HywebPosResponse response) {
}
@Override
public void onUpdateStatusError(Throwable e) {
}
});
// PosPay.settlement(IActivity, IActivity, new OnPosActionListener() {
// @Override
// public void onPosSuccess(HywebPosResponse response) {
// mRootView.showMessage("清機成功!");
// updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
// }
//
// @Override
// public void onPosException(HywebPosResponse response,Exception e) {
// mRootView.showMessage("清機Exception :" + e.getMessage());
// updateSettlementOperation(restaurantId, e.getMessage(), 0);
// }
//
// @Override
// public void onPosInvalid(String e) {
// mRootView.showMessage(e);
// updateSettlementOperation(restaurantId, e, 2);
// }
//
// @Override
// public void onUpdateStatusSuccess(HywebPosResponse response) {
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// }
// });
}
} else {
mRootView.showMessage("調起POS清機失敗");
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
......@@ -230,33 +230,33 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
PosPay.settlement(IActivity, mRootView, new OnPosActionListener() {
@Override
public void onPosSuccess(HywebPosResponse response) {
mRootView.showMessage("清機成功!");
updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
}
@Override
public void onPosException(HywebPosResponse response,Exception e) {
mRootView.showMessage("清機Exception :" + e.getMessage());
updateSettlementOperation(restaurantId, e.getMessage(), 0);
}
@Override
public void onPosInvalid(String e) {
mRootView.showMessage(e);
updateSettlementOperation(restaurantId, e, 2);
}
@Override
public void onUpdateStatusSuccess(HywebPosResponse response) {
}
@Override
public void onUpdateStatusError(Throwable e) {
}
});
// PosPay.settlement(IActivity, mRootView, new OnPosActionListener() {
// @Override
// public void onPosSuccess(HywebPosResponse response) {
// mRootView.showMessage("清機成功!");
// updateSettlementOperation(restaurantId, GsonUtils.GsonString(response), 1);
// }
//
// @Override
// public void onPosException(HywebPosResponse response,Exception e) {
// mRootView.showMessage("清機Exception :" + e.getMessage());
// updateSettlementOperation(restaurantId, e.getMessage(), 0);
// }
//
// @Override
// public void onPosInvalid(String e) {
// mRootView.showMessage(e);
// updateSettlementOperation(restaurantId, e, 2);
// }
//
// @Override
// public void onUpdateStatusSuccess(HywebPosResponse response) {
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// }
// });
}
} else {
mRootView.showMessage("調起POS清機失敗");
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/CancelOrder.java
......@@ -78,59 +78,59 @@ public class CancelOrder implements Strategy<OrderManagerResponse> {
}
txnIdRequest.setAmount(datasBean.getAmount());
VoidRequest voidRequest = new VoidRequest();
PosPay.voidO(mActivity, mRootView, voidRequest, txnIdRequest, new OnPosActionListener<VoidRespose>() {
@Override
public void onPosSuccess(VoidRespose response) {
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if (cancelListener != null) {
cancelListener.refeshOrders();
}
}
@Override
public void onPosException(VoidRespose response, Exception e) {
LoganManager.w_order(TAG, "onPosException： " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.VOID);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else{
mActivity.start(statusExceptionFragment);
}
}
@Override
public void onPosInvalid(String e) {
LoganManager.w_order(TAG, "onPosInvalid: " + e);
}
@Override
public void onUpdateStatusSuccess(VoidRespose response) {
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_order(TAG, "onUpdateStatusError： " + e.getMessage());
if (mActivity.findFragment(PosActionStatusExceptionFragment.class) == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.VOID);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}
}
});
// PosPay.voidO(mActivity, mRootView, voidRequest, txnIdRequest, new OnPosActionListener<VoidRespose>() {
//
// @Override
// public void onPosSuccess(VoidRespose response) {
// LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
// if (cancelListener != null) {
// cancelListener.refeshOrders();
// }
// }
//
// @Override
// public void onPosException(VoidRespose response, Exception e) {
// LoganManager.w_order(TAG, "onPosException： " + e.getMessage());
// PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.VOID);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }else{
// mActivity.start(statusExceptionFragment);
// }
// }
//
// @Override
// public void onPosInvalid(String e) {
// LoganManager.w_order(TAG, "onPosInvalid: " + e);
// }
//
// @Override
// public void onUpdateStatusSuccess(VoidRespose response) {
// LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// LoganManager.w_order(TAG, "onUpdateStatusError： " + e.getMessage());
// if (mActivity.findFragment(PosActionStatusExceptionFragment.class) == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.VOID);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }
// }
// });
}
private OnCancelListener cancelListener;
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/PrintOrderAction.java
......@@ -104,36 +104,36 @@ public class PrintOrderAction implements Strategy<OrderManagerResponse> {
}
private void printPosStub(OrderManagerResponse orderDetailItem, DoshokuOrder doshokuOrder, TableBean.DataBean dataBean) {
PosPay.printStub(mActivity, mRootView, orderDetailItem.getPayTxnId(), new OnPosActionListener() {
@Override
public void onPosSuccess(HywebPosResponse response) {
if(printlListener != null){
printlListener.printPosStubResult(true);
}
printBill(orderDetailItem,doshokuOrder, dataBean,true);
}
@Override
public void onPosException(HywebPosResponse response, Exception e) {
if(printlListener != null){
printlListener.printPosStubResult(false);
}
printBill(orderDetailItem,doshokuOrder, dataBean,true);
}
@Override
public void onPosInvalid(String e) {
printBill(orderDetailItem,doshokuOrder, dataBean,true);
}
@Override
public void onUpdateStatusSuccess(HywebPosResponse response) {
}
@Override
public void onUpdateStatusError(Throwable e) {
}
});
// PosPay.printStub(mActivity, mRootView, orderDetailItem.getPayTxnId(), new OnPosActionListener() {
// @Override
// public void onPosSuccess(HywebPosResponse response) {
// if(printlListener != null){
// printlListener.printPosStubResult(true);
// }
// printBill(orderDetailItem,doshokuOrder, dataBean,true);
// }
//
// @Override
// public void onPosException(HywebPosResponse response, Exception e) {
// if(printlListener != null){
// printlListener.printPosStubResult(false);
// }
// printBill(orderDetailItem,doshokuOrder, dataBean,true);
// }
//
// @Override
// public void onPosInvalid(String e) {
// printBill(orderDetailItem,doshokuOrder, dataBean,true);
// }
//
// @Override
// public void onUpdateStatusSuccess(HywebPosResponse response) {
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// }
// });
}
private void printBill(OrderManagerResponse orderDetailItem,DoshokuOrder doshokuOrder, TableBean.DataBean dataBean,boolean printStub) {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/RefundOrder.java
......@@ -74,63 +74,63 @@ public class RefundOrder implements Strategy<OrderManagerResponse> {
RefundRequest refundRequest = new RefundRequest();
refundRequest.setPAYMENT_APP_ID(getPaymentAppIdByPays(datasBean.getOrderPays()));
refundRequest.setTXN_AMT(datasBean.getAmount());
PosPay.refund(mActivity, mRootView, refundRequest, txnIdRequest, new OnPosActionListener<RefundRespose>() {
@Override
public void onPosSuccess(RefundRespose response) {
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if(refundListener != null){
refundListener.refeshOrders();
}
}
@Override
public void onPosException(RefundRespose response,Exception e) {
LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.REFUND);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else {
mActivity.start(statusExceptionFragment);
}
}
@Override
public void onPosInvalid(String e) {
LoganManager.w_order(TAG, "onPosInvalid: " + e);
}
@Override
public void onUpdateStatusSuccess(RefundRespose response) {
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.REFUND);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else{
mActivity.start(statusExceptionFragment);
}
}
});
// PosPay.refund(mActivity, mRootView, refundRequest, txnIdRequest, new OnPosActionListener<RefundRespose>() {
//
// @Override
// public void onPosSuccess(RefundRespose response) {
// LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
// if(refundListener != null){
// refundListener.refeshOrders();
// }
// }
//
// @Override
// public void onPosException(RefundRespose response,Exception e) {
// LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
// PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.REFUND);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }else {
// mActivity.start(statusExceptionFragment);
// }
// }
//
// @Override
// public void onPosInvalid(String e) {
// LoganManager.w_order(TAG, "onPosInvalid: " + e);
// }
//
// @Override
// public void onUpdateStatusSuccess(RefundRespose response) {
// LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
// }
//
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
// PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.REFUND);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }else{
// mActivity.start(statusExceptionFragment);
// }
// }
// });
}
private String getPaymentAppIdByPays(List<OrderManagerResponse.OrderPayBean> orderPays) {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/action/order/TipsOrder.java
......@@ -63,63 +63,63 @@ public class TipsOrder implements Strategy<OrderManagerResponse> {
}
txnIdRequest.setAmount(datasBean.getAmount());
PosPay.tip(mActivity, mRootView, txnIdRequest,
getTipsRequest(datasBean.getPayTxnId(), datasBean.getAmount(), Double.parseDouble(number)), new OnPosActionListener<AdjustTipRespose>() {
@Override
public void onPosSuccess(AdjustTipRespose response) {
LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
if(tipsListener != null){
tipsListener.refeshOrders();
}
}
@Override
public void onPosException(AdjustTipRespose response,Exception e) {
LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.TIP);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else{
mActivity.start(statusExceptionFragment);
}
}
@Override
public void onPosInvalid(String e) {
LoganManager.w_order(TAG, "onPosInvalid: " + e.toString());
}
@Override
public void onUpdateStatusSuccess(AdjustTipRespose response) {
LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
}
@Override
public void onUpdateStatusError(Throwable e) {
LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
if (statusExceptionFragment == null) {
PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
statusExceptionParam.setTxnId(datasBean.getPayTxnId());
statusExceptionParam.setAmount(datasBean.getAmount());
statusExceptionParam.setOrderId(datasBean.getId());
statusExceptionParam.setOrderNo(datasBean.getOrderNo());
statusExceptionParam.setPayMethodName("VISA測試");
statusExceptionParam.setPosAction(PosAction.TIP);
mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
}else{
mActivity.start(statusExceptionFragment);
}
}
});
// PosPay.tip(mActivity, mRootView, txnIdRequest,
// getTipsRequest(datasBean.getPayTxnId(), datasBean.getAmount(), Double.parseDouble(number)), new OnPosActionListener<AdjustTipRespose>() {
//
// @Override
// public void onPosSuccess(AdjustTipRespose response) {
// LoganManager.w_order(TAG, "onPosSuccess: " + response.toString());
// if(tipsListener != null){
// tipsListener.refeshOrders();
// }
// }
//
// @Override
// public void onPosException(AdjustTipRespose response,Exception e) {
// LoganManager.w_order(TAG, "onPosException: " + e.getMessage());
// PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.TIP);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }else{
// mActivity.start(statusExceptionFragment);
// }
// }
//
// @Override
// public void onPosInvalid(String e) {
// LoganManager.w_order(TAG, "onPosInvalid: " + e.toString());
// }
//
// @Override
// public void onUpdateStatusSuccess(AdjustTipRespose response) {
// LoganManager.w_order(TAG, "onUpdateStatusSuccess: " + response.toString());
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// LoganManager.w_order(TAG, "onUpdateStatusError: " + e.getMessage());
// PosActionStatusExceptionFragment statusExceptionFragment = (PosActionStatusExceptionFragment) mActivity.findFragment(PosActionStatusExceptionFragment.class);
// if (statusExceptionFragment == null) {
// PosActionStatusExceptionParam statusExceptionParam = new PosActionStatusExceptionParam();
// statusExceptionParam.setTxnId(datasBean.getPayTxnId());
// statusExceptionParam.setAmount(datasBean.getAmount());
// statusExceptionParam.setOrderId(datasBean.getId());
// statusExceptionParam.setOrderNo(datasBean.getOrderNo());
// statusExceptionParam.setPayMethodName("VISA測試");
// statusExceptionParam.setPosAction(PosAction.TIP);
// mActivity.loadRootFragment(R.id.rl_container, PosActionStatusExceptionFragment.newInstance(statusExceptionParam));
// }else{
// mActivity.start(statusExceptionFragment);
// }
// }
// });
}
}
})
......
library-order/src/main/java/com/gingersoft/gsa/cloud/order/order/DoshokuOrder.java
......@@ -44,7 +44,7 @@ public class DoshokuOrder extends BaseOrder {
private DoshokuOrder() {
super();
initBillStatus(false,false);
initBillStatus(false, false);
}
/**
......@@ -221,7 +221,7 @@ public class DoshokuOrder extends BaseOrder {
}
if (billItemStatusMap != null) {
billItemStatusMap.clear();
initBillStatus(false,false);
initBillStatus(false, false);
}
if (orderPlaced != null) {
orderPlaced = null;
......@@ -234,6 +234,10 @@ public class DoshokuOrder extends BaseOrder {
}
billHasChanged = false;
modifyOrder = false;
addPoints = 0.0f;
oldPoints = 0.0f;
nowPoints = 0.0f;
integralQrcode = null;
super.initialization();
}
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/PosPay.java
......@@ -42,9 +42,9 @@ public final class PosPay {
public static void sendRequest(IHywebAction action) {
CommandActivity.setCommand(new CommandImpl(action));
// if (AppDevice.isHywebPos()) {
if (action != null) {
action.onPosActionBefore();
}
// if (action != null) {
// action.onPosActionBefore();
// }
// } else if (AppDevice.isBBPos()) {
// } else {
// }
......@@ -55,15 +55,15 @@ public final class PosPay {
}
public void tip() {
PosPay.sendRequest(new TipsActionImpl(context, lifecycleView, PosAction.TIP, txnIdRequest, tipRequest, onPosActionListener, true));
// PosPay.sendRequest(new TipsActionImpl(context, lifecycleView, PosAction.TIP, txnIdRequest, tipRequest, onPosActionListener, true));
}
public void refund() {
PosPay.sendRequest(new RefundActionImpl(context, lifecycleView, PosAction.REFUND, request, getTxnIdRequest, onPosActionListener, true));
// PosPay.sendRequest(new RefundActionImpl(context, lifecycleView, PosAction.REFUND, request, getTxnIdRequest, onPosActionListener, true));
}
public void voidO() {
PosPay.sendRequest(new VoidActionImpl(context, lifecycleView, PosAction.VOID, request, getTxnIdRequest, onPosActionListener, true));
// PosPay.sendRequest(new VoidActionImpl(context, lifecycleView, PosAction.VOID, request, getTxnIdRequest, onPosActionListener, true));
}
public static void retrieval(Context context, IView lifecycleView, Long orderId, PosAction retrievalAction, RetrievalRequest request, OnPosActionListener onPosActionListener) {
......@@ -71,7 +71,7 @@ public final class PosPay {
}
public void printStub() {
PosPay.sendRequest(new PrintPaymentStubImpl(context, lifecycleView, PosAction.PRINT, txnId, onPosActionListener, true));
// PosPay.sendRequest(new PrintPaymentStubImpl(context, lifecycleView, PosAction.PRINT, txnId, onPosActionListener, true));
}
public void settlement() {
......
library-order/src/main/java/com/gingersoft/gsa/cloud/pay/pos/fragment/PosActionStatusExceptionFragment.java
......@@ -180,34 +180,34 @@ public class PosActionStatusExceptionFragment extends BaseFragment implements IV
private void retrievalStatus() {
RetrievalRequest retrievalRequest = new RetrievalRequest();
retrievalRequest.setTXN_ID(mPosStatusExceptionParam.getTxnId());
PosPay.retrieval(mContext, this, mPosStatusExceptionParam.getOrderId(), mPosStatusExceptionParam.getPosAction(),retrievalRequest, new OnPosActionListener() {
@Override
public void onPosSuccess(HywebPosResponse response) {
}
@Override
public void onPosException(HywebPosResponse response,Exception e) {
}
@Override
public void onPosInvalid(String e) {
}
@Override
public void onUpdateStatusSuccess(HywebPosResponse response) {
EventBus.getDefault().post(true,REFREAFSH_ORDER_EVENT);
tvPosStatus.setText(mPosStatusExceptionParam.getPosAction().getActionName() + "成功");
loadService.showSuccess();
setPosActionStatus(response.getSTATUS());
}
@Override
public void onUpdateStatusError(Throwable e) {
}
});
// PosPay.retrieval(mContext, this, mPosStatusExceptionParam.getOrderId(), mPosStatusExceptionParam.getPosAction(),retrievalRequest, new OnPosActionListener() {
//
// @Override
// public void onPosSuccess(HywebPosResponse response) {
//
// }
//
// @Override
// public void onPosException(HywebPosResponse response,Exception e) {
// }
//
// @Override
// public void onPosInvalid(String e) {
//
// }
//
// @Override
// public void onUpdateStatusSuccess(HywebPosResponse response) {
// EventBus.getDefault().post(true,REFREAFSH_ORDER_EVENT);
// tvPosStatus.setText(mPosStatusExceptionParam.getPosAction().getActionName() + "成功");
// loadService.showSuccess();
// setPosActionStatus(response.getSTATUS());
// }
//
// @Override
// public void onUpdateStatusError(Throwable e) {
// }
// });
}
@OnClick({R2.id.btn_back})
......
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