Commit 1f6e49aa by 宁斌

账单管理页面调整

parent 68af5eba
...@@ -26,6 +26,8 @@ public interface AllOrderContract { ...@@ -26,6 +26,8 @@ public interface AllOrderContract {
void setAllOrderAdapter(DefaultAdapter adapter); void setAllOrderAdapter(DefaultAdapter adapter);
String getOrderType(); String getOrderType();
String getStatusByFragmentIndex();
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
......
...@@ -35,15 +35,19 @@ public interface OrderCenterContract { ...@@ -35,15 +35,19 @@ public interface OrderCenterContract {
AllOrderFragment getCurrentOrderFragment(); AllOrderFragment getCurrentOrderFragment();
int getCurrentFragmentIndex();
String getStatusByFragmentIndex();
int getPageSize(); int getPageSize();
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel { interface Model extends IModel {
Observable<BaseResult> loadOrderList(int restaurantId, String orderType, int pageIndex, int pageSize); Observable<BaseResult> loadOrderList(int restaurantId, String orderType,String status, int pageIndex, int pageSize);
Observable<BaseResult> cancelOrder(long orderId, int restaurantId, String orderType); Observable<BaseResult> cancelOrder(long orderId, int restaurantId, String orderType,String status);
} }
} }
...@@ -50,20 +50,20 @@ public class OrderCenterModel extends BaseModel implements OrderCenterContract.M ...@@ -50,20 +50,20 @@ public class OrderCenterModel extends BaseModel implements OrderCenterContract.M
} }
@Override @Override
public Observable<BaseResult> loadOrderList(int restaurantId,String orderType, int pageIndex, int pageSize) { public Observable<BaseResult> loadOrderList(int restaurantId,String orderType,String status, int pageIndex, int pageSize) {
return mRepositoryManager.obtainRetrofitService(OrderService.class) return mRepositoryManager.obtainRetrofitService(OrderService.class)
.loadOrderList(restaurantId, orderType,pageIndex, pageSize); .loadOrderList(restaurantId, orderType,status,pageIndex, pageSize);
} }
@Override @Override
public Observable<BaseResult> cancelOrder(long orderId, int restaurantId,String orderType) { public Observable<BaseResult> cancelOrder(long orderId, int restaurantId,String orderType,String status) {
return mRepositoryManager.obtainRetrofitService(OrderService.class) return mRepositoryManager.obtainRetrofitService(OrderService.class)
.cancelOrder(orderId) .cancelOrder(orderId)
.flatMap(new Function<BaseResult, Observable<BaseResult>>() { .flatMap(new Function<BaseResult, Observable<BaseResult>>() {
@Override @Override
public Observable<BaseResult> apply(BaseResult info) throws Exception { public Observable<BaseResult> apply(BaseResult info) throws Exception {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
return loadOrderList(restaurantId, orderType,0, 10); return loadOrderList(restaurantId, orderType,status,0, 10);
} }
return Observable.just(info); return Observable.just(info);
} }
......
...@@ -45,6 +45,9 @@ public class OrderManagerResponse implements Serializable { ...@@ -45,6 +45,9 @@ public class OrderManagerResponse implements Serializable {
* orderDetails : [{"id":1639952,"orderId":47040,"parentId":0,"productName":"包子","productId":"14520","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0},{"id":1639953,"orderId":47040,"parentId":0,"productName":"燒麥","productId":"14522","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0}] * orderDetails : [{"id":1639952,"orderId":47040,"parentId":0,"productName":"包子","productId":"14520","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0},{"id":1639953,"orderId":47040,"parentId":0,"productName":"燒麥","productId":"14522","price":5,"lunchboxPrice":0,"number":1,"type":3,"createTime":"Mar 14, 2020 2:55:02 PM","status":0}]
*/ */
private long id; private long id;
/**
* 订单状态
*/
private int status; private int status;
private String orderNo; private String orderNo;
private String tableName; private String tableName;
......
...@@ -20,7 +20,7 @@ public interface OrderService { ...@@ -20,7 +20,7 @@ public interface OrderService {
@FormUrlEncoded @FormUrlEncoded
@POST("order/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("order/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> loadOrderList(@Field("restaurantId") int restaurantId, @Field("orderType") String orderType, @Field("pageIndex") int pageIndex, @Field("pageSize") int pageSize); Observable<BaseResult> loadOrderList(@Field("restaurantId") int restaurantId, @Field("orderType") String orderType,@Field("status") String status ,@Field("pageIndex") int pageIndex, @Field("pageSize") int pageSize);
@GET("order/pay/success" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("order/pay/success" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> getOrderDetail(@Query("orderId") long orderId); Observable<BaseResult> getOrderDetail(@Query("orderId") long orderId);
......
...@@ -6,6 +6,8 @@ import android.content.Intent; ...@@ -6,6 +6,8 @@ import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
...@@ -220,7 +222,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -220,7 +222,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
@Override @Override
public void onPosSuccess(AdjustTipRespose response) { public void onPosSuccess(AdjustTipRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString()); LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
IActivity.refeshOrderList(); IActivity.refeshOrderList(mRootView.getStatusByFragmentIndex());
} }
@Override @Override
...@@ -308,7 +310,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -308,7 +310,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
@Override @Override
public void onPosSuccess(RefundRespose response) { public void onPosSuccess(RefundRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString()); LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
IActivity.refeshOrderList(); IActivity.refeshOrderList(mRootView.getStatusByFragmentIndex());
} }
@Override @Override
...@@ -372,7 +374,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -372,7 +374,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
if (datasBean.withHywebPay()) { if (datasBean.withHywebPay()) {
hywebOrderCancle(datasBean); hywebOrderCancle(datasBean);
} else { } else {
IActivity.cancelOrder(datasBean.getId(), mRootView.getOrderType()); IActivity.cancelOrder(datasBean.getId(), mRootView.getOrderType(),mRootView.getStatusByFragmentIndex());
} }
}); });
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss()); dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
...@@ -403,7 +405,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -403,7 +405,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
@Override @Override
public void onPosSuccess(VoidRespose response) { public void onPosSuccess(VoidRespose response) {
LoganManager.w_code(TAG, "onPosSuccess: " + response.toString()); LoganManager.w_code(TAG, "onPosSuccess: " + response.toString());
IActivity.refeshOrderList(); IActivity.refeshOrderList(mRootView.getStatusByFragmentIndex());
} }
@Override @Override
...@@ -668,4 +670,13 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -668,4 +670,13 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
} }
} }
public OrderManagerResponse getSelectedOrderItem(){
for (OrderManagerResponse orderItem:mOrderItemList) {
if(orderItem.isChecked()){
return orderItem;
}
}
return null;
}
} }
...@@ -5,6 +5,7 @@ import android.app.Application; ...@@ -5,6 +5,7 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse; import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
...@@ -74,18 +75,19 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -74,18 +75,19 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
/*** /***
* 獲取訂單列表 * 獲取訂單列表
* @param orderType * @param orderType
* @param status
* @param pageIndex * @param pageIndex
* @param pageSize * @param pageSize
* @param refreshLayout * @param refreshLayout
* @param isLoadMore * @param isLoadMore
*/ */
public void loadOrderList(String orderType, int pageIndex, int pageSize, RefreshLayout refreshLayout, boolean isLoadMore) { public void loadOrderList(String orderType,String status, int pageIndex, int pageSize, RefreshLayout refreshLayout, boolean isLoadMore) {
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (pageIndex != 0) { if (pageIndex != 0) {
//根據數據庫下標分頁 //根據數據庫下標分頁
pageIndex = pageIndex * pageSize; pageIndex = pageIndex * pageSize;
} }
mModel.loadOrderList(restaurantId, orderType, pageIndex, pageSize) mModel.loadOrderList(restaurantId, orderType,status, pageIndex, pageSize)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
if (refreshLayout == null) { if (refreshLayout == null) {
...@@ -114,6 +116,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -114,6 +116,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
List<OrderManagerResponse> orderItemList = JsonUtils.parseArray(result.getData(), OrderManagerResponse.class); List<OrderManagerResponse> orderItemList = JsonUtils.parseArray(result.getData(), OrderManagerResponse.class);
if (orderItemList != null && orderItemList.size() > 0) { if (orderItemList != null && orderItemList.size() > 0) {
if (!noMoreData) { if (!noMoreData) {
// filterOrderItemsByStatus(orderItemList);
mRootView.returnOrderItemList(orderItemList); mRootView.returnOrderItemList(orderItemList);
//每次更新完數據,頁碼+1 //每次更新完數據,頁碼+1
mRootView.setPageIndex(mRootView.getPageIndex() + 1); mRootView.setPageIndex(mRootView.getPageIndex() + 1);
...@@ -166,9 +169,9 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -166,9 +169,9 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
* *
* @param orderId * @param orderId
*/ */
public void cancelOrder(long orderId, String orderType) { public void cancelOrder(long orderId, String orderType,String status) {
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.cancelOrder(orderId, restaurantId, orderType) mModel.cancelOrder(orderId, restaurantId, orderType,status)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
...@@ -183,6 +186,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -183,6 +186,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
if (result.getData() != null) { if (result.getData() != null) {
List<OrderManagerResponse> orderItemList = JsonUtils.parseArray(result.getData(), OrderManagerResponse.class); List<OrderManagerResponse> orderItemList = JsonUtils.parseArray(result.getData(), OrderManagerResponse.class);
if (orderItemList.size() > 0) { if (orderItemList.size() > 0) {
// filterOrderItemsByStatus(orderItemList);
mRootView.setPageIndex(0); mRootView.setPageIndex(0);
mRootView.returnOrderItemList(orderItemList); mRootView.returnOrderItemList(orderItemList);
//每次更新完數據,頁碼+1 //每次更新完數據,頁碼+1
...@@ -206,6 +210,48 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -206,6 +210,48 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
}); });
} }
public void printOrder(OrderManagerResponse orderItem){
}
public void modifyOrder(OrderManagerResponse orderItem){
}
public void orderTips(OrderManagerResponse orderItem){
}
public void orderCancel(OrderManagerResponse orderItem){
}
public void orderRefund(OrderManagerResponse orderItem){
}
private void filterOrderItemsByStatus(List<OrderManagerResponse> orderItemList){
for (int i = orderItemList.size() -1; i >= 0 ; i--) {
OrderManagerResponse orderManagerResponse = orderItemList.get(i);
if(!getStatusByCurrentFragmentIndex().contains(String.valueOf(orderManagerResponse.getStatus()))){
orderItemList.remove(i);
}
}
}
private String getStatusByCurrentFragmentIndex(){
if(mRootView.getCurrentFragmentIndex() == 0){
return OrderStatusContract.STATUS_4 +","+OrderStatusContract.STATUS_5;
}else if(mRootView.getCurrentFragmentIndex() == 1){
return String.valueOf(OrderStatusContract.STATUS_6);
}
return "";
}
public boolean isNoMoreData() { public boolean isNoMoreData() {
return noMoreData; return noMoreData;
......
...@@ -33,6 +33,7 @@ import com.gingersoft.gsa.cloud.order.billItem.BillItem; ...@@ -33,6 +33,7 @@ import com.gingersoft.gsa.cloud.order.billItem.BillItem;
import com.gingersoft.gsa.cloud.order.billItem.BillOrderMoney; import com.gingersoft.gsa.cloud.order.billItem.BillOrderMoney;
import com.gingersoft.gsa.cloud.order.cart.ShoppingCart; import com.gingersoft.gsa.cloud.order.cart.ShoppingCart;
import com.gingersoft.gsa.cloud.order.commodity.OrderDetail; import com.gingersoft.gsa.cloud.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.order.order.DoshokuOrder; import com.gingersoft.gsa.cloud.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod; import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.bean.PosActionStatusExceptionParam; import com.gingersoft.gsa.cloud.pay.bean.PosActionStatusExceptionParam;
...@@ -315,7 +316,7 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent ...@@ -315,7 +316,7 @@ public class OrderDetailActivity extends BaseFragmentActivity<OrderDetailPresent
btn_tips.setVisibility(View.GONE); btn_tips.setVisibility(View.GONE);
} }
} }
if (mOrderDetailItem.getStatus() == 6) { if (mOrderDetailItem.getStatus() == OrderStatusContract.STATUS_6) {
//訂單已取消 //訂單已取消
btn_print_order.setVisibility(View.GONE); btn_print_order.setVisibility(View.GONE);
btn_modify_order.setVisibility(View.GONE); btn_modify_order.setVisibility(View.GONE);
......
...@@ -13,6 +13,7 @@ import com.gingersoft.gsa.cloud.common.constans.OrderTypeConstans; ...@@ -13,6 +13,7 @@ import com.gingersoft.gsa.cloud.common.constans.OrderTypeConstans;
import com.gingersoft.gsa.cloud.common.utils.AppDevices; import com.gingersoft.gsa.cloud.common.utils.AppDevices;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.pay.bean.PayMethod; import com.gingersoft.gsa.cloud.pay.bean.PayMethod;
import com.gingersoft.gsa.cloud.pay.util.PayMethodUtils; import com.gingersoft.gsa.cloud.pay.util.PayMethodUtils;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
...@@ -108,7 +109,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -108,7 +109,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
setBtnVisible(item, position); setBtnVisible(item, position);
setBtnListener(item, position); setBtnListener(item, position);
btn_refund.setVisibility(View.GONE); btn_refund.setVisibility(View.GONE);
cb_order.setVisibility(View.GONE);
ll_root_container.setOnClickListener(new View.OnClickListener() { ll_root_container.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -150,7 +151,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -150,7 +151,6 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
tv_table_name.setText(tableName + item.getTableName()); tv_table_name.setText(tableName + item.getTableName());
tv_order_num.setText(orderNumber + item.getId()); tv_order_num.setText(orderNumber + item.getId());
} }
cb_order.setChecked(item.isChecked());
} }
private void setBtnVisible(OrderManagerResponse item, int position) { private void setBtnVisible(OrderManagerResponse item, int position) {
...@@ -179,7 +179,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -179,7 +179,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
btn_tips.setVisibility(View.GONE); btn_tips.setVisibility(View.GONE);
} }
} }
if (item.getStatus() == 6) { if (item.getStatus() == OrderStatusContract.STATUS_6) {
btn_print_order.setVisibility(View.GONE); btn_print_order.setVisibility(View.GONE);
btn_modify_order.setVisibility(View.GONE); btn_modify_order.setVisibility(View.GONE);
btn_cancel_order.setVisibility(View.GONE); btn_cancel_order.setVisibility(View.GONE);
...@@ -210,7 +210,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -210,7 +210,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
} }
private void setBtnListener(OrderManagerResponse item, int position) { private void setBtnListener(OrderManagerResponse item, int position) {
if (item.getStatus() != 6) { if (item.getStatus() != OrderStatusContract.STATUS_6) {
btn_print_order.setOnClickListener(new View.OnClickListener() { btn_print_order.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -254,12 +254,12 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> { ...@@ -254,12 +254,12 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderManagerResponse> {
cb_order.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cb_order.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// for (int i = 0; i < mInfos.size(); i++) { for (int i = 0; i < mInfos.size(); i++) {
// OrderManagerResponse item = mInfos.get(i); OrderManagerResponse item = mInfos.get(i);
// item.setChecked(false); item.setChecked(false);
// } }
// mInfos.get(position).setChecked(isChecked); mInfos.get(position).setChecked(isChecked);
// notifyDataSetChanged(); notifyDataSetChanged();
} }
}); });
} }
......
...@@ -12,6 +12,8 @@ import androidx.annotation.NonNull; ...@@ -12,6 +12,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.order.contract.OrderStatusContract;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerAllOrderComponent; import com.gingersoft.gsa.cloud.table.di.component.DaggerAllOrderComponent;
...@@ -38,6 +40,7 @@ import java.net.UnknownHostException; ...@@ -38,6 +40,7 @@ import java.net.UnknownHostException;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -64,7 +67,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -64,7 +67,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
QMUIEmptyView mEmptyView; QMUIEmptyView mEmptyView;
private OrderCenterActivity orderCenterActivity; private OrderCenterActivity orderCenterActivity;
private int currentPageIndex; private int mCurrentFragmentIndex;
private int pageIndex = 0; private int pageIndex = 0;
private int pageSize = 10; private int pageSize = 10;
...@@ -91,7 +94,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -91,7 +94,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
currentPageIndex = getArguments().getInt("currentPageIndex", 0); mCurrentFragmentIndex = getArguments().getInt("currentFragmentIndex", 0);
orderCenterActivity = (OrderCenterActivity) mContext; orderCenterActivity = (OrderCenterActivity) mContext;
mPresenter.initOrderAdapter(mContext); mPresenter.initOrderAdapter(mContext);
...@@ -104,13 +107,13 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -104,13 +107,13 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
public void onRefresh(@NonNull final RefreshLayout refreshLayout) { public void onRefresh(@NonNull final RefreshLayout refreshLayout) {
//重新獲取第一頁數據 //重新獲取第一頁數據
pageIndex = 0; pageIndex = 0;
orderCenterActivity.loadOrderList(getOrderType(), refreshLayout, false); orderCenterActivity.loadOrderList(getOrderType(),getStatusByFragmentIndex(), refreshLayout, false);
} }
}); });
refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
@Override @Override
public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { public void onLoadMore(@NonNull final RefreshLayout refreshLayout) {
orderCenterActivity.loadOrderList(getOrderType(), refreshLayout, true); orderCenterActivity.loadOrderList(getOrderType(), getStatusByFragmentIndex(),refreshLayout, true);
} }
}); });
} }
...@@ -142,6 +145,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -142,6 +145,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
} }
} }
@Override @Override
public void showLoading(String message) { public void showLoading(String message) {
...@@ -178,7 +182,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -178,7 +182,7 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
public void onClick(View v) { public void onClick(View v) {
//重新加載 //重新加載
setPageIndex(0); setPageIndex(0);
orderCenterActivity.loadOrderList(getOrderType(), null, false); orderCenterActivity.loadOrderList(getOrderType(), getStatusByFragmentIndex(),null, false);
} }
}; };
...@@ -229,14 +233,31 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements ...@@ -229,14 +233,31 @@ public class AllOrderFragment extends BaseFragment<AllOrderPresenter> implements
@Override @Override
public String getOrderType() { public String getOrderType() {
switch (currentPageIndex) { // switch (mCurrentFragmentIndex) {
// case 1:
// return OrderManagerResponse.ORDER_TYPE_TAKEAWAY + "," + OrderManagerResponse.ORDER_TYPE_SELFCOLLECTION;
// default:
// return OrderManagerResponse.ORDER_TYPE_DOSHOKU + "";
// }
//TODO 账单管理现在只显示餐台模式订单
return String.valueOf(OrderManagerResponse.ORDER_TYPE_DOSHOKU);
}
@Override
public String getStatusByFragmentIndex(){
switch (mCurrentFragmentIndex) {
case 1: case 1:
return OrderManagerResponse.ORDER_TYPE_TAKEAWAY + "," + OrderManagerResponse.ORDER_TYPE_SELFCOLLECTION; return OrderStatusContract.STATUS_6+"";
default: default:
return OrderManagerResponse.ORDER_TYPE_DOSHOKU + ""; return OrderStatusContract.STATUS_4+","+OrderStatusContract.STATUS_5;
} }
} }
@Nullable
public OrderManagerResponse getSelectedOrderItem(){
return mPresenter.getSelectedOrderItem();
}
public RefreshLayout getRefreshLayout() { public RefreshLayout getRefreshLayout() {
return refreshLayout; return refreshLayout;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:checked="true"/> android:checked="false"/>
<TextView <TextView
android:id="@+id/tv_table_name" android:id="@+id/tv_table_name"
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3" android:layout_marginTop="@dimen/dp_3"
android:layout_marginBottom="@dimen/dp_6"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
...@@ -123,6 +124,7 @@ ...@@ -123,6 +124,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:gravity="right|center_vertical" android:gravity="right|center_vertical"
android:visibility="gone"
android:orientation="horizontal"> android:orientation="horizontal">
<com.qmuiteam.qmui.alpha.QMUIAlphaButton <com.qmuiteam.qmui.alpha.QMUIAlphaButton
......
package com.gingersoft.gsa.cloud.order.contract;
/**
* @作者: bin
* @創建時間: 2021-01-14 12:16
* @更新時間: 2021-01-14 12:16
* @描述:订单状态
*/
public interface OrderStatusContract {
/**
* 订单状态#
* 0:未支付;
* 1:待確認(已支付, 待餐廳確認);
* 2:制作中(餐厅确认);
* 3:派送中;
* 4:确认收货(完成);
* 5:完成,是否评论;
* 6:取消;
*/
int STATUS_0 = 0;
int STATUS_1 = 1;
int STATUS_2= 2;
int STATUS_3 = 3;
int STATUS_4 = 4;
int STATUS_5 = 5;
int STATUS_6= 6;
}
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 to comment