增加寄回备件页面

24f6b543 · 罗翻 · 0338f017 · 24f6b543 · 24f6b543 · 24f6b543
Commit 24f6b543 authored Jan 25, 2018 by 罗翻
Showing with 427 additions and 84 deletions
annotation_lib/build/libs/annotation_lib.jar
app/src/main/java/com/dayu/bigfish/Constants.java
app/src/main/java/com/dayu/bigfish/api/APIService.java
app/src/main/java/com/dayu/bigfish/api/Api.java
app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java
app/src/main/java/com/dayu/bigfish/bean/OrderPart.java
app/src/main/java/com/dayu/bigfish/bean/ShipperCompany.java
app/src/main/java/com/dayu/bigfish/presenter/feedback/FeedBackPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartContract.java
app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartContract.java
app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java
app/src/main/java/com/dayu/bigfish/ui/LogisticsInfoActivity.java
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
app/src/main/java/com/dayu/bigfish/ui/ReturnPartActivity.java
app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java
app/src/main/java/com/dayu/bigfish/ui/fragment/ApplicationOrderPartFragment.java
app/src/main/java/com/dayu/bigfish/utils/UIUtils.java
--- a/annotation_lib/build/libs/annotation_lib.jar
+++ b/annotation_lib/build/libs/annotation_lib.jar
--- a/app/src/main/java/com/dayu/bigfish/Constants.java
+++ b/app/src/main/java/com/dayu/bigfish/Constants.java
@@ -139,7 +139,7 @@ public class Constants {
    /**
     * 获取厂商收货地址.
     */
-    public final static String KA_ADDRESS = "/api-message/" + "hXMessage/count/hxAccount/{hxAccount}";
+    public final static String KA_ADDRESS = "/api-ka-user/" + "companyAddress/default/companyId/{companyId}";
    /**
     * 申请备件.
@@ -181,6 +181,16 @@ public class Constants {
     */
    public final static String QUERY_LOGISTICS_INFO = "/api-base/" + "logisticsTraceInfo/queryLogisticsTraceInfo";
+    /**
+     * 查询物流信息.
+     */
+    public final static String QUERY_SHIPPER_COMPANY = "/api-base/" + "shipperCompany/queryShipperList";
+    /**
+     * 修改备件信息.
+     */
+    public final static String MODIFY_PART = "/api-ka-order/" + "kaOrderSpareParts";
    /***********************其他配置**********************************/
    public final static int PAGESIZE = 10;
@@ -226,7 +236,12 @@ public class Constants {
    public final static String ENGINEERINFO = "engineer_info";
    public final static String TYPE = "type";
-    public final static String DESCRIBE ="describe";
+    public final static String DESCRIBE = "describe";
+    public static final String PART_ID = "part_id";
+    public static final String SHIPPER_CODE = "shipper_code";
+    public static final String COURIER_NUM = "courier_num";
+    public static final String PART = "part";
    /**
     * 意见反馈.
@@ -262,5 +277,9 @@ public class Constants {
     */
    public final static int CANCEL = 5;
-    public static final String PART_ID = "part_id";
+    public static final int BYKA = 0;
+    public static final int BYMYSELF = 1;
+    public static final int BY_MODIFY_PART = 2;
 }
--- a/app/src/main/java/com/dayu/bigfish/api/APIService.java
+++ b/app/src/main/java/com/dayu/bigfish/api/APIService.java
@@ -17,6 +17,7 @@ import com.dayu.bigfish.bean.OrderDetail;
 import com.dayu.bigfish.bean.OrderPart;
 import com.dayu.bigfish.bean.OrderRecord;
 import com.dayu.bigfish.bean.ServerInstruction;
+import com.dayu.bigfish.bean.ShipperCompany;
 import com.dayu.bigfish.bean.Tab;
 import com.dayu.bigfish.bean.TodayAchievement;
 import com.dayu.bigfish.bean.TodayBalance;
@@ -416,7 +417,7 @@ public interface APIService {
     * @param body
     * @return
     */
-    @POST(Constants.RETURN_PART_BY_KA)
+    @PUT(Constants.RETURN_PART_BY_KA)
    Observable<BaseResponse<Boolean>> returnPartByKA(@Body RequestBody body);
    /**
@@ -426,8 +427,8 @@ public interface APIService {
     * @param modifyBy
     * @return
     */
-    @POST(Constants.RECEIVE_PART)
+    @PUT(Constants.RECEIVE_PART)
-    Observable<BaseResponse<Boolean>> receivePart(@Query("partsId") String partsId,
+    Observable<BaseResponse<Boolean>> receivePart(@Query("partsId") int partsId,
                                                  @Query("modifyBy") String modifyBy);
    /**
@@ -438,7 +439,7 @@ public interface APIService {
     * @return
     */
    @POST(Constants.REFUSE_ONE_PART)
-    Observable<BaseResponse<Boolean>> refusePart(@Query("kaOrderSparePartsId") String kaOrderSparePartsId,
+    Observable<BaseResponse<Boolean>> refusePart(@Query("kaOrderSparePartsId") long kaOrderSparePartsId,
                                                 @Query("reason") String reason);
    /**
@@ -452,6 +453,15 @@ public interface APIService {
    Observable<BaseResponse<List<OrderPart>>> queryPart(@Query("spOrderId") long spOrderId, @Query("sources") int sources);
    /**
+     * 修改备件信息.
+     *
+     * @param body
+     * @return
+     */
+    @PUT(Constants.MODIFY_PART)
+    Observable<BaseResponse<Boolean>> modifyPart(@Body RequestBody body);
+    /**
     * 查询物流信息.
     *
     * @return
@@ -459,6 +469,14 @@ public interface APIService {
    @GET(Constants.QUERY_LOGISTICS_INFO)
    Observable<BaseResponse<LogsticsInfo>> queryLogistics(@Query("com") String com, @Query("num") String num);
+    /**
+     * 查询物流公司.
+     *
+     * @return
+     */
+    @GET(Constants.QUERY_SHIPPER_COMPANY)
+    Observable<BaseResponse<List<ShipperCompany>>> queryShipperCompany();
    @Streaming
    @GET
    Observable<ResponseBody> download(@Url String url);

--- a/app/src/main/java/com/dayu/bigfish/api/Api.java
+++ b/app/src/main/java/com/dayu/bigfish/api/Api.java
@@ -139,6 +139,7 @@ public class Api {
        @Override
        public Response intercept(Chain chain) throws IOException {
+            //TODO token可能会有错.
            Request request = chain.request();
            UserInfo userInfo = UserManager.getInstance().getUser();
            if (userInfo != null) {
@@ -152,7 +153,6 @@ public class Api {
 //            Log.d("request_header", request.headers().toString());
            return chain.proceed(request);
        }
    }

--- a/app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java
+++ b/app/src/main/java/com/dayu/bigfish/bean/OrderDetail.java
@@ -69,8 +69,17 @@ public class OrderDetail implements Serializable {
    private String spuId;
    private Integer anyContacts;
    private Integer kaCompanyId;
+    private Integer createdSource; //1.服务商自己填写的工单2.厂商系统派3.ka系统4.小程序添加的工单
    private List<accessories> accessories;
+    public Integer getCreatedSource() {
+        return createdSource;
+    }
+    public void setCreatedSource(Integer createdSource) {
+        this.createdSource = createdSource;
+    }
    public int getId() {
        return id;
    }

--- a/app/src/main/java/com/dayu/bigfish/bean/OrderPart.java
+++ b/app/src/main/java/com/dayu/bigfish/bean/OrderPart.java
 package com.dayu.bigfish.bean;
+import java.io.Serializable;
 /**
 * Created by luofan on 2018/1/20.
 */
-public class OrderPart {
+public class OrderPart implements Serializable {
    private Integer id;
    private String partName;
    /**
@@ -38,6 +40,10 @@ public class OrderPart {
     */
    private Integer received;
    private int status;
+    /**
+     * 拒绝原因.
+     */
+    private String reson;
    /**
     * 物流发送方 1表示ka_to_sp 2表示sp_to_ka
@@ -172,5 +178,20 @@ public class OrderPart {
        this.id = id;
    }
+    public String getReason() {
+        return reson;
+    }
+    public void setReason(String reson) {
+        this.reson = reson;
+    }
+    public Integer getSources() {
+        return sources;
+    }
+    public void setSources(Integer sources) {
+        this.sources = sources;
+    }
 }
--- a/app/src/main/java/com/dayu/bigfish/bean/ShipperCompany.java
+++ b/app/src/main/java/com/dayu/bigfish/bean/ShipperCompany.java
+package com.dayu.bigfish.bean;
+/**
+ * Created by luofan on 2018/1/24.
+ */
+public class ShipperCompany {
+    private Integer id;
+    private String shipperCode;
+    private String shipperName;
+    private Integer status;
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getShipperCode() {
+        return shipperCode;
+    }
+    public void setShipperCode(String shipperCode) {
+        this.shipperCode = shipperCode;
+    }
+    public String getShipperName() {
+        return shipperName;
+    }
+    public void setShipperName(String shipperName) {
+        this.shipperName = shipperName;
+    }
+    public Integer getStatus() {
+        return status;
+    }
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}
--- a/app/src/main/java/com/dayu/bigfish/presenter/feedback/FeedBackPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/feedback/FeedBackPresenter.java
@@ -36,6 +36,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
    private int mType;
    private int mOrderId;
    private int mAccountId;
+    private int mPartId;
    @Override
    public void onAttached() {
@@ -45,6 +46,7 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
        Bundle bundle = mView.getBundle();
        mType = bundle.getInt(Constants.TYPE, 0);
        mOrderId = bundle.getInt(Constants.ORDER_ID, 0);
+        mPartId = bundle.getInt(Constants.PART_ID);
        switch (mType) {
            case Constants.FEED_BACK:
                mHint.set(UIUtils.getString(R.string.tv_idea_text_hint));
@@ -112,13 +114,17 @@ public class FeedBackPresenter extends FeedBackContract.Presenter {
    public void applyPart() {
        ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver((Consumer<Boolean>)
                aBoolean -> {
-                    mView.dumpBack(Constants.APPLY_PART, null);
+                    mView.dumpBack();
                    EventBus.getDefault().post(new RefreshApplyPart(1));
                }));
    }
    @Override
    public void refusePart() {
+        ApiFactory.refusePart(mPartId, mComment.get()).subscribe(baseObserver((Consumer<Boolean>)
+                aBoolean -> {
+                    mView.dumpBack();
+                    EventBus.getDefault().post(new RefreshApplyPart(1));
+                }));
    }
 }
--- a/app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/logisticsinfo/LogisticsInfoPresenter.java
 package com.dayu.bigfish.presenter.logisticsinfo;
 import android.databinding.ObservableField;
+import android.os.Bundle;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
@@ -16,12 +17,14 @@ import io.reactivex.functions.Consumer;
 public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
    private ObservableField<Object> datas = new ObservableField<>();
    private ObservableField<Object> headData = new ObservableField<>();
-    private String mLogisticsId;
+    private String mCourierNum;
+    private String mShipperCode;
    @Override
    public void onAttached() {
-//        Bundle bundle = mView.getBundle();
+        Bundle bundle = mView.getBundle();
-//        mLogisticsId = bundle.getString(Constants.PART_ID);
+        mCourierNum = bundle.getString(Constants.COURIER_NUM);
+        mShipperCode = bundle.getString(Constants.SHIPPER_CODE);
        mView.showDialog();
        queryLogisticsInfo();
    }
@@ -44,7 +47,7 @@ public class LogisticsInfoPresenter extends LogisticsInfoContract.Presenter {
    @Override
    public void queryLogisticsInfo() {
-        ApiFactory.queryLogistics("shunfeng", "767281300879").subscribe(baseObserver((Consumer<LogsticsInfo>)
+        ApiFactory.queryLogistics(mShipperCode, mCourierNum).subscribe(baseObserver((Consumer<LogsticsInfo>)
                        logsticsInfo -> {
                            datas.set(logsticsInfo.getLogistics());
                            headData.set(logsticsInfo);

--- a/app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartContract.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartContract.java
@@ -3,6 +3,7 @@ package com.dayu.bigfish.presenter.orderpart;
 import com.dayu.bigfish.base.BaseListPresenter;
 import com.dayu.bigfish.base.BaseView;
+import com.dayu.bigfish.bean.OrderPart;
 import io.reactivex.Observable;
@@ -20,17 +21,22 @@ public interface OrderPartContract {
        /**
         * 跳转到申请备件或寄回备件页面.
         */
-        public abstract void dumpToapplyPart();
+        public abstract void applyOrReturnPart();
+        /**
+         * 跳转到拒绝申请页面.
+         */
+        public abstract void dumpToRefusePart(int partId);
        /**
         * 跳转到寄回备件页面.
         */
-        public abstract void dumpToReturnPart(int type,Integer partId);
+        public abstract void dumpToReturnPart(int type, OrderPart part);
        /**
         * 查询物流信息.
         */
-        public abstract void queryLogistics();
+        public abstract void queryLogistics(String courierNum, String shipperCode);
        /**
         * 取消申请.
@@ -40,6 +46,7 @@ public interface OrderPartContract {
        /**
         * 收到备件.
         */
-        public abstract void receivePart();
+        public abstract Observable receivePart(int partId);
    }
 }
--- a/app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/orderpart/OrderPartPresenter.java
@@ -65,40 +65,56 @@ public class OrderPartPresenter extends OrderPartContract.Presenter {
    }
    @Override
-    public void dumpToapplyPart() {
+    public void applyOrReturnPart() {
        if (mType == 1) {
            Bundle bundle = new Bundle();
            bundle.putInt(Constants.ORDER_ID, mOrderId);
            bundle.putInt(Constants.TYPE, Constants.APPLY_PART);
            mView.startActivity(FeedBackActivity.class, bundle);
        } else if (mType == 2) {
-            dumpToReturnPart(0, null);
+            dumpToReturnPart(Constants.BYMYSELF, null);
        }
    }
    @Override
-    public void dumpToReturnPart(int type, Integer partId) {
+    public void dumpToRefusePart(int partId) {
        Bundle bundle = new Bundle();
        bundle.putInt(Constants.ORDER_ID, mOrderId);
        bundle.putInt(Constants.PART_ID, partId);
+        bundle.putInt(Constants.TYPE, Constants.REFUSE_PART);
+        mView.startActivity(FeedBackActivity.class, bundle);
+    }
+    @Override
+    public void dumpToReturnPart(int type, OrderPart part) {
+        Bundle bundle = new Bundle();
+        bundle.putInt(Constants.ORDER_ID, mOrderId);
        if (mCompanyId != null) {
            bundle.putInt(Constants.ID, mCompanyId);
        }
+        if (part != null) {
+            bundle.putSerializable(Constants.PART, part);
+        }
        bundle.putInt(Constants.TYPE, type);
        mView.startActivity(ReturnPartActivity.class, bundle);
    }
    @Override
-    public void queryLogistics() {
+    public void queryLogistics(String courierNum, String shipperCode) {
-        mView.startActivity(LogisticsInfoActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putString(Constants.COURIER_NUM, courierNum);
+        bundle.putString(Constants.SHIPPER_CODE, shipperCode);
+        mView.startActivity(LogisticsInfoActivity.class, bundle);
    }
    public Observable<Boolean> cancleApply(int partId) {
+        mView.showDialog();
        return ApiFactory.cancleApply(partId, mUserName);
    }
    @Override
-    public void receivePart() {
+    public Observable receivePart(int partId) {
+        mView.showDialog();
+        return ApiFactory.receivePart(partId, mUserName);
    }
 }
--- a/app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartContract.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartContract.java
 package com.dayu.bigfish.presenter.returnpart;
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.dayu.bigfish.base.BasePresenter;
 import com.dayu.bigfish.base.BaseView;
+import java.util.List;
 /**
 * Created by luo on 2016/8/4.
 */
 public interface ReturnPartContract {
    interface View extends BaseView {
+        /**
+         * 展示快递选择框.
+         * @param cardItem
+         * @param listener
+         */
+        void showCouriesDialog(List<String> cardItem, OptionsPickerView.OnOptionsSelectListener listener);
+        /**
+         * 关闭输入框.
+         */
+        void hideInput();
    }
    abstract class Presenter extends BasePresenter<View> {
@@ -22,5 +36,10 @@ public interface ReturnPartContract {
         * 跳转到厂商收货信息.
         */
        public abstract void dumpToKaInfo();
+        /**
+         * 获取快递公司.
+         */
+        public abstract void getCourier();
    }
 }
--- a/app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/returnpart/ReturnPartPresenter.java
@@ -6,13 +6,20 @@ import android.os.Bundle;
 import com.app.annotation.apt.InstanceFactory;
 import com.apt.ApiFactory;
 import com.dayu.bigfish.Constants;
+import com.dayu.bigfish.bean.OrderPart;
+import com.dayu.bigfish.bean.ShipperCompany;
 import com.dayu.bigfish.bean.UserInfo;
+import com.dayu.bigfish.bean.event.RefreshApplyPart;
 import com.dayu.bigfish.ui.KaAddressActivity;
 import com.dayu.bigfish.utils.managers.UserManager;
+import org.greenrobot.eventbus.EventBus;
 import org.json.JSONException;
 import org.json.JSONObject;
+import java.util.ArrayList;
+import java.util.List;
 import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
@@ -32,43 +39,64 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
    private String mKaComent;
    private UserInfo mInfo;
    private int mPartId;
+    private OrderPart mPart;
+    private String mShipperCode;
    @Override
    public void onAttached() {
+        mInfo = UserManager.getInstance().getUser();
        Bundle bundle = mView.getBundle();
        mKaId = bundle.getInt(Constants.ID);
        mOrderId = bundle.getInt(Constants.ORDER_ID);
        mType = bundle.getInt(Constants.TYPE);
-        mKaComent = bundle.getString(Constants.DESCRIBE);
+        mPart = (OrderPart) bundle.getSerializable(Constants.PART);
-        mPartId = bundle.getInt(Constants.PART_ID);
+        if (mPart != null) {
+            mPartId = mPart.getId();
+            mKaComent = mPart.getKaRemarks();
            kaComent.set(mKaComent);
-        mInfo = UserManager.getInstance().getUser();
+            kaComent.set(mPart.getKaRemarks());
+            spComent.set(mPart.getSpComment());
+            courierCompany.set(mPart.getCourierServicesCompany());
+            courierNum.set(mPart.getCourierNumber());
+        }
    }
    @Override
    public void retrunPart() {
+        mView.showDialog();
        JSONObject jsonObject = new JSONObject();
        try {
            jsonObject.put("courierNumber", courierNum.get());
            jsonObject.put("spComment", spComent.get());
            jsonObject.put("courierServicesCompany", courierCompany.get());
-            jsonObject.put("shipperCode", "");
+            jsonObject.put("shipperCode", mShipperCode);
-            jsonObject.put("kaRemarks", kaComent);
+            jsonObject.put("kaRemarks", kaComent.get());
            jsonObject.put("operater", mInfo.getAccountName());
            jsonObject.put("operaterId", mInfo.getAccountId());
+            if (mType == Constants.BY_MODIFY_PART) {
+                jsonObject.put("id", mPartId);
+            } else {
                jsonObject.put("partsId", mPartId);
+            }
            jsonObject.put("spOrderId", mOrderId);
        } catch (JSONException e) {
            e.printStackTrace();
        }
        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
-        if (mType == 1) {
+        if (mType == Constants.BYKA) {
            ApiFactory.returnPartByKA(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+                mView.dumpBack();
+                EventBus.getDefault().post(new RefreshApplyPart(1));
            }));
-        } else if (mType == 0) {
+        } else if (mType == Constants.BYMYSELF) {
            ApiFactory.returnPartSelf(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+                mView.dumpBack();
+                EventBus.getDefault().post(new RefreshApplyPart(1));
+            }));
+        } else if (mType == Constants.BY_MODIFY_PART) {
+            ApiFactory.modifyPart(requestBody).subscribe(baseObserver((Consumer<Boolean>) aBoolean -> {
+                mView.dumpBack();
+                EventBus.getDefault().post(new RefreshApplyPart(1));
            }));
        }
@@ -80,4 +108,22 @@ public class ReturnPartPresenter extends ReturnPartContract.Presenter {
        bundle.putInt(Constants.ID, mKaId);
        mView.startActivity(KaAddressActivity.class, bundle);
    }
+    @Override
+    public void getCourier() {
+        mView.showDialog();
+        mView.hideInput();
+        ApiFactory.queryShipperCompany().subscribe(baseObserver(this::showCouriesDialog));
+    }
+    private void showCouriesDialog(List<ShipperCompany> shipperCompany) {
+        List<String> list = new ArrayList<>();
+        for (ShipperCompany sc : shipperCompany) {
+            list.add(sc.getShipperName());
+        }
+        mView.showCouriesDialog(list, (options1, options2, options3, v) -> {
+            courierCompany.set(list.get(options1));
+            mShipperCode = shipperCompany.get(options1).getShipperCode();
+        });
+    }
 }
--- a/app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/serverinstruction/ServerInstructionPresenter.java
@@ -30,18 +30,6 @@ public class ServerInstructionPresenter extends ServerInstructionContract.Presen
    @Override
    public void onAttached() {
-//        instructions = new ArrayList<>();
-//        ServerInstruction instruction = new ServerInstruction();
-//        instruction.setUrl("https://www.baidu.com");
-//        instruction.setTitle("OPPOR9手机维修拆机教程字幕详解");
-//        ServerInstruction instruction1 = new ServerInstruction();
-//        instruction1.setTitle("iPhone6 手机维修教程字幕详解");
-//        ServerInstruction instruction2 = new ServerInstruction();
-//        instruction2.setTitle("2017年-诺基亚A3500型号拆机维修教2017年-诺基亚A3500型号拆机维修教");
-//        instructions.add(instruction);
-//        instructions.add(instruction1);
-//        instructions.add(instruction2);
-//        mDatas.set(instructions);
        Bundle bundle = mView.getBundle();
        mOrderId = bundle.getInt(Constants.ORDER_ID);
        getInstructs();

--- a/app/src/main/java/com/dayu/bigfish/ui/LogisticsInfoActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/LogisticsInfoActivity.java
@@ -21,11 +21,5 @@ public class LogisticsInfoActivity extends BaseActivity<LogisticsInfoPresenter, 
    public void initView() {
        LogisticsAdapter adapter = new LogisticsAdapter(false);
        mBind.lvPart.setAdapter(adapter);
-//        mPresenter.headData.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
-//            @Override
-//            public void onPropertyChanged(Observable observable, int i) {
-//                mBind.lvPart.setHeadData(mPresenter.headData.get());
-//            }
-//        });
    }
 }
--- a/app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
@@ -3,6 +3,7 @@ package com.dayu.bigfish.ui;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.view.View;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.base.BaseActivity;
@@ -51,6 +52,10 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
        mFragments.add(orderDatailsServeFragment);
        mFragments.add(mOrderPartFragment);
        mBind.titleBack.setOnClickListener(v -> dumpBack());
+        if (detail.getCreatedSource() != 3) {
+            mBind.btnPart.setVisibility(View.GONE);
+            mBind.btnServer.setBackgroundResource(R.drawable.detail_end_selector);
+        }
        initBtn();
        addFragment();
    }

--- a/app/src/main/java/com/dayu/bigfish/ui/ReturnPartActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/ReturnPartActivity.java
 package com.dayu.bigfish.ui;
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.dayu.bigfish.R;
 import com.dayu.bigfish.base.BaseActivity;
 import com.dayu.bigfish.databinding.ActivityReturnPartBinding;
 import com.dayu.bigfish.presenter.returnpart.ReturnPartContract;
 import com.dayu.bigfish.presenter.returnpart.ReturnPartPresenter;
+import com.dayu.bigfish.utils.UIUtils;
+import java.util.List;
 /**
 * Created by luofan on 2018/1/20.
 */
-public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter,ActivityReturnPartBinding> implements ReturnPartContract.View{
+public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter, ActivityReturnPartBinding> implements ReturnPartContract.View {
    @Override
    public int getLayoutId() {
        return R.layout.activity_return_part;
@@ -20,4 +24,20 @@ public class ReturnPartActivity extends BaseActivity<ReturnPartPresenter,Activit
    public void initView() {
    }
+    @Override
+    public void showCouriesDialog(List<String> cardItem, OptionsPickerView.OnOptionsSelectListener listener) {
+        //条件选择器
+        OptionsPickerView pvOptions = new OptionsPickerView.Builder(this, listener)
+                .setContentTextSize(18)
+                .setLineSpacingMultiplier(2.0f)
+                .build();
+        pvOptions.setPicker(cardItem);
+        pvOptions.show();
+    }
+    @Override
+    public void hideInput() {
+        UIUtils.hideInput(mActivity);
+    }
 }
--- a/app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/adapter/OrderPartAdapter.java
--- a/app/src/main/java/com/dayu/bigfish/ui/fragment/ApplicationOrderPartFragment.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/fragment/ApplicationOrderPartFragment.java
@@ -42,6 +42,7 @@ public class ApplicationOrderPartFragment extends BaseFragment<OrderPartPresente
    @Override
    protected void lazyLoad() {
        super.lazyLoad();
+        showDialog();
        mPresenter.queryPartList();
    }

--- a/app/src/main/java/com/dayu/bigfish/utils/UIUtils.java
+++ b/app/src/main/java/com/dayu/bigfish/utils/UIUtils.java
 package com.dayu.bigfish.utils;
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Paint;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
 import com.dayu.bigfish.MyApplication;
@@ -89,6 +91,12 @@ public class UIUtils {
            return false;
        }
    }
+    public static void hideInput(Activity activity) {
+        InputMethodManager imm = (InputMethodManager) activity
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(), 0);
+    }
 }
--- a/app/src/main/res/layout/activity_ka_address_layout.xml
+++ b/app/src/main/res/layout/activity_ka_address_layout.xml
@@ -19,7 +19,9 @@
            <TextView
                android:id="@+id/text_idea"
-                style="@style/text_title" />
+                style="@style/text_title"
+                android:text="@string/ka_info"
+                />
            <ImageView
                android:id="@+id/title_back"
@@ -44,15 +46,17 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_weight="1"
+                android:layout_marginRight="53dp"
                android:text="@string/ka_name"
                android:textColor="@color/default_text_color"
                android:textSize="15sp" />
            <TextView
                android:id="@+id/tv_ka_name"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                android:layout_height="wrap_content"
+                android:gravity="left"
                android:layout_marginRight="@dimen/dp_15"
                android:text="@{presenter.data.name}"
                android:textColor="@color/default_editext_color"
@@ -76,15 +80,17 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_weight="1"
+                android:layout_marginRight="38dp"
                android:text="@string/ka_mobile"
                android:textColor="@color/default_text_color"
                android:textSize="15sp" />
            <TextView
                android:id="@+id/tv_ka_mobile"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
                android:layout_marginRight="15dp"
                android:text="@{presenter.data.mobile}"
                android:textSize="15sp" />
@@ -108,15 +114,17 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginLeft="@dimen/dp_10"
-                android:layout_weight="1"
+                android:layout_marginRight="38dp"
                android:text="@string/ka_address"
                android:textColor="@color/default_text_color"
                android:textSize="15sp" />
            <TextView
                android:id="@+id/tv_ka_address"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
                android:layout_marginRight="15dp"
                android:text='@{presenter.data.provinceName+presenter.data.cityName+presenter.data.districtName+presenter.data.address}'
                android:textSize="15sp" />

--- a/app/src/main/res/layout/activity_order_details.xml
+++ b/app/src/main/res/layout/activity_order_details.xml
@@ -9,9 +9,7 @@
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
+            android:orientation="horizontal">
-            android:layout_marginRight="50dp"
-            android:layout_marginTop="@dimen/dp_12">
            <ImageView
                android:id="@+id/title_back"
@@ -22,14 +20,21 @@
                android:layout_marginRight="25dp"
                android:src="@mipmap/back_btn_normal" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp"
+                android:layout_marginRight="50dp"
+                android:layout_marginTop="@dimen/dp_12"
+                android:gravity="center">
                <Button
                    android:id="@+id/btn_detail"
                    android:layout_width="90dp"
                    android:layout_height="28dp"
                    android:background="@drawable/detail_first_selector"
                    android:gravity="center"
-                android:text="@string/order_detail"
+                    android:text="@string/order_detail" />
-               />
                <Button
                    android:id="@+id/btn_server"
@@ -48,6 +53,8 @@
                    android:gravity="center"
                    android:text="@string/order_part" />
            </LinearLayout>
+        </LinearLayout>
        <FrameLayout
            android:id="@+id/fl_container"

--- a/app/src/main/res/layout/activity_return_part.xml
+++ b/app/src/main/res/layout/activity_return_part.xml
@@ -18,8 +18,7 @@
        <RelativeLayout
            android:id="@+id/title_back"
-            style="@style/title"
+            style="@style/title">
-            android:onClick="@{()->presenter.dumpBack()}">
            <TextView
                android:id="@+id/tv_title"
@@ -28,16 +27,20 @@
            <ImageView
                android:id="@+id/receiving_back"
-                style="@style/title_image_back" />
+                style="@style/title_image_back"
+                android:onClick="@{()->presenter.dumpBack()}" />
            <TextView
                android:id="@+id/tv_right_title"
                style="@style/title_right_text"
+                android:onClick="@{()->presenter.retrunPart()}"
                android:text="@string/submit"
                android:textColor="@color/cl_home_button"
                android:textSize="15sp" />
        </RelativeLayout>
+        <ImageView style="@style/card_line" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="76dp"
@@ -73,7 +76,7 @@
        <LinearLayout
            android:layout_width="match_parent"
-            android:layout_height="76dp"
+            android:layout_height="105dp"
            android:layout_marginBottom="@dimen/dp_10"
            android:background="@color/cl_white"
            android:orientation="horizontal">
@@ -81,20 +84,22 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
                android:paddingLeft="@dimen/dp_15"
-                android:paddingRight="38dp"
+                android:paddingRight="28dp"
-                android:paddingTop="@dimen/dp_20"
                android:text="@string/sp_beizhu"
                android:textColor="@color/default_text_color"
                android:textSize="15sp" />
-            <TextView
+            <EditText
                android:id="@+id/sp_beizhu"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                android:layout_height="match_parent"
+                android:layout_marginTop="20dp"
+                android:background="@null"
+                android:gravity="top"
                android:hint="请说明寄回内容，数量和寄回原因"
                android:paddingRight="@dimen/dp_15"
-                android:paddingTop="@dimen/dp_20"
                android:text="@={presenter.spComent}"
                android:textColor="@color/default_editext_color"
                android:textSize="15sp" />
@@ -118,14 +123,23 @@
            <TextView
                android:id="@+id/couries_compay"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                android:layout_height="match_parent"
+                android:layout_weight="1"
                android:gravity="center_vertical"
                android:hint="@string/couries_company_hint"
+                android:onClick="@{()->presenter.getCourier()}"
                android:paddingRight="@dimen/dp_15"
                android:text="@={presenter.courierCompany}"
                android:textColor="@color/default_editext_color"
                android:textSize="15sp" />
+            <ImageView
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:src="@mipmap/icon_arrow_right" />
        </LinearLayout>
        <View
@@ -150,12 +164,14 @@
                android:textColor="@color/default_text_color"
                android:textSize="15sp" />
-            <TextView
+            <EditText
                android:id="@+id/logistics_num"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
+                android:background="@null"
                android:gravity="center_vertical"
                android:hint="@string/couries_num_hint"
+                android:inputType="number"
                android:paddingRight="@dimen/dp_15"
                android:text="@={presenter.courierNum}"
                android:textColor="@color/default_editext_color"

--- a/app/src/main/res/layout/fragment_order_application_part.xml
+++ b/app/src/main/res/layout/fragment_order_application_part.xml
@@ -30,7 +30,7 @@
            android:text="@{presenter.title}"
            android:textColor="@color/white"
            android:textSize="@dimen/sp_16"
-            android:onClick="@{()->presenter.dumpToapplyPart()}"
+            android:onClick="@{()->presenter.applyOrReturnPart()}"
            android:background="@color/cl_home_button"
            />
    </LinearLayout>

--- a/app/src/main/res/layout/item_apply_part_layout.xml
+++ b/app/src/main/res/layout/item_apply_part_layout.xml
@@ -11,8 +11,8 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="@color/cl_white"
        android:layout_marginBottom="@dimen/dp_10"
+        android:background="@color/cl_white"
        android:orientation="vertical">
        <RelativeLayout
@@ -48,6 +48,7 @@
            android:background="@color/line_color" />
        <LinearLayout
+            android:id="@+id/ll_apply_info"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginLeft="@dimen/dp_15"
@@ -146,6 +147,30 @@
                    android:textColor="@color/default_text_color"
                    android:textSize="14sp" />
            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_refuse_reason"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_15"
+                android:orientation="horizontal"
+                android:visibility="gone">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/refuse_apply_reason"
+                    android:textColor="@color/default_editext_color"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/refuse_apply_reason"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_12"
+                    android:text="显示器坏了，必须要换了！"
+                    android:textColor="@color/default_text_color"
+                    android:textSize="14sp" />
            </LinearLayout>
            <View
@@ -156,6 +181,8 @@
                android:layout_marginLeft="@dimen/dp_15"
                android:background="@color/line_color" />
+        </LinearLayout>
        <LinearLayout
            android:id="@+id/ll_send_info"
            android:layout_width="match_parent"
@@ -166,6 +193,7 @@
            android:orientation="vertical">
            <LinearLayout
+                android:id="@+id/ll_ka_instraction"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_12"
@@ -189,6 +217,32 @@
            </LinearLayout>
            <LinearLayout
+                android:id="@+id/ll_sp_instruction"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_12"
+                android:orientation="horizontal"
+                android:visibility="gone">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/tv_sp_instruction"
+                    android:textColor="@color/default_editext_color"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/sp_instruction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_12"
+                    android:text="显示器坏了，必须要换了！"
+                    android:textColor="@color/default_text_color"
+                    android:textSize="14sp" />
+            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_sender"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_12"
@@ -212,6 +266,7 @@
            </LinearLayout>
            <LinearLayout
+                android:id="@+id/ll_sender_mobile"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_12"
@@ -235,6 +290,7 @@
            </LinearLayout>
            <LinearLayout
+                android:id="@+id/ll_need_return"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_15"
@@ -259,6 +315,7 @@
            </LinearLayout>
            <LinearLayout
+                android:id="@+id/ll_couries_company"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginBottom="@dimen/dp_15"
@@ -283,8 +340,10 @@
            </LinearLayout>
            <LinearLayout
+                android:id="@+id/ll_part_num"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_15"
                android:orientation="horizontal">
                <TextView
@@ -302,8 +361,31 @@
                    android:text="显示器坏了，必须要换了！"
                    android:textColor="@color/default_text_color"
                    android:textSize="14sp" />
            </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_send_refuse_reason"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/dp_15"
+                android:orientation="horizontal"
+                android:visibility="gone">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/refuse_apply_reason"
+                    android:textColor="@color/default_editext_color"
+                    android:textSize="14sp" />
+                <TextView
+                    android:id="@+id/refuse_send_reason"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_12"
+                    android:text="显示器坏了，必须要换了！"
+                    android:textColor="@color/default_text_color"
+                    android:textSize="14sp" />
            </LinearLayout>
            <View
@@ -313,6 +395,7 @@
                android:layout_marginLeft="@dimen/dp_15"
                android:layout_marginTop="@dimen/dp_15"
                android:background="@color/line_color" />
+        </LinearLayout>
        <LinearLayout
            android:layout_width="match_parent"
@@ -326,10 +409,9 @@
                android:id="@+id/logistics_info"
                android:layout_width="75dp"
                android:layout_height="27dp"
+                android:layout_marginRight="10dp"
                android:background="@drawable/btn_blue_react"
                android:gravity="center"
-                android:layout_marginRight="10dp"
-                android:onClick="@{()->presenter.queryLogistics()}"
                android:text="物流信息"
                android:textColor="#FF3A3A3A"
                android:textSize="13sp"

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -217,7 +217,7 @@
    <string name="no_data">暂无数据</string>
    <string name="application_order_part">申请备件</string>
    <string name="return_order_part">寄回备件</string>
-    <string name="ka_address">厂商收货地址</string>
+    <string name="ka_address">收货地址</string>
    <string name="ka_name">收货人</string>
    <string name="ka_mobile">联系方式</string>
    <string name="ka_receive_address">收货地址</string>
@@ -227,7 +227,9 @@
    <string name="tv_apply_name">申请人:&#160;&#160;&#160;&#160;</string>
    <string name="tv_apply_mobile">联系方式:</string>
    <string name="tv_apply_time">申请时间:</string>
+    <string name="refuse_apply_reason">拒绝原因:</string>
    <string name="tv_ka_instruction">厂商说明:</string>
+    <string name="tv_sp_instruction">服务商说明:</string>
    <string name="tv_ka_name">发货人:&#160;&#160;&#160;&#160;</string>
    <string name="tv_need_return">需要寄回:</string>
    <string name="tv_part_num">快递单号:</string>
@@ -251,6 +253,9 @@
    <string name="receive_part">收到备件</string>
    <string name="cannot_return">无法寄回?</string>
    <string name="part_cancle_reason">取消之后不可复原，请谨慎操作</string>
+    <string name="part">备件</string>
+    <string name="send_already">已发货</string>
+    <string name="modify_part_info">修改信息</string>
    <!--消息-->

--- a/apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java
+++ b/apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java
@@ -10,6 +10,7 @@ import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import java.io.IOException;
+import java.util.Objects;
 import javax.annotation.processing.FilerException;
 import javax.annotation.processing.RoundEnvironment;
@@ -58,7 +59,7 @@ public class ApiFactoryProcessor implements IProcessor {
                                        + ".compose($T.applySchedulers())"
                                , ClassName.get("com.dayu.bigfish.api", "Api")
                                , e.getSimpleName().toString()
-                                , paramsString.substring(0, paramsString.length() - 1)
+                                , Objects.equals(paramsString, "") ? "" : paramsString.substring(0, paramsString.length() - 1)
                                , ClassName.get("com.dayu.bigfish.api", "Api"));
                    } else {
                        methodBuilder.addStatement(