1.修改内部交易分页问题

app/src/main/java/com/wd/workoffice/contract/BatChooseInfoContract.java

@@ -28,7 +28,7 @@ public interface BatChooseInfoContract {
 
         Observable<BaseBean> getStock(Map<String,Object> param);
 
-        Observable<BaseBean> getTradingPro(String code);
+        Observable<BaseBean> getTradingPro(Map<String, Object> param );
 
         Observable<BaseBean> getTradingProList(Map<String,Object> param);
     }
@@ -55,7 +55,7 @@ public interface BatChooseInfoContract {
 
         void getStock(Map<String,Object> param);
 
-        void getTradingPro(String code);
+        void getTradingPro(Map<String, Object> param );
 
         void getTradingProList(Map<String,Object> param);
     }

app/src/main/java/com/wd/workoffice/model/BatChooseInfoModel.java

@@ -7,6 +7,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
 import java.util.Map;
 
 import io.reactivex.Observable;
+import retrofit2.http.QueryMap;
 
 /**
  * author : flexible
@@ -33,8 +34,8 @@ public class BatChooseInfoModel implements BatChooseInfoContract.Model {
     }
 
     @Override
-    public Observable<BaseBean> getTradingPro(String code) {
-        return RtfUtils.getRtf().tradingProDialog(code);
+    public Observable<BaseBean> getTradingPro( Map<String, Object> param ) {
+        return RtfUtils.getRtf().tradingProDialog(param);
     }
 
     @Override

app/src/main/java/com/wd/workoffice/presenter/BatChooseInfoPresenter.java

 package com.wd.workoffice.presenter;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.bean.ProcessBean;
 import com.wd.workoffice.bean.ProductBean;
@@ -114,9 +115,9 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
     }
 
     @Override
-    public void getTradingPro(String code) {
+    public void getTradingPro(Map<String, Object> param) {
         mView.showLoading();
-        mModel.getTradingPro(code).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        mModel.getTradingPro(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
                 mDisposable.add(d);
@@ -135,7 +136,8 @@ public class BatChooseInfoPresenter extends BasePresenter<BatChooseInfoContract.
                     mView.onError(data.getMessage());
                     return;
                 }
-                mView.getTradingPro(JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class));
+                ProductBean jsonData = JSON.parseObject(data.getData().toString(), ProductBean.class);
+                mView.getTradingPro(jsonData.getRecords());
             }
         });
     }

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -1176,13 +1176,20 @@ public interface ApiService {
     @GET("/stockQuantity/return-stock/page/list")
     Observable<BaseBean> tradingPro(@QueryMap Map<String, Object> param);
 
+//    /**
+//     * 获取产品去向(搜索置换产品)
+//     *
+//     * @return
+//     */
+//    @GET("/product/search-list")
+//    Observable<BaseBean> tradingProDialog(@QueryMap Map<String, Object> param);
     /**
      * 获取产品去向(搜索置换产品)
      *
      * @return
      */
-    @GET("/product/search-list")
-    Observable<BaseBean> tradingProDialog(@Query("soleCode") String soleCode);
+    @GET("/product/page/list")
+    Observable<BaseBean> tradingProDialog(@QueryMap Map<String, Object> param);
 
     /**
      * 获取产品去向(搜索置换产品)

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingProductActivity.java

@@ -220,28 +220,28 @@ public class StoreTradingProductActivity extends WorkToolBarActivity {
 
     private void getDialogDetail(TradingBean.RecordsBean soleCode) {
         showLoading();
-        RtfUtils.getRtf().tradingProDialog(soleCode.getProductSoleCode()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
-            @Override
-            public void doOnSubscribe(Disposable d) {
-            }
-
-            @Override
-            public void onFail(String errorMsg) {
-                hideLoading();
-                toast(errorMsg);
-            }
-
-            @Override
-            public void onSuccess(BaseBean data) {
-                hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
-                    return;
-                }
-                List<ProductBean.RecordsBean> productBean = JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class);
-                openDialog(soleCode, productBean);
-            }
-        });
+//        RtfUtils.getRtf().tradingProDialog(soleCode.getProductSoleCode()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+//            @Override
+//            public void doOnSubscribe(Disposable d) {
+//            }
+//
+//            @Override
+//            public void onFail(String errorMsg) {
+//                hideLoading();
+//                toast(errorMsg);
+//            }
+//
+//            @Override
+//            public void onSuccess(BaseBean data) {
+//                hideLoading();
+//                if (data.getCode() != 0) {
+//                    toast(data.getMessage());
+//                    return;
+//                }
+//                List<ProductBean.RecordsBean> productBean = JSON.parseArray(data.getData().toString(), ProductBean.RecordsBean.class);
+//                openDialog(soleCode, productBean);
+//            }
+//        });
     }
 
     @Override