0904

orderCenter/src/main/java/com/dayu/order/api/OrderService.java

@@ -42,6 +42,7 @@ import com.dayu.order.api.protocol.data.ReceivePartData;
 import com.dayu.order.api.protocol.data.SendPartData;
 import com.dayu.order.common.OrderConstant;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.Observable;
@@ -470,9 +471,9 @@ public interface OrderService {
     /**
      * 工单sop列表项
      */
-    @GET(Constants.API_7200 + "/ordersRelationSpuItemSop")
-    Observable<BaseResponse<BasePageBean<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId
-            , @Query("pageSize") int pageSize);
+    @GET(Constants.API_7200 + "/ordersRelationSpuItemSop/list")
+    Observable<BaseResponse<ArrayList<SopListBean>>> getSopList(@Query("ordersRelationSpuItemId") int ordersRelationSpuItemId
+            , @Query("orderId") int orderId);
 
     /**
      * 工单sop列表项

orderCenter/src/main/java/com/dayu/order/api/protocol/Spu.java

@@ -34,14 +34,6 @@ public class Spu implements Serializable, Parcelable {
     private String productName;
     private boolean isHide = false;
 
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-
     private int ordersRelationSpuId;
     /**
      * 处理工单获取信息使用.
@@ -53,6 +45,14 @@ public class Spu implements Serializable, Parcelable {
     private String serialNumPicUrl;
     private String needShortVideo;
 
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
     public String getNeedShortVideo() {
         return needShortVideo;
     }

orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java

@@ -99,14 +99,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
 //        if (mSpu.getStatus() == 2) {
 //            getInfo();
 //        }
-//        if (mSpu.getSopStatus() == 1){
-//            mView.hideSOP(false);
-//        }else{
-//            mView.hideSOP(true);
-//        }
-//        if (isHide){
-//            mView.hideSOP(true);
-//        }
+        if (mSpu.getSopStatus() == 1){
+            mView.hideSOP(false);
+        }else{
+            mView.hideSOP(true);
+        }
+        if (isHide){
+            mView.hideSOP(true);
+        }
     }
 
     private void commitOrder(List<String> list, List<String> snList, String videoUrl) {
@@ -298,14 +298,14 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
         OrderApiFactory.getMultiProcessInfo(mId).subscribe(baseObserver(spu -> {
 
             mDetail.set(spu);
-//            if (mSpu.getSopStatus() == 1){
-//                mView.hideSOP(false);
-//            }else{
-//                mView.hideSOP(true);
-//            }
-//            if (isHide){
-//                mView.hideSOP(true);
-//            }
+            if (mSpu.getSopStatus() == 1){
+                mView.hideSOP(false);
+            }else{
+                mView.hideSOP(true);
+            }
+            if (isHide){
+                mView.hideSOP(true);
+            }
             mBrandName.set(spu.getBrandName());
             mView.setSnNumbers(spu.getSn());
 //            mSn.set(spu.getSn());

orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java

@@ -155,10 +155,10 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
     private void initData() {
         if (OrderConstant.sopListData == null) {
             showDialog();
-            Api.getService(OrderService.class).getSopList(mSopRid, 100).compose(Api.applySchedulers())
+            Api.getService(OrderService.class).getSopList(mSopRid, orderDetailId).compose(Api.applySchedulers())
                     .subscribe(mPresenter.baseObserver(datas -> {
-                        if (datas != null && datas.getData() != null) {
-                            OrderConstant.sopListData = datas.getData();
+                        if (datas != null) {
+                            OrderConstant.sopListData = datas;
                             setStepData();
                         }
                     }));
@@ -496,7 +496,6 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
                 if (mSpu != null) {
                     Intent intent = new Intent(mActivity, MultiProcessOrderActivity.class);
                     Bundle bundle = new Bundle();
-                    mSpu.setSopStatus(2);
                     bundle.putSerializable(OrderConstant.SPU, mSpu);
                     bundle.putParcelableArrayList(OrderConstant.SPUS, mSpus);
                     bundle.putParcelableArrayList(OrderConstant.SPUS_SOURCE, mBundle.getParcelableArrayList(OrderConstant.SPUS_SOURCE));

orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java

@@ -138,7 +138,6 @@ public class OperateDetailFragment extends BaseFragment<SImplePresenter, Fragmen
         //联系电话
         mBind.tvContactSeller.setOnClickListener(v -> {
 
-            //TODO 联系电话
             if (phoneNum == null || phoneNum.size() == 0){
                 ToastUtils.showShortToast(R.string.no_mobile);
             }else{

orderCenter/src/main/res/layout/activity_multi_process_order.xml

@@ -59,8 +59,7 @@
             android:onClick="@{()->presenter.dumpToSop()}"
             android:text="@string/sop_finish"
             android:textColor="@color/cl_white"
-            android:textSize="13.3sp"
-            android:visibility="@{presenter.mDetail.sopStatus == 1?View.VISIBLE:View.GONE}" />
+            android:textSize="13.3sp"/>
 
         <ScrollView
             android:layout_width="match_parent"