Skip to content

S
supplier
Commit 8bf3e341 by 宁斌
Options

套餐默認調整，部分報表項數據

parent 6f150c1a
Showing with 312 additions and 97 deletions
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/SettlementReportContract.java
...@@ -29,6 +29,8 @@ public interface SettlementReportContract { ...@@ -29,6 +29,8 @@ public interface SettlementReportContract {
void setSettlementReportItemAdapter(DefaultAdapter adapter); void setSettlementReportItemAdapter(DefaultAdapter adapter);
void setSettlementReportItem5Adapter(DefaultAdapter adapter);
void returnSettlementData(SettlementReport.DataBean datasBean); void returnSettlementData(SettlementReport.DataBean datasBean);
} }
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/SettlementReportItem5.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.model.bean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-03-04
* 修订历史：2020-03-04
* 描述：
*/
public class SettlementReportItem5 {
private String item1;
private String item2;
private String item3;
private String item4;
private String item5;
public SettlementReportItem5(String item1, String item2, String item3, String item4, String item5) {
this.item1 = item1;
this.item2 = item2;
this.item3 = item3;
this.item4 = item4;
this.item5 = item5;
}
public String getItem1() {
return item1;
}
public void setItem1(String item1) {
this.item1 = item1;
}
public String getItem2() {
return item2;
}
public void setItem2(String item2) {
this.item2 = item2;
}
public String getItem3() {
return item3;
}
public void setItem3(String item3) {
this.item3 = item3;
}
public String getItem4() {
return item4;
}
public void setItem4(String item4) {
this.item4 = item4;
}
public String getItem5() {
return item5;
}
public void setItem5(String item5) {
this.item5 = item5;
}
}
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementPresenter.java
...@@ -86,7 +86,7 @@ public class SettlementPresenter extends BasePresenter<SettlementContract.Model, ...@@ -86,7 +86,7 @@ public class SettlementPresenter extends BasePresenter<SettlementContract.Model,
mRootView.returnSettlementData(info.getData()); mRootView.returnSettlementData(info.getData());
} }
} else { } else {
mRootView.showMessage("清機失敗"); // mRootView.showMessage("獲取報表失敗");
} }
} }
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
...@@ -10,7 +10,9 @@ import com.gingersoft.gsa.cloud.main.R; ...@@ -10,7 +10,9 @@ import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SendSettlement;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReport; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReport;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReportItem; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReportItem;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReportItem5;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementReportActivity; import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementReportActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItem5Adapter;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItemAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.SettlementReportItemAdapter;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -62,8 +64,11 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -62,8 +64,11 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
AppManager mAppManager; AppManager mAppManager;
private SettlementReportActivity IActivity; private SettlementReportActivity IActivity;
private SettlementReportItemAdapter reportItemAdapter; private SettlementReportItemAdapter mSettlementReportItemAdapter;
private List<SettlementReportItem> mList= new ArrayList<>(); private List<SettlementReportItem> mSettlementReportItemList= new ArrayList<>();
private SettlementReportItem5Adapter mSettlementReportItem5Adapter;
private List<SettlementReportItem5> mSettlementReportItem5List= new ArrayList<>();
@Inject @Inject
public SettlementReportPresenter(SettlementReportContract.Model model, SettlementReportContract.View rootView) { public SettlementReportPresenter(SettlementReportContract.Model model, SettlementReportContract.View rootView) {
...@@ -81,16 +86,26 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -81,16 +86,26 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
} }
public void initAdapter() { public void initAdapter() {
if (reportItemAdapter == null) { if (mSettlementReportItemAdapter == null) {
reportItemAdapter = new SettlementReportItemAdapter(IActivity, mList); mSettlementReportItemAdapter = new SettlementReportItemAdapter(IActivity, mSettlementReportItemList);
mRootView.setSettlementReportItemAdapter(reportItemAdapter); mRootView.setSettlementReportItemAdapter(mSettlementReportItemAdapter);
}
if (mSettlementReportItem5Adapter == null) {
mSettlementReportItem5Adapter = new SettlementReportItem5Adapter(IActivity, mSettlementReportItem5List);
mRootView.setSettlementReportItem5Adapter(mSettlementReportItem5Adapter);
} }
} }
public void notifyDataSetChanged(List<SettlementReportItem> settlementReportItems) { public void notifyReportItemAdapter(List<SettlementReportItem> settlementReportItems) {
mList.clear(); mSettlementReportItemList.clear();
mList.addAll(settlementReportItems); mSettlementReportItemList.addAll(settlementReportItems);
reportItemAdapter.notifyDataSetChanged(); mSettlementReportItemAdapter.notifyDataSetChanged();
}
public void notifyReportItem5Adapter(List<SettlementReportItem5> settlementReportItems) {
mSettlementReportItem5List.clear();
mSettlementReportItem5List.addAll(settlementReportItems);
mSettlementReportItem5Adapter.notifyDataSetChanged();
} }
public void sendSettlement() { public void sendSettlement() {
...@@ -119,7 +134,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -119,7 +134,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
showSettlementErrorDialog("仍有臺號未結賬，請先結賬;" + "\n" + getTables(dataBean.getTable())); showSettlementErrorDialog("仍有臺號未結賬，請先結賬;" + "\n" + getTables(dataBean.getTable()));
} }
} else { } else {
mRootView.showMessage("清機失敗"); mRootView.showMessage("清機成功");
} }
} else { } else {
mRootView.showMessage("清機失敗"); mRootView.showMessage("清機失敗");
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/SettlementReportItem5Adapter.java 0 → 100644
package com.gingersoft.gsa.cloud.main.mvp.ui.adapter;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SettlementReportItem5;
import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter;
import java.util.List;
import butterknife.BindView;
import butterknife.BindViews;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2018/6/27
* 修订历史：2018/6/27
* 描述：
*/
public class SettlementReportItem5Adapter extends DefaultAdapter<SettlementReportItem5> {
private Context mContext;
public SettlementReportItem5Adapter(Context context, List<SettlementReportItem5> infos) {
super(infos);
this.mContext = context;
}
@Override
public int getItemCount() {
return mInfos.size();
}
@Override
public BaseHolder<SettlementReportItem5> getHolder(View v, int viewType) {
return new SettlementReportItemHolder(v);
}
@Override
public int getLayoutId(int viewType) {
return R.layout.item_settlement_report5;
}
class SettlementReportItemHolder extends BaseHolder<SettlementReportItem5> {
@BindViews({R2.id.tv_item1, R2.id.tv_item2, R2.id.tv_item3, R2.id.tv_item4, R2.id.tv_item5})
TextView[] tv_items;
public SettlementReportItemHolder(View itemView) {
super(itemView);
}
@Override
public void setData(SettlementReportItem5 reportItem, int position) {
tv_items[0].setText(reportItem.getItem1());
tv_items[1].setText(reportItem.getItem2());
tv_items[2].setText(reportItem.getItem3());
tv_items[3].setText(reportItem.getItem4());
tv_items[4].setText(reportItem.getItem5());
}
}
}
main/src/main/res/layout/activity_settlement_report.xml
...@@ -4,101 +4,97 @@ ...@@ -4,101 +4,97 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.qmuiteam.qmui.widget.QMUITopBar <ScrollView
android:id="@+id/topbar"
android:layout_width="match_parent"
android:layout_height="?attr/qmui_topbar_height"/>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/theme_white_color" android:fillViewport="true">
android:orientation="vertical"
android:layout_marginTop="?attr/qmui_topbar_height">
<TextView
android:id="@+id/tv_last_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_5"
android:textColor="@color/red"
android:textSize="@dimen/sp_16"
android:gravity="center"
android:text="上次清機時間：2020-3-1 21:59:18"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:orientation="vertical"> android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/tv_restaurant_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:textColor="@color/black" android:layout_marginBottom="@dimen/dp_45"
android:textSize="@dimen/sp_16" android:layout_marginTop="?attr/qmui_topbar_height"
android:text="店鋪名稱：gingersoft"/> android:background="@color/theme_white_color"
android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/tv_business_area_title" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="vertical"
android:textColor="@color/black" android:padding="@dimen/dp_10">
android:textSize="@dimen/sp_16"
android:text="店鋪名稱：gingersoft"/>
<TextView <TextView
android:id="@+id/tv_start_time" android:id="@+id/tv_restaurant_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:text="店鋪名稱：gingersoft"
android:layout_marginTop="@dimen/dp_5" android:textColor="@color/black"
android:textSize="@dimen/sp_14" android:textSize="@dimen/sp_16" />
android:text=""/>
<TextView <TextView
android:id="@+id/tv_end_time" android:id="@+id/tv_business_area_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/black" android:text="店鋪名稱：gingersoft"
android:textSize="@dimen/sp_14" android:textColor="@color/black"
android:layout_marginTop="@dimen/dp_5" android:textSize="@dimen/sp_16" />
android:text=""/>
</LinearLayout>
<View <TextView
android:layout_width="match_parent" android:id="@+id/tv_start_time"
android:layout_height="@dimen/dp_0_5" android:layout_width="match_parent"
android:background="@color/theme_grey_color" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_8"/> android:layout_marginTop="@dimen/dp_5"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
<ScrollView <TextView
android:layout_width="match_parent" android:id="@+id/tv_end_time"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:fillViewport="true"> android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/tv_last_time"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="上次清機時間：2020-3-1 21:59:18"
android:textColor="@color/red"
android:textSize="@dimen/sp_16" />
<androidx.recyclerview.widget.RecyclerView <View
android:id="@+id/rv_settlement_report_item" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="@dimen/dp_0_5"
android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8"
android:divider="@null" android:background="@color/theme_grey_color" />
android:fadeScrollbars="false"/>
<androidx.recyclerview.widget.RecyclerView <com.gingersoft.gsa.cloud.base.widget.NoScrollRecyclerView
android:id="@+id/rv_settlement_report_item2" android:id="@+id/rv_settlement_report_item"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="@null" android:divider="@null"
android:fadeScrollbars="false"/> android:fadeScrollbars="false" />
</LinearLayout>
</ScrollView> <com.gingersoft.gsa.cloud.base.widget.NoScrollRecyclerView
</LinearLayout> android:id="@+id/rv_settlement_report_item2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="@null"
android:fadeScrollbars="false" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<com.qmuiteam.qmui.alpha.QMUIAlphaButton <com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_send_settlement" android:id="@+id/btn_send_settlement"
...@@ -106,9 +102,14 @@ ...@@ -106,9 +102,14 @@
android:layout_height="@dimen/dp_45" android:layout_height="@dimen/dp_45"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/theme_color" android:background="@color/theme_color"
android:textColor="@color/theme_white_color"
android:gravity="center" android:gravity="center"
android:textSize="@dimen/sp_15" android:text="去清機"
android:text="去清機"/> android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_15" />
<com.qmuiteam.qmui.widget.QMUITopBar
android:id="@+id/topbar"
android:layout_width="match_parent"
android:layout_height="?attr/qmui_topbar_height" />
</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout> </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file
main/src/main/res/layout/item_settlement_report5.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cl_container"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_25"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_item1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="item1"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_item2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="item2"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_item3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="item3"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_item4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="item4"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_item5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="item5"
android:textColor="@color/black"
android:textSize="@dimen/sp_14" />
</LinearLayout>
\ No newline at end of file
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
...@@ -535,10 +535,12 @@ public class OrderDetail implements Serializable { ...@@ -535,10 +535,12 @@ public class OrderDetail implements Serializable {
if (parentOrderDetail != null && orderDetailsBean.getParentId() != 0) { if (parentOrderDetail != null && orderDetailsBean.getParentId() != 0) {
if (parentOrderDetail.getId() == orderDetailsBean.getParentId()) { if (parentOrderDetail.getId() == orderDetailsBean.getParentId()) {
//是父級 //是父級
if (parentOrderDetail.getParentId() == 0) { if (parentOrderDetail.getParentId() == 0 && orderDetailsBean.getType() == FOOD_TYPE) {
//第二層子食品
return 2; return 2;
} }
if (parentOrderDetail.getParentId() != 0 && parentOrderDetail.getType() == FOOD_TYPE) { if (parentOrderDetail.getParentId() != 0 && orderDetailsBean.getType() == MODIFIER_TYPE) {
//第三層細項
return 3; return 3;
} }
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -478,6 +478,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -478,6 +478,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mSelectMealAdapter.notifyDataSetChanged(); mSelectMealAdapter.notifyDataSetChanged();
mSelectMealAdapter.setIndex(); mSelectMealAdapter.setIndex();
mRootView.showViewModeVisibility(MealConstant.food_group_ViewMode,MealConstant.food_ViewMode);
} else { } else {
mRootView.showMessage("刪除失敗"); mRootView.showMessage("刪除失敗");
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -204,8 +204,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -204,8 +204,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
if (isPrint) { if (isPrint) {
printOrder(OpenTableManage.getDefault().getTableBean().getId()); printOrder(OpenTableManage.getDefault().getTableBean().getId());
} else { } else {
if(!hasNesOrderFoods()){ //TODO 未新增食品點擊送單 後台不讓過直接提示即可，不調用打印
//TODO 未新增食品點擊送單 後台不讓過直接提示即可，不調用打印
if (!hasNesOrderFoods()) { if (!hasNesOrderFoods()) {
//TODO 未新增食品點擊送單 後台不讓過直接提示即可 //TODO 未新增食品點擊送單 後台不讓過直接提示即可
mRootView.showMessage("送單成功"); mRootView.showMessage("送單成功");
...@@ -269,7 +268,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -269,7 +268,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
@Override @Override
public void onNext(@NonNull BaseRespose info) { public void onNext(@NonNull BaseRespose info) {
if (info != null && info.isSuccess()) { if (info != null && info.isSuccess()) {
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.addParam("type", 1)//印單 .addParam("type", 1)//印單
.setActionName("printActivity") .setActionName("printActivity")
.build() .build()
......
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