Commit 650fa8fb authored by zhang_z's avatar zhang_z

修复一个查询的问题;

parent 808de093
...@@ -285,7 +285,7 @@ interface ApiService { ...@@ -285,7 +285,7 @@ interface ApiService {
pageSize); pageSize);
@POST(C.URL.SALEORDER.addRemark) @POST(C.URL.SALEORDER.addRemark)
Observable<HttpMessage<String>> addRemark(@Query("orderNo") String orderNo, @Query("remark") String remark); Observable<HttpMessage<String>> addRemark(@Query("orderNo") String orderNo, @Query("orderDesc1") 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
......
...@@ -265,13 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -265,13 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, },
throwable -> { throwable -> {
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
} }
); );
...@@ -323,13 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -323,13 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, },
throwable -> { throwable -> {
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
} }
); );
...@@ -414,13 +414,13 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -414,13 +414,13 @@ public class SettlePresenter extends SettleContract.Presenter {
break; break;
default: default:
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), response.getMsg()));
mView.showPayFailFragment(null, mSaleorder); mView.showPayFailFragment(null, mSaleorder);
break; break;
} }
}, throwable -> { }, throwable -> {
//支付失败 //支付失败
ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()).subscribe(); subscribeRemark(ApiFactory.Saleorder.addRemark(mSaleorder.getOrderNo(), throwable.getMessage()));
mView.showPayFailFragment(throwable, mSaleorder); mView.showPayFailFragment(throwable, mSaleorder);
}); });
} }
...@@ -464,6 +464,20 @@ public class SettlePresenter extends SettleContract.Presenter { ...@@ -464,6 +464,20 @@ public class SettlePresenter extends SettleContract.Presenter {
.subscribe(this::paySucc, this::payFail); .subscribe(this::paySucc, this::payFail);
} }
/**
* 订阅支付
*
* @param observable 数据源
*/
private void subscribeRemark(Observable<String> observable) {
mView.showLoadingDialog();
observable.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(s -> {
}, throwable -> {
});
}
/** /**
* 提交订单 * 提交订单
*/ */
......
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