Skip to content

android / dayu

Go to a project
Commit 40374a06 by mReturn
Options

跳转工单验收逻辑，非客户验收工单，不再跳转二维码验收页

parent 1b692356
Inline Side-by-side
Showing with 72 additions and 1 deletions
orderCenter/src/main/java/com/dayu/order/api/protocol/Order.java
...@@ -44,6 +44,7 @@ public class Order implements Serializable{ ...@@ -44,6 +44,7 @@ public class Order implements Serializable{
private String customerTelphome; private String customerTelphome;
private int status; private int status;
private int subStatus; private int subStatus;
private int isCheck; //验收方式 0,自动 1,客户 2,商家
private int anyContacts; private int anyContacts;
private String spuName; private String spuName;
private int spuId; private int spuId;
...@@ -68,6 +69,14 @@ public class Order implements Serializable{ ...@@ -68,6 +69,14 @@ public class Order implements Serializable{
private double latitude; private double latitude;
private double longitude; private double longitude;
public int getIsCheck() {
return isCheck;
}
public void setIsCheck(int isCheck) {
this.isCheck = isCheck;
}
public double getLatitude() { public double getLatitude() {
return latitude; return latitude;
} }
......
orderCenter/src/main/java/com/dayu/order/api/protocol/OrderDetail.java
...@@ -83,6 +83,15 @@ public class OrderDetail implements Serializable { ...@@ -83,6 +83,15 @@ public class OrderDetail implements Serializable {
private int createProviderId; private int createProviderId;
private int version; private int version;
private int alerted; private int alerted;
private int isCheck;
public int getIsCheck() {
return isCheck;
}
public void setIsCheck(int isCheck) {
this.isCheck = isCheck;
}
public int getAlerted() { public int getAlerted() {
return alerted; return alerted;
......
orderCenter/src/main/java/com/dayu/order/common/SubmitCheckEvent.java 0 → 100644
package com.dayu.order.common;
public class SubmitCheckEvent {
}
orderCenter/src/main/java/com/dayu/order/presenter/multipleprocess/MultipleProcessPresenter.java
...@@ -12,6 +12,7 @@ import com.dayu.order.api.OrderApiFactory; ...@@ -12,6 +12,7 @@ import com.dayu.order.api.OrderApiFactory;
import com.dayu.order.api.protocol.OrderDetail; import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.ui.activity.QrCodeActivity; import com.dayu.order.ui.activity.QrCodeActivity;
import com.dayu.order.ui.activity.SignatureActivity; import com.dayu.order.ui.activity.SignatureActivity;
import com.dayu.provider.event.RefreshServe; import com.dayu.provider.event.RefreshServe;
...@@ -190,11 +191,16 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -190,11 +191,16 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()); RequestBody body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString());
OrderApiFactory.commitOrder(body).subscribe(baseObserver(integer -> { OrderApiFactory.commitOrder(body).subscribe(baseObserver(integer -> {
ToastUtils.showShortToast(R.string.process_order_success); ToastUtils.showShortToast(R.string.process_order_success);
EventBus.getDefault().post(new SubmitCheckEvent());
if (integer == 6) { if (integer == 6) {
if (mOrderDetail != null &&mOrderDetail.getIsCheck() == 1){
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.TYPE, 1); bundle.putInt(Constants.TYPE, 1);
bundle.putInt(Constants.ORDER_ID, mSpus.get(0).getOrderId()); bundle.putInt(Constants.ORDER_ID, mSpus.get(0).getOrderId());
mView.startActivity(QrCodeActivity.class, bundle); mView.startActivity(QrCodeActivity.class, bundle);
}else {
mView.dumpBack();
}
} else { } else {
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation(); ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
EventBus.getDefault().post(new RefreshServe(1)); EventBus.getDefault().post(new RefreshServe(1));
......
orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
...@@ -15,6 +15,7 @@ import com.dayu.base.ui.activity.BaseActivity; ...@@ -15,6 +15,7 @@ import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.adapter.PhotoViewAdapter; import com.dayu.base.ui.adapter.PhotoViewAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration; import com.dayu.base.ui.adapter.SpacesItemDecoration;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.databinding.ActivityMultiProcessOrderBinding; import com.dayu.order.databinding.ActivityMultiProcessOrderBinding;
import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderContract; import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderContract;
import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderPresenter; import com.dayu.order.presenter.multiprocessorder.MultiProcessOrderPresenter;
...@@ -27,6 +28,8 @@ import com.luck.picture.lib.PictureSelector; ...@@ -27,6 +28,8 @@ import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.config.PictureConfig; import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia; import com.luck.picture.lib.entity.LocalMedia;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -243,4 +246,9 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre ...@@ -243,4 +246,9 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
} }
return false; return false;
} }
@Subscribe
public void afterCheck(SubmitCheckEvent event){
finish();
}
} }
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerInfoActivity.java
...@@ -8,12 +8,15 @@ import com.dayu.common.Constants; ...@@ -8,12 +8,15 @@ import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.databinding.ActivityServerInfoBinding; import com.dayu.order.databinding.ActivityServerInfoBinding;
import com.dayu.order.presenter.serverinfo.ServerInfoContract; import com.dayu.order.presenter.serverinfo.ServerInfoContract;
import com.dayu.order.presenter.serverinfo.ServerInfoPresenter; import com.dayu.order.presenter.serverinfo.ServerInfoPresenter;
import com.dayu.order.ui.adapter.ServerInfoAdapter; import com.dayu.order.ui.adapter.ServerInfoAdapter;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
...@@ -68,4 +71,9 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi ...@@ -68,4 +71,9 @@ public class ServerInfoActivity extends BaseActivity<ServerInfoPresenter, Activi
.setPositiveButton(getString(R.string.next_step)); .setPositiveButton(getString(R.string.next_step));
dialog.show(); dialog.show();
} }
@Subscribe
public void afterCheck(SubmitCheckEvent event){
finish();
}
} }
orderCenter/src/main/java/com/dayu/order/ui/activity/ServerListActivity.java
...@@ -8,6 +8,7 @@ import com.dayu.common.Constants; ...@@ -8,6 +8,7 @@ import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.Spu; import com.dayu.order.api.protocol.Spu;
import com.dayu.order.common.OrderConstant; import com.dayu.order.common.OrderConstant;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.databinding.ActivityServerListBinding; import com.dayu.order.databinding.ActivityServerListBinding;
import com.dayu.order.databinding.ActivityServerListRecycleBinding; import com.dayu.order.databinding.ActivityServerListRecycleBinding;
import com.dayu.order.presenter.serverlist.ServerListContract; import com.dayu.order.presenter.serverlist.ServerListContract;
...@@ -15,6 +16,8 @@ import com.dayu.order.presenter.serverlist.ServerListPresenter; ...@@ -15,6 +16,8 @@ import com.dayu.order.presenter.serverlist.ServerListPresenter;
import com.dayu.widgets.CustomDialog; import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnItemClickListener; import com.dayu.widgets.listener.OnItemClickListener;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
...@@ -91,4 +94,9 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi ...@@ -91,4 +94,9 @@ public class ServerListActivity extends BaseActivity<ServerListPresenter, Activi
.setPositiveButton(getString(R.string.next_step)); .setPositiveButton(getString(R.string.next_step));
dialog.show(); dialog.show();
} }
@Subscribe
public void afterCheck(SubmitCheckEvent event){
finish();
}
} }
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
...@@ -193,7 +193,14 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -193,7 +193,14 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
holder.rlItemEnd.setVisibility(View.GONE); holder.rlItemEnd.setVisibility(View.GONE);
holder.orderLineOne.setVisibility(View.VISIBLE); holder.orderLineOne.setVisibility(View.VISIBLE);
holder.orderLineTwo.setVisibility(View.GONE); holder.orderLineTwo.setVisibility(View.GONE);
holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance)); // holder.itemUpdataTime.setText(mContext.getString(R.string.customer_acceptance));
if (item.getIsCheck() == 0){
holder.itemUpdataTime.setText("待自动验收");
}else if (item.getIsCheck() == 2){
holder.itemUpdataTime.setText("待商家验收");
}else {
holder.itemUpdataTime.setText("客户验收");
}
if (!haveCustomer) { if (!haveCustomer) {
holder.llBottom.setVisibility(View.GONE); holder.llBottom.setVisibility(View.GONE);
...@@ -277,11 +284,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi ...@@ -277,11 +284,17 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
String temp = time; String temp = time;
holder.rlItemMid.setOnClickListener(v -> { holder.rlItemMid.setOnClickListener(v -> {
if (item.getStatus() == 4 && item.getSubStatus() == 6) { if (item.getStatus() == 4 && item.getSubStatus() == 6) {
if (item.getIsCheck() == 0){
ToastUtils.showShortToast("请等待自动验收");
}else if (item.getIsCheck() == 2){
ToastUtils.showShortToast("请等待商家验收");
}else {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putInt(Constants.ORDER_ID, item.getId()); bundle.putInt(Constants.ORDER_ID, item.getId());
Intent intent = new Intent(mContext, QrCodeActivity.class); Intent intent = new Intent(mContext, QrCodeActivity.class);
intent.putExtra(Constants.BUNDLE, bundle); intent.putExtra(Constants.BUNDLE, bundle);
mContext.startActivity(intent); mContext.startActivity(intent);
}
} else { } else {
dumpSubcribeTimeActivity(id, position, item.getStatus(), temp); dumpSubcribeTimeActivity(id, position, item.getStatus(), temp);
//工单状态:1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭 //工单状态:1未接单2未预约3已预约4进行中5已完成6已取消7订单关闭
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderSecondTabFragment.java
...@@ -4,6 +4,7 @@ import com.dayu.base.ui.fragment.BaseFragment; ...@@ -4,6 +4,7 @@ import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants; import com.dayu.common.Constants;
import com.dayu.order.R; import com.dayu.order.R;
import com.dayu.order.api.protocol.Order; import com.dayu.order.api.protocol.Order;
import com.dayu.order.common.SubmitCheckEvent;
import com.dayu.order.databinding.FragmentCommomRecycleBinding; import com.dayu.order.databinding.FragmentCommomRecycleBinding;
import com.dayu.order.databinding.FragmentOrderdoingItemBinding; import com.dayu.order.databinding.FragmentOrderdoingItemBinding;
import com.dayu.order.presenter.orderdoing.OrderDoingPresenter; import com.dayu.order.presenter.orderdoing.OrderDoingPresenter;
...@@ -105,4 +106,9 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr ...@@ -105,4 +106,9 @@ public class OrderSecondTabFragment extends BaseFragment<OrderDoingPresenter, Fr
mBind.recyclerView.setData(mDatas); mBind.recyclerView.setData(mDatas);
mAdapter.setLoadMore(true); mAdapter.setLoadMore(true);
} }
@Subscribe
public void afterCheck(SubmitCheckEvent event){
mBind.recyclerView.Refresh();
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment