Skip to content

S
supplier
Commit b830b7e4 by 宁斌
Options

1、首页切换餐厅 名字没变 

2、删除食品完 再次点击删除按钮闪退问题
parent b9c5dcf3
Showing with 130 additions and 6 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/DeleteOrderRequest.java 0 → 100644
package com.gingersoft.gsa.cloud.base.common.bean;
import java.util.List;
import java.util.Map;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-02-22
* 修订历史：2020-02-22
* 描述：
*/
@Data
public class DeleteOrderRequest {
private List<DeleteOrderRequest.DeleteBean> mapsDelete;
private long orderId;
private long tableId;
private String tableNumber;
private byte type;
private long reasonId;
@Data
public static class DeleteBean {
private long id;
private int number;
}
}
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -192,7 +192,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
@Override
protected void onRestart() {
super.onRestart();
tvStoreName.setText(GsaCloudApplication.getRestaurantName(mContext));
String restaurantName = GsaCloudApplication.getRestaurantName(mContext);
tvStoreName.setText(restaurantName);
tvRestaurantName.setText(restaurantName);
}
/**
......@@ -398,12 +400,12 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
.setActionName("showTableManageActivity")
.build()
.call();
} else if(name.equals("冷鏈接單")){
} else if (name.equals("冷鏈接單")) {
CC.obtainBuilder("Component.ColdChain")
.setActionName("Component.ColdChain")
.build()
.call();
} else if(name.equals("二維碼")){
} else if (name.equals("二維碼")) {
CC.obtainBuilder("Component.ColdChain")
.setActionName("Component.ColdChain")
.build()
......
print-module/src/main/res/layout/print_model_meal_member_integer_info.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_print_model_member_number"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="會員號碼：" />
<TextView
android:id="@+id/tv_print_model_member_name"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="會員名稱：" />
<TextView
android:id="@+id/tv_print_model_member_phone"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="會員電話：" />
<TextView
android:id="@+id/tv_print_model_oldPoints"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="上次積分：" />
<TextView
android:id="@+id/tv_print_model_addPoints"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="本次積分：" />
<TextView
android:id="@+id/tv_print_model_nowPoints"
style="@style/print_other_order_twenty_six_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:text="結餘積分：" />
<LinearLayout
android:id="@+id/ll_integral_qrcode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_10">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/dp_20"
android:text="請掃描二維碼" />
<ImageView
android:id="@+id/iv_integral_qrcode"
android:layout_width="@dimen/dp_180"
android:layout_height="@dimen/dp_180"
android:layout_marginTop="@dimen/dp_5"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:textColor="@color/black"
android:textSize="@dimen/dp_20"
android:text="《追加積分到個人賬戶》" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
......@@ -901,7 +901,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
*/
public void restoreDeleteFood() {
for (OrderDetail item : mOrderFoodList) {
if(!item.isModify()){
if (!item.isModify()) {
continue;
}
item.setNumber(item.getModifyBeforeNumber());
......@@ -1110,7 +1110,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (!deleteFood.isNew()) {
//TODO 刪除已下單食品
deleteWithOrderedFood(deleteFood);
if (!deleteFood.isModify()) {
deleteWithOrderedFood(deleteFood);
}
} else {
if (deleteStyle == 2) {
mSelectMealAdapter.removeAllNewFoodItem();
......@@ -2084,7 +2086,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
* @param deleteNumber
* @return
*/
private DeleteOrderRequest getDeleteOrderRequest(String ids, long reasonId, int maxNumber, int deleteNumber) {
private DeleteOrderRequest getDeleteOrderRequest(String ids, long reasonId, int maxNumber, int deleteNumber) {
List<DeleteOrderRequest.DeleteBean> mapsDelete = getMapsDelete(ids, maxNumber, deleteNumber);
byte type = (byte) (myOrderManage.isModifyOrder() ? 2 : 1);
long orderId = MyOrderManage.getInstance().getOrderId();
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/CancelFoodDialog.java
......@@ -212,6 +212,8 @@ public class CancelFoodDialog extends Dialog {
}
private int getCurrentProgress(int num) {
if (maxCancelNumber == 0)
maxCancelNumber = 10;
int progress = num * 100 / maxCancelNumber;
return progress;
}
......
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