水印参数orderId bug修改

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -205,6 +205,7 @@ public class Constants {
     public final static String ACCOUNT_BALANCE = "account_balance";
     public final static String ACCOUNT_ID = "accountId";
     public final static String ORDER_ID = "orderId";
+    public final static String ORDER_DETAIL_ID = "order_detail_id";
     public final static String ORDER_SOURCE = "order_source"; //1.服务站自建 4.小程序单 5.服务商自建 6.服务商EU单
     public final static String TO_DETAIL = "toDetail";
     public final static String DETAIL = "detail";

orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/OrderDoingPresenter.java

@@ -168,7 +168,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
     }
 
     @Override
-    public void getServerList(int id, int kaId) {
+    public void getServerList(int id, int kaId,int orderId) {
         mView.showDialog();
         OrderApiFactory.getServerList(id).subscribe(baseObserver(spus -> {
             Spu spu = spus.get(0);
@@ -178,6 +178,7 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
             }
             Bundle bundle = new Bundle();
             bundle.putInt(Constants.ORDER_ID, spu.getId());
+            bundle.putInt(Constants.ORDER_DETAIL_ID, orderId);
             bundle.putInt(Constants.STATE, 0);
             bundle.putSerializable(OrderConstant.SPU, spu);
             bundle.putParcelableArrayList(OrderConstant.SPUS, mUnFinishSpus);

orderCenter/src/main/java/com/dayu/order/presenter/orderdoing/orderDoingContract.java

@@ -52,6 +52,6 @@ public interface orderDoingContract {
          * 获取单任务列表.
          * @param id
          */
-        public abstract void getServerList(int id, int kaId);
+        public abstract void getServerList(int id, int kaId,int orderId);
     }
 }

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

@@ -4,13 +4,11 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 
-import com.amap.api.location.AMapLocation;
 import com.dayu.base.api.Api;
 import com.dayu.base.api.BaseApiFactory;
 import com.dayu.base.ui.activity.BaseActivity;
@@ -32,7 +30,6 @@ import com.dayu.order.databinding.ActivitySopLocalBinding;
 import com.dayu.provider.event.OrderState;
 import com.dayu.utils.CommonUtils;
 import com.dayu.utils.GlideImageLoader;
-import com.dayu.utils.LogUtils;
 import com.dayu.utils.MPermissionUtils;
 import com.dayu.utils.ToastUtils;
 import com.dayu.widgets.TextDialog;
@@ -51,10 +48,8 @@ import java.util.concurrent.TimeUnit;
 import cn.jzvd.Jzvd;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.functions.Consumer;
 
 import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
-import static com.dayu.order.common.OrderConstant.sopListData;
 
 public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopLocalBinding> {
     int mSopRid;
@@ -69,7 +64,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
     boolean canEdit = true;
 
     private int step = 1;
-    private int orderId;
+    private int orderDetailId; //订单id
 
     @Override
     public void setPresenter() {
@@ -101,7 +96,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
         requestPermission();
         mBundle = getIntent().getBundleExtra(Constants.BUNDLE);
         canEdit = mBundle.getBoolean(Constants.SOP_CAN_EDIT, true);
-        orderId = mBundle.getInt(Constants.ORDER_ID);
+        orderDetailId = mBundle.getInt(Constants.ORDER_DETAIL_ID);
         setInitStatus();
 //        showToast("edit: "+canEdit);
 //        showToast("id: "+id);
@@ -373,7 +368,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
             bean.setId(currentSop.getId());
             bean.setEngineerName(mUserInfo.getAccountName());
             bean.setMobile(mUserInfo.getMobile());
-            bean.setOrderId(orderId);
+            bean.setOrderId(orderDetailId);
             bean.setLatitude(location.getLatitude());
             bean.setLongitude(location.getLongitude());
             bean.setProvince(location.getProvince());

orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java

@@ -553,9 +553,9 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
                     mPresenter.sopOrderVersion = order.getVersion();
                     OrderConstant.isXlrOrder = order.getCreateProviderId() == Constants.XLR_PID;
                     if (order.getKaCompanyId() == null) {
-                        mPresenter.getServerList(spu.getId(), -1);
+                        mPresenter.getServerList(spu.getId(), -1,order.getId());
                     } else {
-                        mPresenter.getServerList(spu.getId(), order.getKaCompanyId());
+                        mPresenter.getServerList(spu.getId(), order.getKaCompanyId(),order.getId());
                     }
                 } else {
                     intent = new Intent(mContext, ServerListActivity.class);

userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java

@@ -349,15 +349,15 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
 
     //申请提现
     private void applyWithdraw() {
-//        if (TextUtils.isEmpty(userIdentity)) {
-//            showCertificationDialog();
-//            return;
-//        }
-//        if (!hasBankInfo) {
-//            String str = "请先完善您的银行卡信息才能提现";
-//            showBankAddrDialog(str, EditBankActivity.class);
-//            return;
-//        }
+        if (TextUtils.isEmpty(userIdentity)) {
+            showCertificationDialog();
+            return;
+        }
+        if (!hasBankInfo) {
+            String str = "请先完善您的银行卡信息才能提现";
+            showBankAddrDialog(str, EditBankActivity.class);
+            return;
+        }
         Bundle bundle = new Bundle();
         bundle.putString(Constants.URL, Constants.SCHEME_9099 + Constants.WITHDRAWAL_URL + "accountId=" + mUserInfo.getAccountId() +
                 "&token=" + mUserInfo.getToken());