Commit 85ab96a6 authored by zhang_z's avatar zhang_z

支付失败时,上传错误信息;

parent e554aa35
...@@ -288,6 +288,7 @@ public class C { ...@@ -288,6 +288,7 @@ public class C {
public static final String addOrderMis = ROOT_URL + "addOrderMis"; public static final String addOrderMis = ROOT_URL + "addOrderMis";
public static final String addOrderPayMis = ROOT_URL + "addOrderPayMis"; public static final String addOrderPayMis = ROOT_URL + "addOrderPayMis";
public static final String querySaleorderByVipId = ROOT_URL + "query"; public static final String querySaleorderByVipId = ROOT_URL + "query";
public static final String addRemark = ROOT_URL + "update";
} }
public final class PAY { public final class PAY {
......
...@@ -476,11 +476,14 @@ public final class ApiFactory { ...@@ -476,11 +476,14 @@ public final class ApiFactory {
return run(Api.getInstance().service.addOrderMis(saleorderParam)); return run(Api.getInstance().service.addOrderMis(saleorderParam));
} }
public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata.zzdpos.model.Saleorder.Pay saleorderPay) {
.zzdpos.model.Saleorder.Pay saleorderPay) {
return run(Api.getInstance().service.addOrderPayMis(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>> public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>>
querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) { querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
return run(Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber, return run(Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber,
...@@ -605,6 +608,7 @@ public final class ApiFactory { ...@@ -605,6 +608,7 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread()); .observeOn(AndroidSchedulers.mainThread());
} }
} }
public static class CsDetail { public static class CsDetail {
/** /**
* 添加库存盘点详情 * 添加库存盘点详情
......
...@@ -284,6 +284,8 @@ interface ApiService { ...@@ -284,6 +284,8 @@ interface ApiService {
("pageSize") int ("pageSize") int
pageSize); pageSize);
@POST(C.URL.SALEORDER.addRemark)
Observable<HttpMessage<String>> addRemark(@Query("orderNo") String orderNo, @Query("remark") String remark);
@POST(C.URL.USER.query) @POST(C.URL.USER.query)
Observable<HttpMessage<Pager<Vip>>> queryDetailByWD(@Query("wd") String keyword, @Query Observable<HttpMessage<Pager<Vip>>> queryDetailByWD(@Query("wd") String keyword, @Query
......
...@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle; ...@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle;
import android.view.MotionEvent; import android.view.MotionEvent;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -184,6 +185,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -184,6 +185,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
@Override @Override
public void showPayFailFragment(Throwable throwable, Saleorder saleorder) { public void showPayFailFragment(Throwable throwable, Saleorder saleorder) {
if (throwable != null) {
LogUtils.e(throwable.getMessage());
}
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);
mViewBinding.tvTitle.setText(R.string.settle_pay_result_title); mViewBinding.tvTitle.setText(R.string.settle_pay_result_title);
......
...@@ -265,11 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -265,11 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe();
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, },
throwable -> { throwable -> {
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe();
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
} }
); );
...@@ -321,11 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -321,11 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe();
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, },
throwable -> { throwable -> {
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe();
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
} }
); );
...@@ -396,7 +400,7 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -396,7 +400,7 @@ public class SettlePresenter extends SettleContract.Presenter {
// } // }
// }, // },
// throwable -> mView.showPayFailFragment(throwable, mSaleorder)); // throwable -> mView.showPayFailFragment(throwable, mSaleorder));
PayCenter.getInstance().query() PayCenter.getInstance().query(payType)
.doFinally(() -> mView.dismissLoadingDialog()) .doFinally(() -> mView.dismissLoadingDialog())
.subscribe(response -> { .subscribe(response -> {
switch (response.getCode()) { switch (response.getCode()) {
...@@ -410,9 +414,14 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -410,9 +414,14 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe();
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, throwable -> {
//支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe();
mView.showPayFailFragment(throwable, mSaleorder);
}); });
} }
......
...@@ -57,7 +57,7 @@ public final class SystemUtil { ...@@ -57,7 +57,7 @@ public final class SystemUtil {
e.printStackTrace(); e.printStackTrace();
} }
} }
return "test2019"; return "test2018";
// return deviceSN; // return deviceSN;
} }
......
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