Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -288,6 +288,7 @@ public class C {
             public static final String addOrderMis = ROOT_URL + "addOrderMis";
             public static final String addOrderPayMis = ROOT_URL + "addOrderPayMis";
             public static final String querySaleorderByVipId = ROOT_URL + "query";
+            public static final String addRemark = ROOT_URL + "update";
         }
 
         public final class PAY {

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -476,11 +476,14 @@ public final class ApiFactory {
             return run(Api.getInstance().service.addOrderMis(saleorderParam));
         }
 
-        public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata
-                                                                                             .zzdpos.model.Saleorder.Pay saleorderPay) {
+        public static Observable<com.xingdata.zzdpos.model.Saleorder> addOrderPayMis(com.xingdata.zzdpos.model.Saleorder.Pay 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>>
         querySaleorderByVipId(Long vipId, int pageNumber, int pageSize) {
             return run(Api.getInstance().service.querySaleorderByVipId(vipId, pageNumber,
@@ -605,6 +608,7 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread());
         }
     }
+
     public static class CsDetail {
         /**
          * 添加库存盘点详情

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -284,6 +284,8 @@ interface ApiService {
                                                                             ("pageSize") int
                                                                             pageSize);
 
+    @POST(C.URL.SALEORDER.addRemark)
+    Observable<HttpMessage<String>> addRemark(@Query("orderNo") String orderNo, @Query("orderDesc1") String remark);
 
     @POST(C.URL.USER.query)
     Observable<HttpMessage<Pager<Vip>>> queryDetailByWD(@Query("wd") String keyword, @Query

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.settle;
 import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -184,6 +185,9 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void showPayFailFragment(Throwable throwable, Saleorder saleorder) {
+        if (throwable != null) {
+            LogUtils.e(throwable.getMessage());
+        }
         this.start(mPayResultFragment.setResult(false).setSaleorder(saleorder));
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
         mViewBinding.tvTitle.setText(R.string.settle_pay_result_title);

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -265,11 +265,13 @@ public class SettlePresenter extends SettleContract.Presenter {
                             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);
                 }
         );
@@ -321,11 +323,13 @@ public class SettlePresenter extends SettleContract.Presenter {
                             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);
                 }
         );
@@ -396,7 +400,7 @@ public class SettlePresenter extends SettleContract.Presenter {
 //                            }
 //                        },
 //                        throwable -> mView.showPayFailFragment(throwable, mSaleorder));
-        PayCenter.getInstance().query()
+        PayCenter.getInstance().query(payType)
                 .doFinally(() -> mView.dismissLoadingDialog())
                 .subscribe(response -> {
                     switch (response.getCode()) {
@@ -410,9 +414,14 @@ public class SettlePresenter extends SettleContract.Presenter {
                             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);
                 });
     }
 
@@ -455,6 +464,20 @@ public class SettlePresenter extends SettleContract.Presenter {
                 .subscribe(this::paySucc, this::payFail);
     }
 
+    /**
+     * 订阅支付
+     *
+     * @param observable 数据源
+     */
+    private void subscribeRemark(Observable<String> observable) {
+        mView.showLoadingDialog();
+        observable.doFinally(() -> mView.dismissLoadingDialog())
+                .subscribe(s -> {
+                }, throwable -> {
+                });
+    }
+
+
     /**
      * 提交订单
      */

pay/src/main/java/com/xingdata/zxpay/PayCenter.java

@@ -68,10 +68,10 @@ public class PayCenter {
      *
      * @return 查询结果的Observable
      */
-    public Observable<Response> query() {
+    public Observable<Response> query(int payChannel) {
         switch (mShopppp.getHost().getHostMapId()) {
             case C.HOST.PAX:
-                return Factory.query();
+                return Factory.query(payChannel);
             default:
                 return Observable.just(new Response(C.PAY_STATE.FAIL_CUSTOM, "未知渠道"));
         }

pay/src/main/java/com/xingdata/zxpay/pax/Factory.java

@@ -95,10 +95,21 @@ public class Factory extends com.xingdata.zxpay.api.Factory {
      *
      * @return 查询结果
      */
-    public static Observable<com.xingdata.zxpay.api.Response> query() {
+    public static Observable<com.xingdata.zxpay.api.Response> query(int payChannel) {
         Request request = Request.create(C.METHOD.QUERY);
         request.setOutTransactionNo(PayCenter.getInstance().mShopppp.getPosppp().getHposTrace());
         request.setTimeStart(orderMap.get(request.getOutTransactionNo()));
+        switch (payChannel) {
+            case com.xingdata.zxpay.C.PAY_CHANNEL.ALI:
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyAlipay());
+                break;
+            case com.xingdata.zxpay.C.PAY_CHANNEL.WECHAT:
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyWechat());
+                break;
+            case com.xingdata.zxpay.C.PAY_CHANNEL.BANK:
+                request.setKey(PayCenter.getInstance().mShopppp.getHshopKeyUnipay());
+                break;
+        }
         request.sign();
         return run(Api.getInstance().service.action(request))
                 .map(new ResultFilter());