Skip to content

S
supplier
Commit aba2a0c0 by Wyh
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 9dde516f f99df214
Showing with 1102 additions and 2006 deletions
arms/src/main/java/com/jess/arms/http/log/DefaultFormatPrinter.java
......@@ -73,7 +73,7 @@ public class DefaultFormatPrinter implements FormatPrinter {
*
* @param request
* @param bodyString
*/
*/
@Override
public void printJsonRequest(Request request, String bodyString) {
final String requestBody = LINE_SEPARATOR + BODY_TAG + LINE_SEPARATOR + bodyString;
......
base-module/build.gradle
......@@ -156,6 +156,9 @@ dependencies {
debugImplementation 'com.didichuxing.doraemonkit:dokitx:3.3.3'
releaseImplementation 'com.didichuxing.doraemonkit:dokitx-no-op:3.3.3'
//RecyclerView 流式佈局layoutManager
api 'com.google.android:flexbox:1.0.0'
api rootProject.ext.dependencies["permissionx"]
api rootProject.ext.dependencies["design"]
api rootProject.ext.dependencies["appcompat-v7"]
......@@ -169,6 +172,7 @@ dependencies {
api 'androidx.core:core-ktx:+'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
api 'com.github.huangyanbin:SmartTable:2.2.0'
// api rootProject.ext.dependencies['logan']
}
repositories {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
......@@ -53,9 +53,9 @@ import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.onAdaptListener;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import com.gingersoft.gsa.cloud.config.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandInfo.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandconfig.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
/**
* Created by Wyh on 2019/12/21.
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/RestaurantExpandInfoUtils.java
......@@ -2,9 +2,9 @@ package com.gingersoft.gsa.cloud.base.utils;
import android.text.TextUtils;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandInfo.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandInfo.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandconfig.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
import java.lang.reflect.Field;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/log/LogUtil.java
......@@ -13,7 +13,7 @@ public class LogUtil {
//可以全局控制是否打印log日志
private static boolean isPrintLog = true;
private static int LOG_MAXLENGTH = 5000;
private static int LOG_MAXLENGTH = 10000;
private final static String TAG = "LogUtil";
public static void v(String msg) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
......@@ -7,13 +7,11 @@ import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.Loggi
import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.jess.arms.utils.DeviceUtils;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.Call;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/ExpandInfoSetting.java
package com.gingersoft.gsa.cloud.config.expandInfo;
package com.gingersoft.gsa.cloud.config.expandconfig;
import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
......@@ -114,6 +114,11 @@ public class ExpandInfoSetting {
}
/**
* 掃碼獲取擴展類信息
* @param obj
* @return
*/
private static List<ExpandInfoSetting> scanExtendedConfiguration(Object obj) {
List<ExpandInfoSetting> expandInfoList = new ArrayList<>();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/FunctionExtendedConfiguration.java
package com.gingersoft.gsa.cloud.config.expandInfo;
package com.gingersoft.gsa.cloud.config.expandconfig;
import lombok.Getter;
import lombok.Setter;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
/**
* @author : bin
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/expandconfig/UIStyleExtendedConfiguration.java
package com.gingersoft.gsa.cloud.config.expandInfo;
package com.gingersoft.gsa.cloud.config.expandconfig;
import lombok.Getter;
import lombok.Setter;
import com.gingersoft.gsa.cloud.config.expandInfo.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
/**
* @author : bin
* @create date: 2020-10-20
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/GlobalConfiguration.java
......@@ -2,9 +2,6 @@ package com.gingersoft.gsa.cloud.config.globalconfig;
import android.app.Application;
import android.content.Context;
import androidx.fragment.app.FragmentManager;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.MyGlobalHttpHandler;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.MyGsonConfiguration;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.MyOkhttpConfiguration;
......@@ -17,10 +14,13 @@ import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.jess.arms.base.delegate.AppLifecycles;
import com.jess.arms.di.module.GlobalConfigModule;
import com.jess.arms.integration.ConfigModule;
import com.jess.arms.integration.cache.Cache;
import com.jess.arms.integration.cache.CacheType;
import com.jess.arms.utils.DataHelper;
import java.io.File;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentManager;
public class GlobalConfiguration implements ConfigModule {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyResponseErrorListener.java
......@@ -74,12 +74,15 @@ public class MyResponseErrorListener implements ResponseErrorListener {
showloggedDialog(activity, ArmsUtils.getString(context, R.string.response_error_request_logged));
}
} else {
if (httpException.code() == 400) {
//Bad Request
ArmsUtils.killAll();
Activity activity = GsaCloudApplication.getAppContext().getCurrentActivity();
toLoginActivity(activity);
}
// if (httpException.code() == 400) {
// //Bad Request
// Activity activity = GsaCloudApplication.getAppContext().getCurrentActivity();
// if (activity == null || !activity.getClass().getSimpleName().equals("LoginActivity")) {
// //不处于登录页面 返回到登录页
// ArmsUtils.killAll();
// toLoginActivity(activity);
// }
// }
msg = httpException.message();
}
return msg;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/MyRetrofitConfiguration.java
package com.gingersoft.gsa.cloud.config.globalconfig.applyOptions;
import android.content.Context;
import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.LoggingInterceptor;
import com.jess.arms.di.module.ClientModule;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
......@@ -37,7 +37,7 @@ public class HttpsConstans {
private static String HTTP_ADDRESS_URL_FORMAL = "https://m.ricepon.com:8444";//正式服務器
private static String HTTP_ADDRESS_URL_SZ = "http://gingersoft.tpddns.cn:58201";//深圳測試
private static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試
private static String HTTP_ADDRESS_URL_PRE = "http://prf-m.ricepon.com/";//預發佈
private static String HTTP_ADDRESS_URL_PRE = "http://prf-m.ricepon.com";//預發佈
public static String CLOUD_GSA_API_PATH = "/ricepon-cloud-gsa/api/";//雲端GSA路徑
public static String RESTAURANT_API_PATH = "/ricepon-restaurant/api/";//餐廳模塊路徑
......@@ -74,9 +74,13 @@ public class HttpsConstans {
//---------------------------------------System請求地址----------------------------------------------------------------------------------
public static String SYSTEM_PATH = "/ricepon-system/api/";
public static String API_RICEPON_MEMBER = "/ricepon-member/api/";
//---------------------------------------打印skyorder QRCode----------------------------------------------------------------------------------
public static final String PRINT_QRCODE_ADDRESS_URL_FORMAL = "http://m.ricepon.com";
public static final String PRINT_QRCODE_SUFFIX = "/member-web/qrcode/qrcode.html?WMP0&?arg=";
public static String PRINT_QRCODE_ADDRESS = PRINT_QRCODE_ADDRESS_URL_FORMAL + PRINT_QRCODE_SUFFIX;
//--------------------------------------配置-----------------------------------------------------------------------------------
/**
......@@ -203,6 +207,8 @@ public class HttpsConstans {
ricepon_activities = HttpsConstans.ROOT_URL + HttpsConstans.URK_RICEPON_ACTIVITIES;
ricepon_cloud_gsa = HttpsConstans.ROOT_URL + HttpsConstans.CLOUD_GSA_API_PATH;
ricepon_member = HttpsConstans.ROOT_URL + API_RICEPON_MEMBER;
// PRINT_QRCODE_ADDRESS = PRINT_QRCODE_ADDRESS_URL_FORMAL + PRINT_QRCODE_SUFFIX;
}
public static String ricepon_wechat;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/function/FunctionManager.java
......@@ -35,7 +35,7 @@ public class FunctionManager {
FunctionDaoUtils daoUtils = new FunctionDaoUtils(context);
List<Function> functionList = daoUtils.queryAllFunction();
return filterFunctionByResLoction(functionList, fModules, resLoction);
return filterFunctionByResLoction(functionList, fModules, resLoction);
}
private List<Function> filterFunctionByResLoction(List<Function> functionList, FModule[] fModules, String resLoction) {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrintContent.java
......@@ -8,5 +8,4 @@ package com.gingersoft.gsa.cloud.print.bean;
* */
public interface PrintContent {
}
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/PrintQRCodeContent.java
......@@ -2,9 +2,6 @@ package com.gingersoft.gsa.cloud.print.bean;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
import lombok.Getter;
import lombok.Setter;
......@@ -27,8 +24,6 @@ public class PrintQRCodeContent implements PrintContent, Parcelable {
private String printMealEndTime;
private String printBottonInfo;
public PrintQRCodeContent() {
}
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/CommonTipDialog.java
......@@ -214,7 +214,9 @@ public class CommonTipDialog {
dialog.dismiss();
if (onEditTextListener != null) {
CharSequence text = dialogBuilder.getEditText().getText();
onEditTextListener.inputText(text.toString());
if (!TextUtils.isEmpty(text)) {
onEditTextListener.inputText(text.toString());
}
}
});
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
......
database-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
package com.gingersoft.gsa.cloud.database.bean;
import androidx.annotation.NonNull;
import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property;
......@@ -18,7 +20,7 @@ import org.greenrobot.greendao.annotation.Generated;
*/
@Data
@Entity
public class Discount {
public class Discount implements Cloneable {
/**
......@@ -137,16 +139,22 @@ public class Discount {
*/
@Transient
private long memberId = -1;
/**
* 送单折扣记录ID
*/
@Transient
private Long discountRecordId;
@Generated(hash = 1938515536)
public Discount(Long id, int restaurantId, double amount, int discountValue,
int type, String discountType, int status, String remark,
byte freeServiceCharge, byte managerApproval, String color,
String placeOrderType, double discountCap, double salesAmount,
byte taxFree, byte exclusive, byte pause, byte additionalDiscount,
byte onlyOnce, double minBillAmount, byte pointsDeduction,
byte wholeFreePoints, byte amountTypeMin, String beginTime,
String endTime) {
int type, String discountType, int status, String remark,
byte freeServiceCharge, byte managerApproval, String color,
String placeOrderType, double discountCap, double salesAmount,
byte taxFree, byte exclusive, byte pause, byte additionalDiscount,
byte onlyOnce, double minBillAmount, byte pointsDeduction,
byte wholeFreePoints, byte amountTypeMin, String beginTime,
String endTime) {
this.id = id;
this.restaurantId = restaurantId;
this.amount = amount;
......@@ -174,10 +182,41 @@ public class Discount {
this.endTime = endTime;
}
@Generated(hash = 1777606421)
public Discount() {
}
public Discount(Discount discount) {
this.id = discount.id;
this.restaurantId = discount.restaurantId;
this.amount = discount.amount;
this.discountValue = discount.discountValue;
this.type = discount.type;
this.discountType = discount.discountType;
this.status = discount.status;
this.remark = discount.remark;
this.freeServiceCharge = discount.freeServiceCharge;
this.managerApproval = discount.managerApproval;
this.color = discount.color;
this.placeOrderType = discount.placeOrderType;
this.discountCap = discount.discountCap;
this.salesAmount = discount.salesAmount;
this.taxFree = discount.taxFree;
this.exclusive = discount.exclusive;
this.pause = discount.pause;
this.additionalDiscount = discount.additionalDiscount;
this.onlyOnce = discount.onlyOnce;
this.minBillAmount = discount.minBillAmount;
this.pointsDeduction = discount.pointsDeduction;
this.wholeFreePoints = discount.wholeFreePoints;
this.amountTypeMin = discount.amountTypeMin;
this.beginTime = discount.beginTime;
this.endTime = discount.endTime;
this.memberId = discount.memberId;
this.discountRecordId = discount.discountRecordId;
}
public Long getId() {
return this.id;
}
......@@ -383,6 +422,14 @@ public class Discount {
}
@NonNull
@Override
public Discount clone() {
try {
return (Discount) super.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new Discount(this);
}
}
database-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrintCurrencyBean.java
......@@ -18,7 +18,7 @@ public class PrintCurrencyBean implements Serializable {
private String name;
private Integer restaurantId;
private int type;//1堂食，2外賣
private int type;//1堂食，2外賣，3skyorder
private int foodComplexion;//食品顔色 0 黑色 2 紅色
private int modifierComplexion;//細項顔色 0 黑色 2 紅色
private int deletes;//是否刪除 0 正常 1 刪除
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt
......@@ -3,11 +3,11 @@ package com.gingersoft.gsa.delivery_pick_mode.data.network
import android.util.Log
import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.LoggingInterceptor
import com.gingersoft.gsa.cloud.constans.AppConstans
import com.gingersoft.gsa.cloud.constans.HttpsConstans
import com.gingersoft.gsa.cloud.constans.HttpsConstans.ROOT_SERVER
import com.gingersoft.gsa.cloud.constans.HttpsConstans.URK_RICEPON_GSA
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.LoggingInterceptor
import com.jess.arms.utils.DeviceUtils
import okhttp3.Headers
import okhttp3.Interceptor
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/HistoryOrderViewModel.kt
......@@ -7,7 +7,6 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.app.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.order.order.TakeawayOrder
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
......@@ -206,7 +206,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
}
}
}
confirmOrder(orderDetail, 2, trafficType, restaurantId, isPrintPrj = true, isPrintBill = false) {
confirmOrder(orderDetail, 2, trafficType, restaurantId, isPrintPrj = true, isPrintBill = true) {
//確認之後，刷新列表
refreshState.postValue(0)
}
......@@ -390,7 +390,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
})
}
fun confirmOrder(dataBean: OrderDetails.DataBean, status: Int, trafficType: String = "", restaurantId: Int, isPrintPrj: Boolean = true, isPrintBill: Boolean = true, listener: (MessageBean) -> Unit) {
launch({
when (dataBean.companyType) {
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
......@@ -2,6 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.presenter;
import android.app.Activity;
import android.app.Application;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
......@@ -17,16 +18,12 @@ import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.schedulers.Schedulers;
......
login-module/build.gradle
......@@ -116,7 +116,6 @@ dokitExt {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// addComponent 'public-base'
addComponent 'main-module'
addComponent 'download-module'
addComponent 'table-module'
......
login-module/src/main/AndroidManifest.xml
......@@ -50,7 +50,6 @@
<activity
android:name=".mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity"
android:screenOrientation="portrait" />
<meta-data
android:name="com.gingersoft.gsa.cloud.config.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
......@@ -60,7 +59,6 @@
<meta-data
android:name="design_height_in_dp"
android:value="640" />
<meta-data
android:name="android.max_aspect"
android:value="2.4" />
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/di/component/ChooseRestaurantComponent.java
......@@ -6,7 +6,7 @@ import com.jess.arms.di.component.AppComponent;
import com.gingersoft.gsa.cloud.login.mvp.ui.activity.di.module.ChooseRestaurantModule;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity;
import com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity.ChooseRestaurantActivity;
@ActivityScope
@Component(modules = ChooseRestaurantModule.class,dependencies = AppComponent.class)
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/di/component/SettlementComponent.java
......@@ -8,7 +8,7 @@ import com.gingersoft.gsa.cloud.main.di.module.SettlementModule;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity;
/**
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/di/component/SettlementReportComponent.java
......@@ -8,7 +8,7 @@ import com.gingersoft.gsa.cloud.main.di.module.SettlementReportModule;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementReportContract;
import com.jess.arms.di.scope.ActivityScope;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementReportActivity;
import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementReportActivity;
/**
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableListContract.java
package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
......@@ -24,7 +24,7 @@ public interface TableListContract {
interface View extends IView {
void showEmptyView(boolean isSuccess, int size, Throwable t);
List<TableItem> getTableList();
List<TableManagerItem> getTableList();
}
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/contract/TableManageContract.java
......@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
import java.util.List;
......@@ -28,7 +28,7 @@ public interface TableManageContract {
void queryAreasSuccess(List<TableArea> areas, int type);
void queryTablesSuccess(List<TableItem> tables, int type);
void queryTablesSuccess(List<TableManagerItem> tables, int type);
void showEmptyView(boolean isSuccess, int size, Throwable t);
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableListPresenter.java
......@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.presenter;
import android.app.Application;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableListContract;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionHeader;
import com.jess.arms.di.scope.FragmentScope;
......@@ -57,7 +57,7 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
/**
* 組合餐檯區域集合
*/
public List<TableArea> assembleTableArea(List<TableArea> areaList, List<TableItem> tableList) {
public List<TableArea> assembleTableArea(List<TableArea> areaList, List<TableManagerItem> tableList) {
List<TableArea> tableAreaList = new ArrayList<>();
......@@ -70,8 +70,8 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
for (TableArea area : areaList) {
TableArea newArea = new TableArea(area);
List<TableItem> tableItemList = new ArrayList<>();
for (TableItem table : tableList) {
List<TableManagerItem> tableItemList = new ArrayList<>();
for (TableManagerItem table : tableList) {
if (table.getRegionId() == area.getId()) {
tableItemList.add(table);
}
......@@ -85,10 +85,10 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
/**
* 組合區域集合
*/
public List<TableArea> assembleAreaList(List<TableArea> areaList, List<TableItem> tableList) {
public List<TableArea> assembleAreaList(List<TableArea> areaList, List<TableManagerItem> tableList) {
removeOtherAreaItem(areaList);
if (areaList.size() > 0) {
for (TableItem table : tableList) {
for (TableManagerItem table : tableList) {
if (table.getRegionId() == -1) {
//將沒有區域的檯 放到其他下面
TableArea newArea = new TableArea();
......@@ -101,7 +101,7 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
return areaList;
}
boolean addOther = false;
for (TableItem table : tableList) {
for (TableManagerItem table : tableList) {
if (table.getRegionId() != -1) {
if (!equalsAreaId(areaList, table.getRegionId())) {
TableArea newArea = new TableArea();
......@@ -140,8 +140,8 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
}
}
public List<QMUISection<SectionHeader, TableItem>> tableAreaTransformToSection(List<TableArea> mItems) {
List<QMUISection<SectionHeader, TableItem>> qmuiSections = new ArrayList<>();
public List<QMUISection<SectionHeader, TableManagerItem>> tableAreaTransformToSection(List<TableArea> mItems) {
List<QMUISection<SectionHeader, TableManagerItem>> qmuiSections = new ArrayList<>();
for (int i = 0; i < mItems.size(); i++) {
TableArea tableArea = mItems.get(i);
qmuiSections.add(createSection(tableArea));
......@@ -149,9 +149,9 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
return qmuiSections;
}
private QMUISection<SectionHeader, TableItem> createSection(TableArea tableArea) {
private QMUISection<SectionHeader, TableManagerItem> createSection(TableArea tableArea) {
SectionHeader header = new SectionHeader(tableArea.getRegionName());
ArrayList<TableItem> contents = new ArrayList<>();
ArrayList<TableManagerItem> contents = new ArrayList<>();
if (Objects.requireNonNull(tableArea.getTableItemList().size()) > 0) {
contents.addAll(tableArea.getTableItemList());
}
......@@ -164,8 +164,8 @@ public class TableListPresenter extends BasePresenter<TableListContract.Model, T
*
* @return
*/
private TableItem createAddTableItem(TableArea tableArea) {
TableItem item = new TableItem();
private TableManagerItem createAddTableItem(TableArea tableArea) {
TableManagerItem item = new TableManagerItem();
item.setLayoutType(1);
item.setStatus(0);
item.setRegionId(tableArea.getId());
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
......@@ -292,7 +292,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
mRootView.queryTablesSuccess(tableItems, TableManageActivity.ADD_TABLE_SUCCESS);
}
} else {
......@@ -335,7 +335,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
mRootView.queryTablesSuccess(tableItems, TableManageActivity.DELETE_TABLE_SUCCESS);
}
} else {
......@@ -377,7 +377,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
if (tableItems.size() > 0) {
mRootView.queryTablesSuccess(tableItems, TableManageActivity.UPDATE_TABLE_SUCCESS);
} else {
......@@ -419,7 +419,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
mRootView.queryTablesSuccess(tableItems, TableManageActivity.QUERY_TABLE_SUCCESS);
if (tableItems.size() > 0) {
} else {
......@@ -538,7 +538,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
if (tableItems.size() > 0) {
mRootView.queryTablesSuccess(tableItems, TableManageActivity.CHANGE_TABLE_SORT);
} else {
......@@ -574,7 +574,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void onNext(@NonNull BaseResult info) {
if (info != null && info.isSuccess()) {
if (info.getData() != null) {
List<TableItem> tableItems = JsonUtils.parseArray(info.getData(), TableItem.class);
List<TableManagerItem> tableItems = JsonUtils.parseArray(info.getData(), TableManagerItem.class);
if (tableItems.size() > 0) {
mRootView.queryTablesSuccess(tableItems, TableManageActivity.UPDATE_TABLE_SERVICE_CHARGE);
} else {
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
......@@ -4,7 +4,7 @@ import android.content.Intent;
import android.os.Bundle;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableManageComponent;
import com.gingersoft.gsa.cloud.manager.mvp.contract.TableManageContract;
......@@ -72,7 +72,7 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
private List<TableArea> mTableAreaList = new ArrayList<>();
private List<TableItem> mTableList = new ArrayList<>();
private List<TableManagerItem> mTableList = new ArrayList<>();
@Override
public void setupActivityComponent(@NonNull AppComponent appComponent) {
......@@ -256,7 +256,7 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
}
@Override
public void queryTablesSuccess(List<TableItem> tables, int type) {
public void queryTablesSuccess(List<TableManagerItem> tables, int type) {
if (mTableList.size() > 0) {
mTableList.clear();
}
......@@ -328,7 +328,7 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
return mTableAreaList;
}
public List<TableItem> getTableList() {
public List<TableManagerItem> getTableList() {
return mTableList;
}
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/TableManageSectiontAdapter.java
......@@ -10,7 +10,7 @@ import android.widget.CompoundButton;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.base.utils.StringUtils;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
......@@ -39,7 +39,7 @@ import butterknife.ButterKnife;
* 修订历史：2020-02-09
* 描述：
*/
public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<SectionHeader, TableItem> {
public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<SectionHeader, TableManagerItem> {
private Context context;
private boolean isRadioEdit = false;
......@@ -85,12 +85,12 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
}
@Override
protected void onBindSectionHeader(QMUIStickySectionAdapter.ViewHolder holder, int position, QMUISection<SectionHeader, TableItem> section) {
protected void onBindSectionHeader(QMUIStickySectionAdapter.ViewHolder holder, int position, QMUISection<SectionHeader, TableManagerItem> section) {
super.onBindSectionHeader(holder, position, section);
QDSectionHeaderView itemView = (QDSectionHeaderView) holder.itemView;
itemView.render(section.getHeader(), section.isFold());
for (int i = 0; i < section.getItemList().size(); i++) {
TableItem tableItem = section.getItemList().get(i);
TableManagerItem tableItem = section.getItemList().get(i);
if(!mSelectedStatus.containsKey(tableItem.getId())) {
mSelectedStatus.put(tableItem.getId(),false);
}
......@@ -106,11 +106,11 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
}
@Override
protected void onBindSectionItem(QMUIStickySectionAdapter.ViewHolder holder, int position, QMUISection<SectionHeader, TableItem> section, int itemIndex) {
protected void onBindSectionItem(QMUIStickySectionAdapter.ViewHolder holder, int position, QMUISection<SectionHeader, TableManagerItem> section, int itemIndex) {
super.onBindSectionItem(holder, position, section, itemIndex);
ViewHolder viewHolder = (ViewHolder) holder;
TableItem tableItem = section.getItemAt(itemIndex);
TableManagerItem tableItem = section.getItemAt(itemIndex);
if (tableItem.getLayoutType() == 1) {
......@@ -160,7 +160,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
viewHolder.ll_container.setRadiusAndShadow(mRadius, QMUIDisplayHelper.dp2px(context, mShadowElevationDp), mShadowAlpha);
}
private void initTableItemData(ViewHolder viewHolder, TableItem item) {
private void initTableItemData(ViewHolder viewHolder, TableManagerItem item) {
viewHolder.tv_table.setText(item.getTableName());
......@@ -186,15 +186,15 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
if (item.getStatus() != 0) {
switch (item.getType()) {
case TableItem.TABLE_TYPE_CANTEEN:
case TableManagerItem.TABLE_TYPE_CANTEEN:
viewHolder.tv_type_labe.setText("堂");
viewHolder.tv_type_labe.setTextColor(Color.parseColor("#249B65"));
break;
case TableItem.TABLE_TYPE_TAKEAWAY:
case TableManagerItem.TABLE_TYPE_TAKEAWAY:
viewHolder.tv_type_labe.setText("外");
viewHolder.tv_type_labe.setTextColor(Color.parseColor("#FF720A"));
break;
case TableItem.TABLE_TYPE_SELF_FETCHING:
case TableManagerItem.TABLE_TYPE_SELF_FETCHING:
viewHolder.tv_type_labe.setText("自");
viewHolder.tv_type_labe.setTextColor(Color.parseColor("#00479D"));
break;
......@@ -205,7 +205,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
}
}
private void initTableBackground(ViewHolder viewHolder, TableItem item) {
private void initTableBackground(ViewHolder viewHolder, TableManagerItem item) {
// if (item.getSplitStatus() != 0) {
// setBackGroundWork(item, "888", R.drawable.tablebutton_splite, R.drawable.tablebutton_splite_new, R.color.black);
// } else {
......@@ -319,8 +319,8 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
return tv_service_fee;
}
public TableItem getTableItem(int position) {
TableItem item = getSectionItem(position);
public TableManagerItem getTableItem(int position) {
TableManagerItem item = getSectionItem(position);
return item;
}
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
......@@ -70,7 +70,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
AddAreaFragment fragment = new AddAreaFragment();
if (area != null) {
Bundle args = new Bundle();
args.putSerializable(TABLE_AREA, area);
args.putParcelable(TABLE_AREA, area);
fragment.setArguments(args);
}
return fragment;
......@@ -89,7 +89,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mTableArea = (TableArea) getArguments().getSerializable(TABLE_AREA);
mTableArea = getArguments().getParcelable(TABLE_AREA);
}
@Override
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
......@@ -15,7 +15,7 @@ import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.TextView;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerAddTableComponent;
......@@ -67,7 +67,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
private EditText tableNameEditText, peopleMixNumberEditText, peopleMaxNumberEditText, defalutPeopleNumberEditText, serverchargeEditText;
private static final String TABLE_AREA = "table";
private TableItem mTableItem;
private TableManagerItem mTableItem;
private int currentAreaId;
......@@ -78,11 +78,11 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
private int tableType = -1;
public static AddTableFragment newInstance(TableItem item) {
public static AddTableFragment newInstance(TableManagerItem item) {
AddTableFragment fragment = new AddTableFragment();
if (item != null) {
Bundle args = new Bundle();
args.putSerializable(TABLE_AREA, item);
args.putParcelable(TABLE_AREA, item);
fragment.setArguments(args);
}
return fragment;
......@@ -102,7 +102,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mTableItem = (TableItem) getArguments().getSerializable(TABLE_AREA);
mTableItem = getArguments().getParcelable(TABLE_AREA);
}
@Override
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
......@@ -20,7 +20,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.table.bean.TableArea;
import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
import com.gingersoft.gsa.cloud.base.table.bean.TableManagerItem;
import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
import com.gingersoft.gsa.cloud.manager.di.component.DaggerTableListComponent;
......@@ -112,11 +112,11 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
private TableManageActivity mActivity;
private List<TableItem> mTableList = new ArrayList<>();
private List<TableManagerItem> mTableList = new ArrayList<>();
private List<TableArea> mAreaList = new ArrayList<>();
private TableManageSectiontAdapter mAdapter;
private List<QMUISection<SectionHeader, TableItem>> mTableAreaSectionList = new ArrayList<>();
private List<QMUISection<SectionHeader, TableManagerItem>> mTableAreaSectionList = new ArrayList<>();
private boolean initLoad = false;
/**
......@@ -145,10 +145,6 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
BaseFragment firstFragment = findChildFragment(TableListFragment.class);
if (firstFragment == null) {
}
}
@Override
......@@ -171,7 +167,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
for (int i = 0; i < mTableList.size(); i++) {
TableItem tableItem = mTableList.get(i);
TableManagerItem tableItem = mTableList.get(i);
if (tableItem.getStatus() == 0) {
mTableList.get(i).setChecked(isChecked);
}
......@@ -249,10 +245,10 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
private void initStickyLayout() {
mSectionLayout.setLayoutManager(createLayoutManager());
mAdapter = new TableManageSectiontAdapter();
mAdapter.setCallback(new QMUIStickySectionAdapter.Callback<SectionHeader, TableItem>() {
mAdapter.setCallback(new QMUIStickySectionAdapter.Callback<SectionHeader, TableManagerItem>() {
@Override
public void loadMore(QMUISection<SectionHeader, TableItem> section, boolean loadMoreBefore) {
public void loadMore(QMUISection<SectionHeader, TableManagerItem> section, boolean loadMoreBefore) {
}
......@@ -261,7 +257,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
if (holder instanceof TableManageSectiontAdapter.ViewHolder) {
TableManageSectiontAdapter.ViewHolder viewHolder = (TableManageSectiontAdapter.ViewHolder) holder;
if (viewHolder.getTvName().getText() != null) {
TableItem item = viewHolder.getTableItem(position);
TableManagerItem item = viewHolder.getTableItem(position);
if (item.getLayoutType() == 1) {
start(AddTableFragment.newInstance(item));
} else {
......@@ -324,7 +320,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
public void onMoveFinish(RecyclerView.Adapter adapter) {
if (mAdapter instanceof QMUIStickySectionAdapter) {
QMUIStickySectionAdapter qmuiStickySectionAdapter = (QMUIStickySectionAdapter) mAdapter;
List<QMUISection<SectionHeader, TableItem>> qmuiSectionList = qmuiStickySectionAdapter.getCurrentData();
List<QMUISection<SectionHeader, TableManagerItem>> qmuiSectionList = qmuiStickySectionAdapter.getCurrentData();
String ids = getTableIds(qmuiSectionList);
if (!TextUtils.isEmpty(ids)) {
......@@ -333,11 +329,11 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
}
}
private String getTableIds(List<QMUISection<SectionHeader, TableItem>> qmuiSectionList) {
private String getTableIds(List<QMUISection<SectionHeader, TableManagerItem>> qmuiSectionList) {
StringBuilder builder = new StringBuilder();
for (QMUISection<SectionHeader, TableItem> qmuiSections : qmuiSectionList) {
for (QMUISection<SectionHeader, TableManagerItem> qmuiSections : qmuiSectionList) {
for (QMUISection.Model t : qmuiSections.getItemList()) {
TableItem tableItem = (TableItem) t;
TableManagerItem tableItem = (TableManagerItem) t;
if (tableItem.getLayoutType() == 0) {
builder.append(tableItem.getId());
builder.append(",");
......@@ -374,7 +370,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
}
mAreaList.addAll(tableAreaList);
for (TableItem item : mTableList) {
for (TableManagerItem item : mTableList) {
if (item.getRegionId() == 0) {
item.setRegionId(-1);
}
......@@ -392,13 +388,13 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
initLoad = true;
}
public void updateTableData(List<TableArea> tableAreaList, List<TableItem> tableItemList) {
public void updateTableData(List<TableArea> tableAreaList, List<TableManagerItem> tableItemList) {
initParms();
mTableList.addAll(tableItemList);
for (TableItem item : mTableList) {
for (TableManagerItem item : mTableList) {
if (item.getRegionId() == 0) {
item.setRegionId(-1);
}
......@@ -477,7 +473,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
StringBuilder builder = new StringBuilder();
for (int i = 0; i < mTableAreaSectionList.size(); i++) {
for (int j = 0; j < mTableAreaSectionList.get(i).getItemCount(); j++) {
TableItem tableItem = mTableAreaSectionList.get(i).getItemAt(j);
TableManagerItem tableItem = mTableAreaSectionList.get(i).getItemAt(j);
if (tableItem.isChecked()) {
builder.append(tableItem.getId());
builder.append(",");
......@@ -494,7 +490,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
private List<TableRequest.UpdateServiceCharge> getModifyServiceChargeList(double modifyServiceCharge) {
List<TableRequest.UpdateServiceCharge> updateServiceCharges = new ArrayList<>();
for (int i = 0; i < mTableList.size(); i++) {
TableItem tableItem = mTableList.get(i);
TableManagerItem tableItem = mTableList.get(i);
if (tableItem.isChecked()) {
TableRequest.UpdateServiceCharge updateServiceCharge = new TableRequest.UpdateServiceCharge();
updateServiceCharge.setId(tableItem.getId());
......@@ -673,7 +669,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
}
@Override
public List<TableItem> getTableList() {
public List<TableManagerItem> getTableList() {
return mTableList;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/DeleteOrderRequest.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.base.order.bean;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-02-22
* 修订历史：2020-02-22
* 描述：
* @author admin
*/
@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;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public int getNumber() {
return number;
}
public void setNumber(int number) {
this.number = number;
}
}
public List<DeleteBean> getMapsDelete() {
return mapsDelete;
}
public void setMapsDelete(List<DeleteBean> mapsDelete) {
this.mapsDelete = mapsDelete;
}
public long getOrderId() {
return orderId;
}
public void setOrderId(long orderId) {
this.orderId = orderId;
}
public long getTableId() {
return tableId;
}
public void setTableId(long tableId) {
this.tableId = tableId;
}
public String getTableNumber() {
return tableNumber;
}
public void setTableNumber(String tableNumber) {
this.tableNumber = tableNumber;
}
public byte getType() {
return type;
}
public void setType(byte type) {
this.type = type;
}
public long getReasonId() {
return reasonId;
}
public void setReasonId(long reasonId) {
this.reasonId = reasonId;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/OrderPayRequest.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.base.order.bean;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-25
* 修订历史：2020-07-25
* 描述：
*/
@Data
public class OrderPayRequest {
private long orderId;
private int linePayType;
private int orderPayType;
private int tableId;
private String tableNumber;
private Long memberId;
private Long couponId;
/**當前加的積分*/
private Double pointsAdd;
/**當前減去的積分*/
private Double pointsUse;
/**
* 是否免服務費(0:否 1：是)
*/
private int whetherFreeService;
private List<OrderPay> orderPays = new ArrayList<>();
@Data
public static class OrderPay {
private int payType;
private double amount;
private double tipsPrice;
/**積分支付 所消費的積分*/
private Double consumptionPoints;
public int getPayType() {
return payType;
}
public void setPayType(int payType) {
this.payType = payType;
}
public double getAmount() {
return amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public double getTipsPrice() {
return tipsPrice;
}
public void setTipsPrice(double tipsPrice) {
this.tipsPrice = tipsPrice;
}
public Double getConsumptionPoints() {
return consumptionPoints;
}
public void setConsumptionPoints(Double consumptionPoints) {
this.consumptionPoints = consumptionPoints;
}
}
public long getOrderId() {
return orderId;
}
public void setOrderId(long orderId) {
this.orderId = orderId;
}
public int getLinePayType() {
return linePayType;
}
public void setLinePayType(int linePayType) {
this.linePayType = linePayType;
}
public int getOrderPayType() {
return orderPayType;
}
public void setOrderPayType(int orderPayType) {
this.orderPayType = orderPayType;
}
public int getTableId() {
return tableId;
}
public void setTableId(int tableId) {
this.tableId = tableId;
}
public String getTableNumber() {
return tableNumber;
}
public void setTableNumber(String tableNumber) {
this.tableNumber = tableNumber;
}
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Long getCouponId() {
return couponId;
}
public void setCouponId(Long couponId) {
this.couponId = couponId;
}
public Double getPointsAdd() {
return pointsAdd;
}
public void setPointsAdd(Double pointsAdd) {
this.pointsAdd = pointsAdd;
}
public Double getPointsUse() {
return pointsUse;
}
public void setPointsUse(Double pointsUse) {
this.pointsUse = pointsUse;
}
public int getWhetherFreeService() {
return whetherFreeService;
}
public void setWhetherFreeService(int whetherFreeService) {
this.whetherFreeService = whetherFreeService;
}
public List<OrderPay> getOrderPays() {
return orderPays;
}
public void setOrderPays(List<OrderPay> orderPays) {
this.orderPays = orderPays;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountBean.java
......@@ -66,7 +66,6 @@ public class CouponDiscountBean {
// 是否累計滿減：0否，1是
private Byte accumulate;
public String getName(){
if(!TextUtils.isEmpty(couponTypeName1)) {
return this.couponTypeName1;
......@@ -79,227 +78,4 @@ public class CouponDiscountBean {
}
return "";
}
/**
* 計算優惠券金額
* @param discount
* @param amount
* @param sourcePrice
* @return
*/
public static double calculationCoupon(double discount,double amount, double sourcePrice) {
double discountPrice = 0;
if (amount != 0) {
//金額折扣
discountPrice = amount;
} else if(discount != 0){
//百分比折扣
discountPrice = MoneyUtil.divide(MoneyUtil.multiply(sourcePrice,discount), 100).doubleValue();
}
if (sourcePrice < discountPrice) {
//折扣金額不能超出總額
discountPrice = sourcePrice;
}
return -MoneyUtil.get_ItemDecimals_money(Math.abs(discountPrice));
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(Long restaurantId) {
this.restaurantId = restaurantId;
}
public Long getBrandId() {
return brandId;
}
public void setBrandId(Long brandId) {
this.brandId = brandId;
}
public String getCouponTypeName1() {
return couponTypeName1;
}
public void setCouponTypeName1(String couponTypeName1) {
this.couponTypeName1 = couponTypeName1;
}
public String getCouponTypeName2() {
return couponTypeName2;
}
public void setCouponTypeName2(String couponTypeName2) {
this.couponTypeName2 = couponTypeName2;
}
public String getCouponTypeName3() {
return couponTypeName3;
}
public void setCouponTypeName3(String couponTypeName3) {
this.couponTypeName3 = couponTypeName3;
}
public String getBeginDate() {
return beginDate;
}
public void setBeginDate(String beginDate) {
this.beginDate = beginDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public Integer getPeriodDays() {
return periodDays;
}
public void setPeriodDays(Integer periodDays) {
this.periodDays = periodDays;
}
public String getPeriodDate() {
return periodDate;
}
public void setPeriodDate(String periodDate) {
this.periodDate = periodDate;
}
public Integer getUpperLimitTimes() {
return upperLimitTimes;
}
public void setUpperLimitTimes(Integer upperLimitTimes) {
this.upperLimitTimes = upperLimitTimes;
}
public Byte getCouponType() {
return couponType;
}
public void setCouponType(Byte couponType) {
this.couponType = couponType;
}
public Byte getStatus() {
return status;
}
public void setStatus(Byte status) {
this.status = status;
}
public Double getBillMinAmount() {
return billMinAmount;
}
public void setBillMinAmount(Double billMinAmount) {
this.billMinAmount = billMinAmount;
}
public Integer getSamebillLimitTimes() {
return samebillLimitTimes;
}
public void setSamebillLimitTimes(Integer samebillLimitTimes) {
this.samebillLimitTimes = samebillLimitTimes;
}
public Byte getExclusive() {
return exclusive;
}
public void setExclusive(Byte exclusive) {
this.exclusive = exclusive;
}
public Byte getxSc() {
return xSc;
}
public void setxSc(Byte xSc) {
this.xSc = xSc;
}
public double getAmount() {
return amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public int getDiscount() {
return discount;
}
public void setDiscount(int discount) {
this.discount = discount;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Byte getxPoints() {
return xPoints;
}
public void setxPoints(Byte xPoints) {
this.xPoints = xPoints;
}
public Byte getUsageType() {
return usageType;
}
public void setUsageType(Byte usageType) {
this.usageType = usageType;
}
public Byte getIsType() {
return isType;
}
public void setIsType(Byte isType) {
this.isType = isType;
}
public Double getSpend() {
return spend;
}
public void setSpend(Double spend) {
this.spend = spend;
}
public Byte getAccumulate() {
return accumulate;
}
public void setAccumulate(Byte accumulate) {
this.accumulate = accumulate;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/request/DeleteOrderRequest.java 0 → 100644
package com.gingersoft.gsa.cloud.base.order.bean.request;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-02-22
* 修订历史：2020-02-22
* 描述：
* @author admin
*/
@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;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/OrderDiscount.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/request/OrderDiscountRequest.java
package com.gingersoft.gsa.cloud.base.order.bean.discount;
package com.gingersoft.gsa.cloud.base.order.bean.request;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderDiscountResponse;
import com.gingersoft.gsa.cloud.base.order.billItem.DiscountItem;
import com.gingersoft.gsa.cloud.base.order.discount.MemberDiscount;
import com.gingersoft.gsa.cloud.base.order.discount.NomalDiscount;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import java.io.Serializable;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-09-22
* 修订历史：2020-09-22
* 描述：
* @author : bin
* @create date: 2020-11-11
* @update date: 2020-11-11
* @description:
*/
public class OrderDiscount {
public static final int ORDER_DISCOUNT = 0;
public static final int MEMBER_DISCOUNT = 1;
public static final int COUPON_DISCOUNT = 2;
@Data
public static class Request {
/**
* 0#餐廳折扣
* 1#會員折扣
* 2#优惠券折扣
*/
private int type;
/**
* 折扣ID
*/
private Long discountId;
/**
* 會員折扣ID
*/
private Long memberId;
/**
* 會員折扣比例
*/
private Integer memberDiscountRate;
/**
* 折扣金額
*/
private double discountAmount;
/**
* 是否计算服务费
*/
private int scAble;
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Long getDiscountId() {
return discountId;
}
public void setDiscountId(Long discountId) {
this.discountId = discountId;
}
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Integer getMemberDiscountRate() {
return memberDiscountRate;
}
public void setMemberDiscountRate(Integer memberDiscountRate) {
this.memberDiscountRate = memberDiscountRate;
}
public double getDiscountAmount() {
return discountAmount;
}
public void setDiscountAmount(double discountAmount) {
this.discountAmount = discountAmount;
}
public int getScAble() {
return scAble;
}
public void setScAble(int scAble) {
this.scAble = scAble;
}
public static Request orderDiscountTransRequest(DiscountItem discount) {
Request request = new Request();
request.setType(ORDER_DISCOUNT);
if(discount.getDiscount() != null) {
NomalDiscount discount1 = (NomalDiscount) discount.getDiscount();
request.setDiscountId(discount1.getDiscount().getId());
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
@Data
public class OrderDiscountRequest {
public static final byte ORDER_DISCOUNT = 0;
public static final byte MEMBER_DISCOUNT = 1;
public static final byte COUPON_DISCOUNT = 2;
/**
* 0#餐廳折扣
* 1#會員折扣
* 2#优惠券折扣
*/
private byte type;
/**
* 折扣ID
*/
private Long discountId;
/**
* 會員折扣ID
*/
private Long memberId;
/**
* 會員折扣比例
*/
private Integer memberDiscountRate;
/**
* 折扣金額
*/
private double discountAmount;
/**
* 是否计算服务费
*/
private int scAble;
public static OrderDiscountRequest orderDiscountTransRequest(DiscountItem discount) {
OrderDiscountRequest request = new OrderDiscountRequest();
request.setType(ORDER_DISCOUNT);
if(discount.getDiscount() != null) {
NomalDiscount discount1 = (NomalDiscount) discount.getDiscount();
request.setDiscountId(discount1.getDiscount().getId());
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
}
public static Request memberDiscountTransRequest(DiscountItem discount) {
Request request = new Request();
request.setType(MEMBER_DISCOUNT);
if(discount.getDiscount() != null) {
MemberDiscount memberDiscount = (MemberDiscount) discount.getDiscount();
request.setMemberId(memberDiscount.getMemberDiscount().getId());
public static OrderDiscountRequest memberDiscountTransRequest(DiscountItem discount) {
OrderDiscountRequest request = new OrderDiscountRequest();
request.setType(MEMBER_DISCOUNT);
if(discount.getDiscount() != null) {
MemberDiscount memberDiscount = (MemberDiscount) discount.getDiscount();
request.setMemberId(memberDiscount.getMemberDiscount().getId());
// request.setMemberDiscountRate((int) memberDiscount.getDiscount().getDiscount_value());
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
}
public static Request couponDiscountTransRequest(DiscountItem discount) {
Request request = new Request();
request.setType(COUPON_DISCOUNT);
if(discount.getDiscount() != null) {
public static OrderDiscountRequest couponDiscountTransRequest(DiscountItem discount) {
OrderDiscountRequest request = new OrderDiscountRequest();
request.setType(COUPON_DISCOUNT);
if(discount.getDiscount() != null) {
// request.setMemberId(discount.getDiscount().getMemberId());
// request.setDiscountId(discount.getDiscount().getId());
// request.setMemberDiscountRate((int) discount.getDiscount().getDiscount_value());
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
}
request.setDiscountAmount(discount.getMoney());
request.setScAble(0);
return request;
}
@Data
public static class Respose implements Serializable {
/**
* 餐廳折扣ID
*/
private Long discountId;
/**折扣金額*/
private double discountAmount;
/**折扣比例*/
private int discountValue;
/**
* 0#餐廳折扣
* 1#會員折扣
* 2#优惠券折扣
*/
private int type;
/**
* 餐廳折扣類型 0：金額，1：折扣，2：自定義金額，3：自由金額，數字盤，4：免服務費
*/
private byte discountType;
/**折扣名称1*/
private String remark;
/**折扣名称2*/
private String remark2;
/**折扣名称3*/
private String remark3;
/**
* 优惠券折扣相关
*/
// 消費滿
private Double spend;
// 是否累計滿減：0否，1是
private Byte accumulate;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/request/OrderPayRequest.java 0 → 100644
package com.gingersoft.gsa.cloud.base.order.bean.request;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-25
* 修订历史：2020-07-25
* 描述：
*/
@Data
public class OrderPayRequest {
private long orderId;
private int linePayType;
private int orderPayType;
private int tableId;
private String tableNumber;
private Long memberId;
private Long couponId;
/**當前加的積分*/
private Double pointsAdd;
/**當前減去的積分*/
private Double pointsUse;
/**
* 是否免服務費(0:否 1：是)
*/
private int whetherFreeService;
private List<OrderPay> orderPays = new ArrayList<>();
@Data
public static class OrderPay {
private int payType;
private double amount;
private double tipsPrice;
/**積分支付 所消費的積分*/
private Double consumptionPoints;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/discount/CouponDiscountResult.java → order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/response/CouponDiscountResponse.java
package com.gingersoft.gsa.cloud.base.order.bean.discount;
package com.gingersoft.gsa.cloud.base.order.bean.response;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.order.bean.discount.CouponDiscountBean;
import lombok.Data;
......@@ -13,7 +14,7 @@ import lombok.Data;
* 描述：扫码查询优惠券折扣返回实体
*/
@Data
public class CouponDiscountResult {
public class CouponDiscountResponse {
/**
* 會員優惠券信息
......@@ -31,31 +32,4 @@ public class CouponDiscountResult {
/**掃了其他會員的優惠券碼*/
public static final String ERROR_CODE_0003 = "MEMBER.0003";
public CouponDiscountBean getCouponBean() {
return couponBean;
}
public void setCouponBean(CouponDiscountBean couponBean) {
this.couponBean = couponBean;
}
public MemberInfo getMemberInfo() {
return memberInfo;
}
public void setMemberInfo(MemberInfo memberInfo) {
this.memberInfo = memberInfo;
}
public static String getErrorCode0001() {
return ERROR_CODE_0001;
}
public static String getErrorCode0002() {
return ERROR_CODE_0002;
}
public static String getErrorCode0003() {
return ERROR_CODE_0003;
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/response/OrderDiscountResponse.java 0 → 100644
package com.gingersoft.gsa.cloud.base.order.bean.response;
import java.io.Serializable;
import lombok.Data;
/**
* @author : bin
* @create date: 2020-11-11
* @update date: 2020-11-11
* @description:
*/
@Data
public class OrderDiscountResponse implements Serializable {
/**
* 餐廳折扣ID
*/
private Long discountId;
/**折扣金額*/
private double discountAmount;
/**折扣比例*/
private int discountValue;
/**
* 0#餐廳折扣
* 1#會員折扣
* 2#优惠券折扣
*/
private int type;
/**
* 餐廳折扣類型 0：金額，1：折扣，2：自定義金額，3：自由金額，數字盤，4：免服務費
*/
private byte discountType;
/**折扣名称1*/
private String remark;
/**折扣名称2*/
private String remark2;
/**折扣名称3*/
private String remark3;
/**
* 优惠券折扣相关
*/
/**
* 消費滿
*/
private Double spend;
/**
* 是否累計滿減：0否，1是
*/
private Byte accumulate;
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/bean/response/OrderResponse.java 0 → 100644
package com.gingersoft.gsa.cloud.base.order.bean.response;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import java.io.Serializable;
import java.util.List;
import lombok.Data;
/**
* Created by Wyh on 2020/1/17.
*/
@Data
public class OrderResponse {
/**
* id : 40553
* orderNo : gs204650350122922
* status : 0
* totalAmount : 141.qq
* totalPoints : 0.0
* createTime : Jan 14, 2020 7:49:50 PM
* orderDetails : [{"id":1621502,"productName":"胡椒排骨涼瓜煲","productId":"4257","price":58,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0},{"id":1621503,"productName":"海南雞(例牌)","productId":"4258","price":83,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0}]
*/
private long id = -1;
private String orderNo;
private int status;
private int person;
private double totalAmount;
private double totalPoints;
/**
* 生成訂單時間
*/
private String createTime;
private MemberInfo memberInfo;
private List<OrderDiscountResponse> discountDetails;
private List<OrderDetailsBean> orderDetails;
public OrderResponse() {
}
public OrderResponse(OrderResponse orderBean) {
this.id = orderBean.id;
this.orderNo = orderBean.orderNo;
this.status = orderBean.status;
this.person = orderBean.person;
this.memberInfo = orderBean.memberInfo;
this.discountDetails = orderBean.discountDetails;
this.createTime = orderBean.createTime;
}
@Data
public static class OrderDetailsBean implements Serializable {
/**
* id : 1621502
* orderId : 47039
* parentId : 1639956
* productName : 胡椒排骨涼瓜煲
* productId : 4257
* price : 58.0
* lunchboxPrice : 0.0
* number : 1
* createTime : Jan 14, 2020 8:00:11 PM
* status : 0
*/
private Long id;
private String productName;
private long productId;
/**
* 單價
*/
private double price;
private double lunchboxPrice;
private int number;
private String createTime;
private int status;
private byte type;
private long parentId;
private long orderId;
/**
* 打印設定, 用逗號分隔, *=切紙
*/
private String printSetIng;
/**
* 廚房單打印主項
*/
private long ktPrintMainItem;
/**
* 是否参与折扣#0:不參與;1:參與;
*/
private long ablediscount;
/**
* 是否参与服務費#0:不參與;1:參與;
**/
private byte scAble = 1;
/**折扣實體*/
private List<RestaurantDiscountVO> discountList;
/**
* 額外食品加分
*/
private double pointsAdd;
/**
* 換購食品所需積分
*/
private double pointsRedeem;
/**
* 0=系統顏色, 1=黑色, 2=紅色
*/
private long printFont;
/**
* 當金額=0時, 是否打印在帳單上
*/
private long printToBill;
/**
* 0食品清单打印 账单打印//1食品清单不打印 账单不打印//2食品清单打印 账单不打印//3食品清单不打印 账单打印
*/
private long printTo;
/**
* 是否打印价格
*/
private long ktShowPrice;
/**
* 自定義字段
*/
/**
* 商品父級ID
*/
private long topId;
private long memberId;
@Data
public static class RestaurantDiscountVO implements Serializable{
private Long id;
private long discountId;
private int type;
private int discountValue;
private String remark;
private double discountAmount;
}
}
}
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/commodity/MealCommodity.java
package com.gingersoft.gsa.cloud.base.order.commodity;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import com.gingersoft.gsa.cloud.base.order.discount.NomalDiscount;
import com.gingersoft.gsa.cloud.base.order.order.BaseOrder;
import com.gingersoft.gsa.cloud.base.order.order.DoshokuOrder;
......@@ -289,7 +289,7 @@ public class MealCommodity implements Commodity {
* @param orderList
* @return
*/
public static List<Commodity> orderTransMealCommoditys(List<OrderBean.OrderDetailsBean> orderList) {
public static List<Commodity> orderTransMealCommoditys(List<OrderResponse.OrderDetailsBean> orderList) {
List<Commodity> mealCommodityList = new ArrayList<>();
MealCommodity parentMealCommodity = null;
long parentId = 0;
......@@ -297,7 +297,7 @@ public class MealCommodity implements Commodity {
double discountSourcePrice = 0;
//已到結尾或者下一個食品是主食品
for (int i = 0; i < orderList.size(); i++) {
OrderBean.OrderDetailsBean mealCommoditysBean = orderList.get(i);
OrderResponse.OrderDetailsBean mealCommoditysBean = orderList.get(i);
MealCommodity mealCommodity = new MealCommodity();
mealCommodity.setOrderId(mealCommoditysBean.getOrderId());
......@@ -337,7 +337,7 @@ public class MealCommodity implements Commodity {
discountSourcePrice = 0;
}
if (mealCommoditysBean.getRestaurantDiscountVO() != null) {
if (mealCommoditysBean.getDiscountList() != null) {
//累加折扣總額
discountSourcePrice = MoneyUtil.sum(discountSourcePrice, mealCommodity.getPrice());
//食品折扣狀態為已送單
......@@ -346,9 +346,11 @@ public class MealCommodity implements Commodity {
int nextIndex = i + 1;
if (orderList.size() == nextIndex || orderList.get(nextIndex).getParentId() == 0) {
//已到結尾或者下一個食品是主食品
Discount discount = getDiscountItem(mealCommoditysBean.getRestaurantDiscountVO());
if (discount != null) {
mealCommodityList.add(discountTransMealCommodity(discount, false, parentId, discountSourcePrice));
List<OrderResponse.OrderDetailsBean.RestaurantDiscountVO> discountList = mealCommoditysBean.getDiscountList();
if (discountList != null) {
for (OrderResponse.OrderDetailsBean.RestaurantDiscountVO discount : discountList) {
mealCommodityList.add(discountTransMealCommodity(getDiscountItem(discount), false, parentId, discountSourcePrice));
}
}
}
} else {
......@@ -362,7 +364,7 @@ public class MealCommodity implements Commodity {
return mealCommodityList;
}
private static Discount getDiscountItem(OrderBean.OrderDetailsBean.RestaurantDiscountVO discountBean) {
private static Discount getDiscountItem(OrderResponse.OrderDetailsBean.RestaurantDiscountVO discountBean) {
Discount discount = new Discount();
discount.setId(discountBean.getId());
discount.setDiscountValue(discountBean.getDiscountValue());
......@@ -372,7 +374,7 @@ public class MealCommodity implements Commodity {
return discount;
}
public static int getItemType(OrderBean.OrderDetailsBean mealCommoditysBean, MealCommodity parentMealCommodity) {
public static int getItemType(OrderResponse.OrderDetailsBean mealCommoditysBean, MealCommodity parentMealCommodity) {
if (mealCommoditysBean != null) {
if (mealCommoditysBean.getParentId() == 0) {
return 1;
......
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/commodity/OrderDetail.java
package com.gingersoft.gsa.cloud.base.order.commodity;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.discount.OrderDiscount;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import com.gingersoft.gsa.cloud.base.order.discount.NomalDiscount;
import com.gingersoft.gsa.cloud.base.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
......@@ -199,7 +198,7 @@ public class OrderDetail implements Commodity, Serializable {
*/
private Discount discount;
/**
* 折扣狀態#0:沒有折扣;1:折扣未送單;2:折扣已送單;
* 折扣狀態#0:沒有折扣;1:有折扣未送單;2:折扣全部已送單;
*/
private int discountStatus;
/**
......@@ -1006,7 +1005,7 @@ public class OrderDetail implements Commodity, Serializable {
* @param orderList
* @return
*/
public static List<OrderDetail> orderTransOrderDetails(List<OrderBean.OrderDetailsBean> orderList) {
public static List<OrderDetail> orderTransOrderDetails(List<OrderResponse.OrderDetailsBean> orderList) {
List<OrderDetail> orderDetailList = new ArrayList<>();
OrderDetail parentOrderDetail = null;
long parentId = 0;
......@@ -1014,7 +1013,7 @@ public class OrderDetail implements Commodity, Serializable {
double discountSourcePrice = 0;
//已到結尾或者下一個食品是主食品
for (int i = 0; i < orderList.size(); i++) {
OrderBean.OrderDetailsBean orderDetailsBean = orderList.get(i);
OrderResponse.OrderDetailsBean orderDetailsBean = orderList.get(i);
OrderDetail orderDetail = new OrderDetail();
orderDetail.setOrderId(orderDetailsBean.getOrderId());
......@@ -1054,7 +1053,7 @@ public class OrderDetail implements Commodity, Serializable {
discountSourcePrice = 0;
}
if (orderDetailsBean.getRestaurantDiscountVO() != null) {
if (orderDetailsBean.getDiscountList() != null) {
//累加折扣總額
discountSourcePrice = MoneyUtil.sum(discountSourcePrice, orderDetail.getPrice());
//食品折扣狀態為已送單
......@@ -1063,9 +1062,14 @@ public class OrderDetail implements Commodity, Serializable {
int nextIndex = i + 1;
if (orderList.size() == nextIndex || orderList.get(nextIndex).getParentId() == 0) {
//已到結尾或者下一個食品是主食品
Discount discount = getDiscountItem(orderDetailsBean.getRestaurantDiscountVO());
if (discount != null) {
orderDetailList.add(discountTransOrderDetail(discount, false, parentId, discountSourcePrice));
List<OrderResponse.OrderDetailsBean.RestaurantDiscountVO> discountList = orderDetailsBean.getDiscountList();
if (discountList != null) {
for (OrderResponse.OrderDetailsBean.RestaurantDiscountVO discount : discountList) {
if (discount == null) {
continue;
}
orderDetailList.add(discountTransOrderDetail(getDiscountItem(discount), false, parentId, discountSourcePrice));
}
}
}
} else {
......@@ -1079,11 +1083,10 @@ public class OrderDetail implements Commodity, Serializable {
return orderDetailList;
}
//PLU可输入子项
//食品数量支持小数 例如1.25
private static Discount getDiscountItem(OrderBean.OrderDetailsBean.RestaurantDiscountVO discountBean) {
private static Discount getDiscountItem(OrderResponse.OrderDetailsBean.RestaurantDiscountVO discountBean) {
Discount discount = new Discount();
discount.setId(discountBean.getId());
discount.setId(discountBean.getDiscountId());
discount.setDiscountRecordId(discountBean.getId());
discount.setDiscountValue(discountBean.getDiscountValue());
discount.setAmount(discountBean.getDiscountAmount());
discount.setType(discountBean.getType());
......@@ -1091,7 +1094,7 @@ public class OrderDetail implements Commodity, Serializable {
return discount;
}
public static int getItemType(OrderBean.OrderDetailsBean orderDetailsBean, OrderDetail parentOrderDetail) {
public static int getItemType(OrderResponse.OrderDetailsBean orderDetailsBean, OrderDetail parentOrderDetail) {
if (orderDetailsBean != null) {
if (orderDetailsBean.getParentId() == 0) {
return 1;
......@@ -1219,7 +1222,7 @@ public class OrderDetail implements Commodity, Serializable {
public static OrderDetail modifierTransOrderDetail(Modifier modifier, long id, long productId, int number) {
OrderDetail orderDetail = new OrderDetail();
orderDetail.setProductName(modifier.getModifierName());
modifier.getKtPrintMainItem();
orderDetail.setKtPrintMainItem(modifier.getKtPrintMainItem());
orderDetail.setTopId(modifier.getTopId());
orderDetail.setParentId(id);
orderDetail.setProductId(modifier.getMid());
......
order-base/src/main/java/com/gingersoft/gsa/cloud/base/order/order/DoshokuOrder.java
......@@ -3,9 +3,8 @@ package com.gingersoft.gsa.cloud.base.order.order;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.base.order.Member;
import com.gingersoft.gsa.cloud.base.order.bean.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.cart.ShoppingCart;
import com.gingersoft.gsa.cloud.base.order.bean.request.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import com.gingersoft.gsa.cloud.base.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
......@@ -42,7 +41,7 @@ public class DoshokuOrder extends BaseOrder implements Member {
/**
* 已下單信息
*/
private OrderBean orderPlaced;
private OrderResponse orderPlaced;
/**
* 開台信息
*/
......
print-module/src/main/AndroidManifest.xml
......@@ -2,27 +2,32 @@
package="com.joe.print">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<application>
<activity
android:name=".mvp.ui.activity.PrintActivity"
android:launchMode="singleTop"
android:theme="@style/print_TranslucentTheme"/>
android:theme="@style/print_TranslucentTheme" />
<activity android:name=".mvp.ui.activity.PrinterListActivity"
android:screenOrientation="portrait"/>
<activity android:name=".mvp.ui.activity.PrinterAddActivity"
android:screenOrientation="portrait"/>
<service android:name=".mvp.print.service.PrjService"/>
<activity
android:name=".mvp.ui.activity.PrinterListActivity"
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.PrinterAddActivity"
android:screenOrientation="portrait" />
<service android:name=".mvp.print.service.PrjService" />
<meta-data
android:name="com.gingersoft.gsa.cloud.config.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
<activity
android:name=".mvp.ui.activity.PrintTestActivity"
android:screenOrientation="portrait"/>
<activity android:name=".mvp.ui.activity.PrintAddCurrencyActivity"
android:screenOrientation="portrait"/>
android:screenOrientation="portrait" />
<activity
android:name=".mvp.ui.activity.PrintAddCurrencyActivity"
android:screenOrientation="portrait" />
</application>
......
print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
......@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
......
print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
......@@ -152,19 +152,32 @@ public class PrintPrjKitchen extends PrinterRoot {
}
if (TextUtil.isEmptyOrNullOrUndefined(prjBean.getTableName())) {
layoutOpenTableTime.setVisibility(View.GONE);
if (prjBean.getOrderType() == 7) {
tvTableNumber.setText("自取");
tvTableNumber2.setText("自取");
if (!TextUtil.isEmptyOrNullOrUndefined(prjBean.getTakeFoodCode())) {
tvTakeCodeText.setVisibility(View.VISIBLE);
tvTakeCode.setVisibility(View.VISIBLE);
tvTakeCode.setText(prjBean.getTakeFoodCode());
}
} else {
tvTableNumber.setText("外賣");
tvTableNumber2.setText("外賣");
tvOrderNumberText.setText("訂單碼：");
tvOrderNumber.setText(prjBean.getTakeFoodCode());
switch (prjBean.getOrderType()) {
case 1:
case 3:
tvTableNumber.setText("堂食");
tvTableNumber2.setText("堂食");
if (!TextUtil.isEmptyOrNullOrUndefined(prjBean.getTakeFoodCode())) {
tvTakeCodeText.setVisibility(View.VISIBLE);
tvTakeCode.setVisibility(View.VISIBLE);
tvTakeCode.setText(prjBean.getTakeFoodCode());
}
break;
case 7:
tvTableNumber.setText("自取");
tvTableNumber2.setText("自取");
if (!TextUtil.isEmptyOrNullOrUndefined(prjBean.getTakeFoodCode())) {
tvTakeCodeText.setVisibility(View.VISIBLE);
tvTakeCode.setVisibility(View.VISIBLE);
tvTakeCode.setText(prjBean.getTakeFoodCode());
}
break;
default:
tvTableNumber.setText("外賣");
tvTableNumber2.setText("外賣");
tvOrderNumberText.setText("訂單碼：");
tvOrderNumber.setText(prjBean.getTakeFoodCode());
break;
}
} else {
tvTableNumber.setText(prjBean.getTableName());
......
print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -471,8 +471,8 @@ public class PrjService extends Service implements ReceiveListener {
private PrintCurrencyBean getPrintCurrencyBean(List<PrjBean.DataBean.Bean> beans) {
PrintCurrencyBean printCurrencyBean = null;
if (beans != null && beans.size() > 0) {
if (beans.get(0).getOrderType() == 1) {
//堂食
if (beans.get(0).getOrderType() == 1 || beans.get(0).getOrderType() == 3 ) {
//堂食，skyorder
printCurrencyBean = MyPrintUtils.getPrintCurrencyBeanByType(mContext, 1);
} else {
//外賣
......
print-module/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
......@@ -33,7 +33,7 @@ public class MyPrintUtils {
* 通過類型獲取打印通用配置
*
* @param context
* @param type 1：堂食，2：外送
* @param type 1：堂食，2：外送，3：skyorder下單
* @return
*/
public static PrintCurrencyBean getPrintCurrencyBeanByType(Context context, int type) {
......
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableArea.java
package com.gingersoft.gsa.cloud.base.table.bean;
import android.os.Parcel;
import android.os.Parcelable;
import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-05-20
* 修订历史：2020-05-20
* 描述：
* 描述：餐檯管理 區域類
*/
public class TableArea implements Serializable, QMUISection.Model<TableArea> {
@Data
public class TableArea implements Parcelable, QMUISection.Model<TableArea> {
private Integer id;
//餐桌id
......@@ -30,7 +36,7 @@ public class TableArea implements Serializable, QMUISection.Model<TableArea> {
//创建时间
private Long createTime;
private List<TableItem> tableItemList = new ArrayList<>();
private List<TableManagerItem> tableItemList = new ArrayList<>();
/**是否選中*/
private boolean isChecked = false;
......@@ -51,86 +57,6 @@ public class TableArea implements Serializable, QMUISection.Model<TableArea> {
this.isChecked = area.isChecked;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getRestaurantTableId() {
return restaurantTableId;
}
public void setRestaurantTableId(Integer restaurantTableId) {
this.restaurantTableId = restaurantTableId;
}
public String getRegionName() {
return regionName;
}
public void setRegionName(String regionName) {
this.regionName = regionName;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public Integer getDeletes() {
return deletes;
}
public void setDeletes(Integer deletes) {
this.deletes = deletes;
}
public Long getUid() {
return uid;
}
public void setUid(Long uid) {
this.uid = uid;
}
public Long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Long updateTime) {
this.updateTime = updateTime;
}
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public List<TableItem> getTableItemList() {
return tableItemList;
}
public void setTableItemList(List<TableItem> tableItemList) {
this.tableItemList = tableItemList;
}
public boolean isChecked() {
return isChecked;
}
public void setChecked(boolean checked) {
isChecked = checked;
}
@Override
public TableArea cloneForDiff() {
return null;
......@@ -145,4 +71,50 @@ public class TableArea implements Serializable, QMUISection.Model<TableArea> {
public boolean isSameContent(TableArea other) {
return false;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeValue(this.id);
dest.writeValue(this.restaurantTableId);
dest.writeString(this.regionName);
dest.writeValue(this.sort);
dest.writeValue(this.deletes);
dest.writeValue(this.uid);
dest.writeValue(this.updateTime);
dest.writeValue(this.createTime);
dest.writeList(this.tableItemList);
dest.writeByte(this.isChecked ? (byte) 1 : (byte) 0);
}
protected TableArea(Parcel in) {
this.id = (Integer) in.readValue(Integer.class.getClassLoader());
this.restaurantTableId = (Integer) in.readValue(Integer.class.getClassLoader());
this.regionName = in.readString();
this.sort = (Integer) in.readValue(Integer.class.getClassLoader());
this.deletes = (Integer) in.readValue(Integer.class.getClassLoader());
this.uid = (Long) in.readValue(Long.class.getClassLoader());
this.updateTime = (Long) in.readValue(Long.class.getClassLoader());
this.createTime = (Long) in.readValue(Long.class.getClassLoader());
this.tableItemList = new ArrayList<TableManagerItem>();
in.readList(this.tableItemList, TableManagerItem.class.getClassLoader());
this.isChecked = in.readByte() != 0;
}
public static final Creator<TableArea> CREATOR = new Creator<TableArea>() {
@Override
public TableArea createFromParcel(Parcel source) {
return new TableArea(source);
}
@Override
public TableArea[] newArray(int size) {
return new TableArea[size];
}
};
}
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableBean.java
......@@ -10,7 +10,7 @@ import lombok.Data;
* 版本：1.6.0
* 创建日期：2019-12-28
* 修订历史：2019-12-28
* 描述：
* 描述：餐檯實體類
*
*/
public class TableBean {
......@@ -142,13 +142,27 @@ public class TableBean {
*/
private String tableNumber = "";
/**
* skyorder相關
*/
/**
* skyorder QRCode內容
* QRCode
*/
private String skyQrCode;
/**
* 餐種
*/
private long summaryId;
/**
* scan表ID
*/
private Long scanId;
public DataBean() {
}
public DataBean(DataBean dataBean) {
......@@ -174,182 +188,8 @@ public class TableBean {
this.splitStatus = dataBean.splitStatus;
this.tableNumber = dataBean.tableNumber;
this.skyQrCode = dataBean.skyQrCode;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public int getSeatCount() {
return seatCount;
}
public void setSeatCount(int seatCount) {
this.seatCount = seatCount;
}
public int getMaxSeatCount() {
return maxSeatCount;
}
public void setMaxSeatCount(int maxSeatCount) {
this.maxSeatCount = maxSeatCount;
}
public int getMinSeatCount() {
return minSeatCount;
}
public void setMinSeatCount(int minSeatCount) {
this.minSeatCount = minSeatCount;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getQrCodeImg() {
return qrCodeImg;
}
public void setQrCodeImg(String qrCodeImg) {
this.qrCodeImg = qrCodeImg;
}
public int getPosTableId() {
return posTableId;
}
public void setPosTableId(int posTableId) {
this.posTableId = posTableId;
}
public int getServiceCharge() {
return serviceCharge;
}
public void setServiceCharge(int serviceCharge) {
this.serviceCharge = serviceCharge;
}
public long getMemberId() {
return memberId;
}
public void setMemberId(long memberId) {
this.memberId = memberId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getPerson() {
return person;
}
public void setPerson(int person) {
this.person = person;
}
public int getUseStatus() {
return useStatus;
}
public void setUseStatus(int useStatus) {
this.useStatus = useStatus;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public int getSplitStatus() {
return splitStatus;
}
public void setSplitStatus(int splitStatus) {
this.splitStatus = splitStatus;
}
public String getTableNumber() {
return tableNumber;
}
public void setTableNumber(String tableNumber) {
this.tableNumber = tableNumber;
}
public String getSkyQrCode() {
return skyQrCode;
}
public void setSkyQrCode(String skyQrCode) {
this.skyQrCode = skyQrCode;
this.summaryId = dataBean.summaryId;
this.scanId = dataBean.scanId;
}
}
......
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableExtBean.java
......@@ -9,7 +9,7 @@ import lombok.Data;
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
* 描述：分台實體類
*/
@Data
public class TableExtBean {
......@@ -49,128 +49,16 @@ public class TableExtBean {
private long updateTime;
private long createTime;
/**
* skyorder QRCode內容
* skyorder相關
*/
/**
* QRCode
*/
private String skyQrCode;
/**
* 餐種
*/
private long summaryId;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getTableId() {
return tableId;
}
public void setTableId(int tableId) {
this.tableId = tableId;
}
public long getOrderId() {
return orderId;
}
public void setOrderId(long orderId) {
this.orderId = orderId;
}
public long getMemberId() {
return memberId;
}
public void setMemberId(long memberId) {
this.memberId = memberId;
}
public int getInUse() {
return inUse;
}
public void setInUse(int inUse) {
this.inUse = inUse;
}
public int getTableStatus() {
return tableStatus;
}
public void setTableStatus(int tableStatus) {
this.tableStatus = tableStatus;
}
public String getDeviceName() {
return deviceName;
}
public void setDeviceName(String deviceName) {
this.deviceName = deviceName;
}
public String getTableNumber() {
return tableNumber;
}
public void setTableNumber(String tableNumber) {
this.tableNumber = tableNumber;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public int getSeatCount() {
return seatCount;
}
public void setSeatCount(int seatCount) {
this.seatCount = seatCount;
}
public int getServiceCharge() {
return serviceCharge;
}
public void setServiceCharge(int serviceCharge) {
this.serviceCharge = serviceCharge;
}
public long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(long updateTime) {
this.updateTime = updateTime;
}
public long getCreateTime() {
return createTime;
}
public void setCreateTime(long createTime) {
this.createTime = createTime;
}
}
public TableBean.DataBean getRestaurantTable() {
return restaurantTable;
}
public void setRestaurantTable(TableBean.DataBean restaurantTable) {
this.restaurantTable = restaurantTable;
}
public List<DataBean> getRestaurantTableExtList() {
return restaurantTableExtList;
}
public void setRestaurantTableExtList(List<DataBean> restaurantTableExtList) {
this.restaurantTableExtList = restaurantTableExtList;
}
}
table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableItem.java → table-base/src/main/java/com/gingersoft/gsa/cloud/base/table/bean/TableManagerItem.java
package com.gingersoft.gsa.cloud.base.table.bean;
import android.os.Parcel;
import android.os.Parcelable;
import com.qmuiteam.qmui.widget.section.QMUISection;
import java.io.Serializable;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-05-20
* 修订历史：2020-05-20
* 描述：
* 描述：餐檯管理 餐檯類
*/
public class TableItem implements Serializable, QMUISection.Model<TableItem>{
@Data
public class TableManagerItem implements Parcelable, QMUISection.Model<TableManagerItem>{
/**
* id : 25839
......@@ -98,10 +101,10 @@ public class TableItem implements Serializable, QMUISection.Model<TableItem>{
*/
private int layoutType = 0;
public TableItem() {
public TableManagerItem() {
}
public TableItem(TableItem dataBean) {
public TableManagerItem(TableManagerItem dataBean) {
this.id = dataBean.id;
this.regionId = dataBean.regionId;
this.regionName = dataBean.regionName;
......@@ -126,203 +129,89 @@ public class TableItem implements Serializable, QMUISection.Model<TableItem>{
this.isChecked = dataBean.isChecked;
}
public int getPerson() {
return person;
}
public void setPerson(int person) {
this.person = person;
}
public int getUseStatus() {
return useStatus;
}
public void setUseStatus(int useStatus) {
this.useStatus = useStatus;
}
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public int getRegionId() {
return regionId;
}
public void setRegionId(int regionId) {
this.regionId = regionId;
}
public String getRegionName() {
return regionName;
}
public void setRegionName(String regionName) {
this.regionName = regionName;
}
public String getTableName() {
return tableName;
}
public void setTableName(String tableName) {
this.tableName = tableName;
}
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public String getQrCode() {
return qrCode;
}
public void setQrCode(String qrCode) {
this.qrCode = qrCode;
}
public int getSeatCount() {
return seatCount;
}
public void setSeatCount(int seatCount) {
this.seatCount = seatCount;
}
public int getMaxSeatCount() {
return maxSeatCount;
}
public void setMaxSeatCount(int maxSeatCount) {
this.maxSeatCount = maxSeatCount;
}
public int getMinSeatCount() {
return minSeatCount;
}
public void setMinSeatCount(int minSeatCount) {
this.minSeatCount = minSeatCount;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getQrCodeImg() {
return qrCodeImg;
}
public void setQrCodeImg(String qrCodeImg) {
this.qrCodeImg = qrCodeImg;
}
public int getPosTableId() {
return posTableId;
}
public void setPosTableId(int posTableId) {
this.posTableId = posTableId;
}
public int getServiceCharge() {
return serviceCharge;
}
public void setServiceCharge(int serviceCharge) {
this.serviceCharge = serviceCharge;
}
public int getMemberId() {
return memberId;
}
public void setMemberId(int memberId) {
this.memberId = memberId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
public boolean isChecked() {
return isChecked;
}
public void setChecked(boolean checked) {
isChecked = checked;
}
public int getLayoutType() {
return layoutType;
}
public void setLayoutType(int layoutType) {
this.layoutType = layoutType;
}
@Override
public TableItem cloneForDiff() {
public TableManagerItem cloneForDiff() {
return null;
}
@Override
public boolean isSameItem(TableItem other) {
public boolean isSameItem(TableManagerItem other) {
return false;
}
@Override
public boolean isSameContent(TableItem other) {
public boolean isSameContent(TableManagerItem other) {
return false;
}
@Override
public int describeContents() {
return 0;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(this.id);
dest.writeInt(this.regionId);
dest.writeString(this.regionName);
dest.writeString(this.tableName);
dest.writeInt(this.restaurantId);
dest.writeValue(this.orderId);
dest.writeString(this.qrCode);
dest.writeInt(this.seatCount);
dest.writeInt(this.maxSeatCount);
dest.writeInt(this.minSeatCount);
dest.writeString(this.createTime);
dest.writeString(this.createBy);
dest.writeString(this.qrCodeImg);
dest.writeInt(this.posTableId);
dest.writeInt(this.serviceCharge);
dest.writeInt(this.memberId);
dest.writeInt(this.status);
dest.writeInt(this.person);
dest.writeInt(this.useStatus);
dest.writeInt(this.sort);
dest.writeInt(this.type);
dest.writeByte(this.isChecked ? (byte) 1 : (byte) 0);
dest.writeInt(this.layoutType);
}
protected TableManagerItem(Parcel in) {
this.id = in.readLong();
this.regionId = in.readInt();
this.regionName = in.readString();
this.tableName = in.readString();
this.restaurantId = in.readInt();
this.orderId = (Long) in.readValue(Long.class.getClassLoader());
this.qrCode = in.readString();
this.seatCount = in.readInt();
this.maxSeatCount = in.readInt();
this.minSeatCount = in.readInt();
this.createTime = in.readString();
this.createBy = in.readString();
this.qrCodeImg = in.readString();
this.posTableId = in.readInt();
this.serviceCharge = in.readInt();
this.memberId = in.readInt();
this.status = in.readInt();
this.person = in.readInt();
this.useStatus = in.readInt();
this.sort = in.readInt();
this.type = in.readInt();
this.isChecked = in.readByte() != 0;
this.layoutType = in.readInt();
}
public static final Creator<TableManagerItem> CREATOR = new Creator<TableManagerItem>() {
@Override
public TableManagerItem createFromParcel(Parcel source) {
return new TableManagerItem(source);
}
@Override
public TableManagerItem[] newArray(int size) {
return new TableManagerItem[size];
}
};
}
table-module/src/main/AndroidManifest.xml
......@@ -34,7 +34,6 @@
<activity
android:name=".mvp.ui.activity.SoldoutCtrlActivity"
android:screenOrientation="portrait" />
<meta-data
android:name="com.gingersoft.gsa.cloud.config.globalconfig.GlobalConfiguration"
android:value="ConfigModule" />
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/ComponentTable.java
......@@ -11,30 +11,37 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterAc
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
public class ComponentTable implements IComponent {
public static final class table{
/**餐檯頁*/
public static final class table {
/**
* 餐檯頁
*/
public static final FModule[] bottom = {
new FModule("table/bottom/init", R.mipmap.table_init,0) ,
new FModule("table/bottom/move", R.mipmap.table_move,0) ,
new FModule("table/bottom/null", 0,0) ,
new FModule("table/bottom/splite", R.mipmap.table_splite,0) ,
new FModule("table/bottom/parper", R.mipmap.table_paper,0) ,
new FModule("table/bottom/skyorder", R.mipmap.table_skyorder,0)
new FModule("table/bottom/init", R.mipmap.table_init, 0),
new FModule("table/bottom/initSkyorder", R.mipmap.table_paper, 0),
new FModule("table/bottom/move", R.mipmap.table_move, 0),
new FModule("table/bottom/skyorder", 0, 0),
new FModule("table/bottom/splite", R.mipmap.table_splite, 0),
new FModule("table/bottom/parper", R.mipmap.table_paper, 0),
};
/**餐牌頁*/
public static final FModule [] meal = {
new FModule("table/meal/plu", R.mipmap.table_paper,0) ,
new FModule("table/meal/discount", R.mipmap.table_skyorder,0)
/**
* 餐牌頁
*/
public static final FModule[] meal = {
new FModule("table/meal/plu", R.mipmap.table_paper, 0),
new FModule("table/meal/discount", R.mipmap.table_skyorder, 0)
};
/**賬單內容頁*/
public static final FModule [] order = {
new FModule("table/order/send", 0,0) ,
new FModule("table/order/print", 0,0) ,
new FModule("table/order/pay", 0,0) ,
new FModule("table/order/transfer", 0,0) ,
new FModule("table/order/discount", 0,0)
/**
* 賬單內容頁
*/
public static final FModule[] order = {
new FModule("table/order/send", 0, 0),
new FModule("table/order/print", 0, 0),
new FModule("table/order/pay", 0, 0),
new FModule("table/order/transfer", 0, 0),
new FModule("table/order/discount", 0, 0)
};
}
......@@ -49,9 +56,10 @@ public class ComponentTable implements IComponent {
* 组件被调用时的入口
* 要确保每个逻辑分支都会调用到CC.sendCCResult，
* 包括try-catch,if-else,switch-case-default,startActivity
*
* @param cc 组件调用对象，可从此对象中获取相关信息
* @return true:将异步调用CC.sendCCResult(...),用于异步实现相关功能，例如：文件加载、网络请求等
* false:会同步调用CC.sendCCResult(...),即在onCall方法return之前调用，否则将被视为不合法的实现
* false:会同步调用CC.sendCCResult(...),即在onCall方法return之前调用，否则将被视为不合法的实现
*/
@Override
public boolean onCall(CC cc) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/BaseOrderContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView;
......@@ -40,7 +40,7 @@ public interface BaseOrderContract {
Observable<BaseResult> updateOrder(RequestBody formBody);
Observable<BaseOrderRespose> calculationPrice(long orderId);
Observable<BaseOrderResponse> calculationPrice(long orderId);
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealStandContract.java
......@@ -11,7 +11,7 @@ import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import com.jess.arms.base.DefaultAdapter;
......@@ -120,14 +120,14 @@ public interface MealStandContract {
Observable<BaseResult> addFood(RequestBody requestBody);
Observable<BaseOrderRespose> loadOrder(long orderId);
Observable<BaseOrderResponse> loadOrder(long orderId);
// Observable<BaseOrderRespose> deleteFood(List<Map<Byte, DeleteOrderRequest>> mapsDelete, long orderId, byte type, int reasonId);
Observable<BaseOrderRespose> deleteFood(RequestBody requestBody);
// Observable<BaseOrderResponse> deleteFood(List<Map<Byte, DeleteOrderRequest>> mapsDelete, long orderId, byte type, int reasonId);
Observable<BaseOrderResponse> deleteFood(RequestBody requestBody);
Observable<BaseOrderRespose> printOrder(RequestBody requestBody);
Observable<BaseOrderResponse> printOrder(RequestBody requestBody);
Observable<FoodReason> getRestaurantFoodReason(int brandId, int restaurantId, int type);
Observable<BaseResult> getRestaurantFoodReason(int brandId, int restaurantId, int type);
Observable<BaseResult> queryMember(int type, String parm, String shopName,int tableId,String tableNumber);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderCenterContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel;
......@@ -27,7 +27,7 @@ public interface OrderCenterContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
void returnOrderItemList(List<OrderDetailItem> orderItemList);
void returnOrderItemList(List<OrderManagerResponse> orderItemList);
void setPageIndex(int index);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
......@@ -4,8 +4,7 @@ import android.content.Intent;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.jess.arms.base.DefaultAdapter;
......@@ -75,19 +74,19 @@ public interface OrderContentContract {
List<Discount> queryDB_DiscountList(byte discountScope, byte discountType);
Observable<BaseOrderRespose> createOrder(RequestBody requestBody);
Observable<BaseOrderResponse> createOrder(RequestBody requestBody);
Observable<BaseOrderRespose> addFood(RequestBody requestBody);
Observable<BaseOrderResponse> addFood(RequestBody requestBody);
Observable<BaseOrderRespose> loadOrder(long orderId);
Observable<BaseOrderResponse> loadOrder(long orderId);
Observable<BaseOrderRespose> printOrder(RequestBody request);
Observable<BaseOrderResponse> printOrder(RequestBody request);
Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId,String tableNumber);
Observable<BaseResult> getTable(int tableId, String tableNumber);
Observable<BaseOrderRespose> transferFood(RequestBody requestBody);
Observable<BaseOrderResponse> transferFood(RequestBody requestBody);
Observable<BaseResult> getSplitTables(int tableId);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderDetailContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.OrderManagerResponse;
import com.jess.arms.mvp.IView;
import com.jess.arms.mvp.IModel;
import io.reactivex.Observable;
......@@ -24,7 +23,7 @@ public interface OrderDetailContract {
//对于经常使用的关于UI的方法可以定义到IView中,如显示隐藏进度条,和显示文字消息
interface View extends IView {
void returnOrderDetail(OrderDetailItem orderDetailItem);
void returnOrderDetail(OrderManagerResponse orderDetailItem);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderPayContract.java
......@@ -32,24 +32,8 @@ public interface OrderPayContract {
void showStatusDialog(int operatType);
void showPayKeypadDialog();
StatusLoadingDialog getStatusLoadingDialog();
void showSaleStatusDialog(SaleRespose saleRespose);
void showRefundStatusDialog(RefundRespose voidRespose);
void setBillMethodAdapter(BaseQuickAdapter adapter);
void setBillMoneyAdapter(BaseQuickAdapter adapter);
void setBillMoneyRvScrollToPosition(int position);
void paySuccess();
void onPayFailure(String status);
void loadPayMethodsSuccess(List<PayMethod> payMethods);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/TableContract.java
package com.gingersoft.gsa.cloud.table.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.table.action.TableAction;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllTableFragment;
import com.gingersoft.gsa.cloud.database.bean.Food;
......@@ -18,7 +15,6 @@ import java.util.List;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
/**
......@@ -68,6 +64,8 @@ public interface TableContract {
void setBottomFunctionVisibility(boolean show);
void setLockVisibility(boolean show);
void setCenterContentMarginBottom(int bottomMargin);
}
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
......@@ -79,15 +77,17 @@ public interface TableContract {
Observable<TableBean> getTables(int restaurantId);
Observable<TableDetail> getTable(int tableId,String tableNumber);
Observable<BaseResult> getTable(int tableId, String tableNumber);
Observable<BaseOrderResponse> getOrderById(long orderId);
Observable<BaseOrderRespose> getOrderById(long orderId);
Observable<BaseOrderResponse> openTable(RequestBody requestBody);
Observable<BaseOrderRespose> openTable(RequestBody requestBody);
Observable<BaseOrderResponse> turnTable(RequestBody requestBody);
Observable<BaseOrderRespose> turnTable(RequestBody requestBody);
Observable<BaseOrderResponse> initTable(RequestBody requestBody);
Observable<BaseOrderRespose> initTable(RequestBody requestBody);
Observable<BaseResult> resetSkyorder(RequestBody requestBody);
Observable<BaseResult> getSplitTables(int tableId);
......@@ -95,6 +95,6 @@ public interface TableContract {
Observable<BaseResult> getFoodSummarys(int restaurantId,boolean isDefault, byte businessType);
Observable<PrintQRCodeRespose> addScan(RequestBody requestBody);
Observable<BaseResult> addScan(RequestBody requestBody);
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application;
import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
......@@ -13,7 +13,7 @@ import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
......@@ -27,7 +27,6 @@ import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
......@@ -86,7 +85,6 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
public List<Food> queryDB_FoodList(long parentId, int foodSummary) {
FoodDaoUtils foodDaoUtils = new FoodDaoUtils(mApplication);
List<Food> foods = foodDaoUtils.queryFoodByQueryBuilder(parentId, foodSummary);
// return foods;
return MealConditionFilterUtils.foodConditionFilter(foods,foodSummary);
}
......@@ -129,7 +127,7 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
}
@Override
public Observable<BaseOrderRespose> loadOrder(long orderId) {
public Observable<BaseOrderResponse> loadOrder(long orderId) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.loadOrder(orderId);
}
......@@ -147,16 +145,16 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
}
@Override
public Observable<BaseOrderRespose> deleteFood(RequestBody requestBody) {
public Observable<BaseOrderResponse> deleteFood(RequestBody requestBody) {
Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
.deleteFood(requestBody)
.flatMap(new Function<BaseResult, Observable<BaseOrderRespose>>() {
.flatMap(new Function<BaseResult, Observable<BaseOrderResponse>>() {
@Override
public Observable<BaseOrderRespose> apply(BaseResult info) throws Exception {
public Observable<BaseOrderResponse> apply(BaseResult info) throws Exception {
if (info != null && info.isSuccess()) {
return loadOrder(DoshokuOrder.getInstance().getOrderId());
}
BaseOrderRespose baseOrderRespose = new BaseOrderRespose();
BaseOrderResponse baseOrderRespose = new BaseOrderResponse();
baseOrderRespose.setSuccess(info.isSuccess());
baseOrderRespose.setErrMsg(info.getErrMsg());
return Observable.just(baseOrderRespose);
......@@ -166,19 +164,19 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
}
@Override
public Observable<BaseOrderRespose> calculationPrice(long orderId) {
public Observable<BaseOrderResponse> calculationPrice(long orderId) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.calculationPrice(orderId);
}
@Override
public Observable<BaseOrderRespose> printOrder(RequestBody requestBody) {
public Observable<BaseOrderResponse> printOrder(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.printOrder(requestBody);
}
@Override
public Observable<FoodReason> getRestaurantFoodReason(int brandId, int restaurantId, int type) {
public Observable<BaseResult> getRestaurantFoodReason(int brandId, int restaurantId, int type) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.getRestaurantFoodReason(brandId, restaurantId, type);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
......@@ -4,10 +4,8 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MemberService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
......@@ -72,7 +70,7 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<BaseOrderRespose> loadOrder(long orderId) {
public Observable<BaseOrderResponse> loadOrder(long orderId) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.loadOrder(orderId);
}
......@@ -85,12 +83,12 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<BaseOrderRespose> createOrder(RequestBody requestBody) {
public Observable<BaseOrderResponse> createOrder(RequestBody requestBody) {
Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
.createOrder(requestBody)
.flatMap(new Function<BaseResult, Observable<BaseOrderRespose>>() {
.flatMap(new Function<BaseResult, Observable<BaseOrderResponse>>() {
@Override
public Observable<BaseOrderRespose> apply(BaseResult info) throws Exception {
public Observable<BaseOrderResponse> apply(BaseResult info) throws Exception {
if (info != null && info.isSuccess()) {
saveCreateTime(info.getSysTime());
if (info.getData() != null) {
......@@ -103,7 +101,8 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
for (Object o : tm.keySet()) {
String key = (String) o;
if (key.equals("id")) {
DoshokuOrder.getInstance().setOrderId((long) tm.get(key));
double orderId = (double) tm.get(key);
DoshokuOrder.getInstance().setOrderId((long) orderId);
} else if (key.equals("orderNo")) {
DoshokuOrder.getInstance().setOrderNo((String) tm.get(key));
}
......@@ -112,7 +111,7 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
return loadOrder(DoshokuOrder.getInstance().getOrderId());
}
BaseOrderRespose baseOrderRespose = new BaseOrderRespose();
BaseOrderResponse baseOrderRespose = new BaseOrderResponse();
baseOrderRespose.setSuccess(info.isSuccess());
baseOrderRespose.setErrMsg(info.getErrMsg());
return Observable.just(baseOrderRespose);
......@@ -122,17 +121,17 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<BaseOrderRespose> addFood(RequestBody requestBody) {
public Observable<BaseOrderResponse> addFood(RequestBody requestBody) {
Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
.addFood(requestBody)
.flatMap(new Function<BaseResult, Observable<BaseOrderRespose>>() {
.flatMap(new Function<BaseResult, Observable<BaseOrderResponse>>() {
@Override
public Observable<BaseOrderRespose> apply(BaseResult info) throws Exception {
public Observable<BaseOrderResponse> apply(BaseResult info) throws Exception {
if (info != null && info.isSuccess()) {
saveCreateTime(info.getSysTime());
return loadOrder(DoshokuOrder.getInstance().getOrderId());
}
BaseOrderRespose baseOrderRespose = new BaseOrderRespose();
BaseOrderResponse baseOrderRespose = new BaseOrderResponse();
baseOrderRespose.setSuccess(info.isSuccess());
baseOrderRespose.setErrMsg(info.getErrMsg());
return Observable.just(baseOrderRespose);
......@@ -142,7 +141,7 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<BaseOrderRespose> printOrder(RequestBody request) {
public Observable<BaseOrderResponse> printOrder(RequestBody request) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.printOrder(request);
}
......@@ -154,18 +153,18 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<TableDetail> getTable(int tableId, String tableNumber) {
public Observable<BaseResult> getTable(int tableId, String tableNumber) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId, tableNumber);
}
@Override
public Observable<BaseOrderRespose> transferFood(RequestBody requestBody) {
public Observable<BaseOrderResponse> transferFood(RequestBody requestBody) {
Observable ob = mRepositoryManager.obtainRetrofitService(MealService.class)
.transferFood(requestBody)
.flatMap(new Function<BaseOrderRespose, Observable<BaseOrderRespose>>() {
.flatMap(new Function<BaseOrderResponse, Observable<BaseOrderResponse>>() {
@Override
public Observable<BaseOrderRespose> apply(BaseOrderRespose info) throws Exception {
public Observable<BaseOrderResponse> apply(BaseOrderResponse info) throws Exception {
if (info != null && info.isSuccess()) {
return loadOrder(DoshokuOrder.getInstance().getOrderId());
}
......@@ -200,7 +199,7 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
}
@Override
public Observable<BaseOrderRespose> calculationPrice(long orderId) {
public Observable<BaseOrderResponse> calculationPrice(long orderId) {
return null;
}
}
\ No newline at end of file
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
......@@ -4,7 +4,7 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
import com.google.gson.Gson;
......@@ -62,7 +62,7 @@ public class OrderPayModel extends BaseModel implements OrderPayContract.Model {
}
@Override
public Observable<BaseOrderRespose> calculationPrice(long orderId) {
public Observable<BaseOrderResponse> calculationPrice(long orderId) {
return mRepositoryManager.obtainRetrofitService(MealService.class)
.calculationPrice(orderId);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
......@@ -3,12 +3,9 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.TableService;
import com.gingersoft.gsa.cloud.database.bean.Food;
......@@ -25,10 +22,6 @@ import java.util.List;
import javax.inject.Inject;
import io.reactivex.Observable;
import io.reactivex.ObservableSource;
import io.reactivex.Observer;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
import okhttp3.RequestBody;
......@@ -84,36 +77,42 @@ public class TableModel extends BaseModel implements TableContract.Model {
}
@Override
public Observable<TableDetail> getTable(int tableId, String tableNumber) {
public Observable<BaseResult> getTable(int tableId, String tableNumber) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getTable(tableId, tableNumber);
}
@Override
public Observable<BaseOrderRespose> getOrderById(long orderId) {
public Observable<BaseOrderResponse> getOrderById(long orderId) {
return mRepositoryManager.obtainRetrofitService(OrderService.class)
.getOrderById(orderId);
}
@Override
public Observable<BaseOrderRespose> openTable(RequestBody requestBody) {
public Observable<BaseOrderResponse> openTable(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.openTable(requestBody);
}
@Override
public Observable<BaseOrderRespose> turnTable(RequestBody requestBody) {
public Observable<BaseOrderResponse> turnTable(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.turnTable(requestBody);
}
@Override
public Observable<BaseOrderRespose> initTable(RequestBody requestBody) {
public Observable<BaseOrderResponse> initTable(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.initTable(requestBody);
}
@Override
public Observable<BaseResult> resetSkyorder(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.resetSkyorder(requestBody);
}
@Override
public Observable<BaseResult> getSplitTables(int tableId) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.getSplitTables(tableId);
......@@ -132,7 +131,7 @@ public class TableModel extends BaseModel implements TableContract.Model {
}
@Override
public Observable<PrintQRCodeRespose> addScan(RequestBody requestBody) {
public Observable<BaseResult> addScan(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(TableService.class)
.addScan(requestBody);
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/BaseOrderRespose.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-01-02
* 修订历史：2020-01-02
* 描述：
*/
public class BaseOrderRespose {
/**
* success : true
* sysTime : 1579003211275
* data : {"id":40553,"orderNo":"gs204650350122922","status":0,"totalAmount":141,"totalPoints":0,"createTime":"Jan 14, 2020 7:49:50 PM","orderDetails":[{"id":1621502,"productName":"胡椒排骨涼瓜煲","productId":"4257","price":58,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0},{"id":1621503,"productName":"海南雞(例牌)","productId":"4258","price":83,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0}]}
*/
private String errMsg;
private boolean success;
private long sysTime;
private OrderBean data;
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
public long getSysTime() {
return sysTime;
}
public void setSysTime(long sysTime) {
this.sysTime = sysTime;
}
public OrderBean getData() {
return data;
}
public void setData(OrderBean data) {
this.data = data;
}
public String getErrMsg() {
return errMsg;
}
public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
// public static List<Food> TransFoods(List<OrderBean.OrderDetailsBean> orderDetails) {
// List<Food> foods = new ArrayList<>();
// for (OrderBean.OrderDetailsBean orderDetailsBean : orderDetails) {
// Food food = new Food((long) orderDetailsBean.getId(),
// Integer.parseInt(orderDetailsBean.getProductId()),
// orderDetailsBean.getProductName(),
// orderDetailsBean.getPrice(),
// orderDetailsBean.getNumber(),
// orderDetailsBean.getStatus() == 0, orderDetailsBean.getLunchboxPrice());
// foods.add(food);
// }
// return foods;
// }
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/FoodReason.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
......@@ -9,116 +10,24 @@ import java.util.List;
* 修订历史：2020-03-31
* 描述：取消原因
*/
@Data
public class FoodReason {
/**
* success : true
* sysTime : 1585726692519
* data : [{"id":1,"uid":1,"restaurantId":410,"content":"顔色不好看","type":1,"updateTime":1585721573999,"createTime":1585721573999}]
* id : 1
* uid : 1
* restaurantId : 410
* content : 顔色不好看
* type : 1,2,3
* updateTime : 1585721573999
* createTime : 1585721573999
*/
private boolean success;
private long sysTime;
private List<DataBean> data;
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
public long getSysTime() {
return sysTime;
}
public void setSysTime(long sysTime) {
this.sysTime = sysTime;
}
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public static class DataBean {
/**
* id : 1
* uid : 1
* restaurantId : 410
* content : 顔色不好看
* type : 1,2,3
* updateTime : 1585721573999
* createTime : 1585721573999
*/
private int id;
private int uid;
private int restaurantId;
private String content;
private String type;
private long updateTime;
private long createTime;
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(long updateTime) {
this.updateTime = updateTime;
}
public long getCreateTime() {
return createTime;
}
public void setCreateTime(long createTime) {
this.createTime = createTime;
}
}
private int id;
private int uid;
private int restaurantId;
private String content;
private String type;
private long updateTime;
private long createTime;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/FoodSummary.java
......@@ -25,7 +25,7 @@ public class FoodSummary {
/**
* 用餐時長
*/
private int mealLength = 120;
private long diningTime = 120;
public static final byte BUSINESS_TYPE_TAKEWAY = 1;
public static final byte BUSINESS_TYPE_SKYORDER = 2;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/SplitTableNumber.java deleted 100644 → 0
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-07-29
* 修订历史：2020-07-29
* 描述：
*/
@Data
public class SplitTableNumber {
/**
* id : 1
* tableNumber : A
*/
private long id;
private String tableNumber;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/AddOrderRequest.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean.request;
import com.gingersoft.gsa.cloud.base.order.bean.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.discount.OrderDiscount;
import com.gingersoft.gsa.cloud.base.order.bean.request.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.base.order.bean.request.OrderDiscountRequest;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import java.util.List;
import java.util.Map;
......@@ -27,11 +27,21 @@ public class AddOrderRequest {
private long tableId;
private String tableNumber;
/**
* 合計金額
*/
/**
* 服務費
*/
/**
* 賬單小數
*/
private Double rounding;
private List<OrderDiscount.Request> discountDetails;
private Map<String, List<OrderBean.OrderDetailsBean>> maps;
/**
* 總金額
*/
private List<OrderDiscountRequest> discountDetails;
private Map<String, List<OrderResponse.OrderDetailsBean>> maps;
private List<DeleteOrderRequest> deleteOrders;
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/CreateOrderRequest.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean.request;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.discount.OrderDiscount;
import com.gingersoft.gsa.cloud.base.order.bean.request.OrderDiscountRequest;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import java.util.List;
import java.util.Map;
......@@ -25,79 +25,10 @@ public class CreateOrderRequest {
private int restaurantId;
/**賬單小數*/
private Double rounding;
private List<OrderDiscount.Request> discountDetails;
private Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails;
// public static class Request {
// private long productId;
// private String productName;
// private double price;
// private double lunchboxPrice;
// private int number;
//
// public Request() {
// }
//
// public Request(long productId, String productName, double price, double lunchboxPrice, int number) {
// this.productId = productId;
// this.productName = productName;
// this.price = price;
// this.lunchboxPrice = lunchboxPrice;
// this.number = number;
// }
//
// public long getProductId() {
// return productId;
// }
//
// public void setProductId(long productId) {
// this.productId = productId;
// }
//
// public String getProductName() {
// return productName;
// }
//
// public void setProductName(String productName) {
// this.productName = productName;
// }
//
// public double getPrice() {
// return price;
// }
//
// public void setPrice(double price) {
// this.price = price;
// }
//
// public double getLunchboxPrice() {
// return lunchboxPrice;
// }
//
// public void setLunchboxPrice(double lunchboxPrice) {
// this.lunchboxPrice = lunchboxPrice;
// }
//
// public int getNumber() {
// return number;
// }
//
// public void setNumber(int number) {
// this.number = number;
// }
//
// @Override
// public String toString() {
// return "Request{" +
// "productId=" + productId +
// ", productName='" + productName + '\'' +
// ", price=" + price +
// ", lunchboxPrice=" + lunchboxPrice +
// ", number=" + number +
// '}';
// }
// }
/**scan表ID*/
private Long scanId;
private List<OrderDiscountRequest> discountDetails;
private Map<String, List<OrderResponse.OrderDetailsBean>> orderDetails;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/SoldoutRequest.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean.request;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
......@@ -9,8 +11,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.bean.request;
*/
public class SoldoutRequest {
@Data
public static class Insert {
private long brandId;
private int restaurantId;
private Long foodId;
......@@ -18,131 +20,27 @@ public class SoldoutRequest {
private int type;
private int remainingNumber;
private long uid;
public long getBrandId() {
return brandId;
}
public void setBrandId(long brandId) {
this.brandId = brandId;
}
public int getRestaurantId() {
return restaurantId;
}
public void setRestaurantId(int restaurantId) {
this.restaurantId = restaurantId;
}
public long getFoodId() {
return foodId;
}
public void setFoodId(long foodId) {
this.foodId = foodId;
}
public long getModifierId() {
return modifierId;
}
public void setModifierId(long modifierId) {
this.modifierId = modifierId;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public int getRemainingNumber() {
return remainingNumber;
}
public void setRemainingNumber(int remainingNumber) {
this.remainingNumber = remainingNumber;
}
public long getUid() {
return uid;
}
public void setUid(long uid) {
this.uid = uid;
}
}
public static class update {
@Data
public static class update {
private long id;
/**是否刪除 0 正常 1 刪除*/
/**
* 是否刪除 0 正常 1 刪除
*/
private int deletes;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public int getDeletes() {
return deletes;
}
public void setDeletes(int deletes) {
this.deletes = deletes;
}
}
public static class batchUpdate {
@Data
public static class batchUpdate {
private String ids;
public String getIds() {
return ids;
}
public void setIds(String ids) {
this.ids = ids;
}
}
public static class updateInvisible {
@Data
public static class updateInvisible {
private int type;
private String[] ids;
private int invisible;
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String[] getIds() {
return ids;
}
public void setIds(String[] ids) {
this.ids = ids;
}
public int getInvisible() {
return invisible;
}
public void setInvisible(int invisible) {
this.invisible = invisible;
}
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/TableDetail.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/response/BaseOrderResponse.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
package com.gingersoft.gsa.cloud.table.mvp.model.bean.response;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import lombok.Data;
import lombok.Getter;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-02-22
* 修订历史：2020-02-22
* 创建日期：2020-01-02
* 修订历史：2020-01-02
* 描述：
*/
@Data
public class TableDetail {
public class BaseOrderResponse {
/**
* success : true
* sysTime : 1582369492823
* data : {"id":26221,"tableName":"107","restaurantId":26,"qrCode":"27655b6228307f6f5a6c501152d92b32","seatCount":7,"createTime":"Jan 16, 2020 12:00:00 AM","createBy":"GSPOS","qrCodeImg":"http://192.168.1.77/qrcode/tableQrcode-26-1509.jpg","posTableId":1509,"serviceCharge":10,"memberId":1,"status":2,"orderId":40642,"useStatus":0}
* sysTime : 1579003211275
* data : {"id":40553,"orderNo":"gs204650350122922","status":0,"totalAmount":141,"totalPoints":0,"createTime":"Jan 14, 2020 7:49:50 PM","orderDetails":[{"id":1621502,"productName":"胡椒排骨涼瓜煲","productId":"4257","price":58,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0},{"id":1621503,"productName":"海南雞(例牌)","productId":"4258","price":83,"lunchboxPrice":0,"number":1,"createTime":"Jan 14, 2020 8:00:11 PM","status":0}]}
*/
private boolean success;
private String errMsg;
private boolean success;
private long sysTime;
private TableBean.DataBean data;
private OrderResponse data;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/response/OrderManagerResponse.java 0 → 100644
package com.gingersoft.gsa.cloud.table.mvp.model.bean.response;
import android.os.Parcel;
import android.os.Parcelable;
import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderDiscountResponse;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
* 创建日期：2020-03-14
* 修订历史：2020-03-14
* 描述：已結賬訂單
*/
@Data
public class OrderManagerResponse implements Serializable {
/**
* id : 47040
* tableName : 4
* tableId : 1694
* orderNo : gs200371144969589
* status : 0
* totalAmount : 10
* totalPoints : 0
* amount : 15
* createTime : Mar 14, 2020 1:24:12 PM
* endTime : Mar 14, 2020 1:24:12 PM
* person : 2
* payName : 支付寶
* orderPayType : 0
* tipsPrice : 5
* linePayType : 1
* 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 int status;
private String orderNo;
private String tableName;
private int tableId;
private int person;
/**
* 订单类型
* 1：堂食
* 2：外賣
* 3：掃碼點餐
* 5：預點餐
* 7：自取
*/
private int orderType;
/**總金額*/
private double totalAmount;
private int totalPoints;
/**支付金額*/
private double amount;
/**賬單小數*/
private Double rounding;
/**服務費*/
private Double serviceAmount;
/**訂單碼*/
private String billNo;
/**取餐碼*/
private String takeFoodCode;
/**生成訂單時間*/
private String createTime;
/**結賬時間*/
private String endTime;
/**訂單食品詳情*/
private List<OrderResponse.OrderDetailsBean> orderDetails;
/**折扣詳情*/
private List<OrderDiscountResponse> discountDetails;
/**支付詳情*/
private List<OrderPayBean> orderPays;
/**餐檯信息*/
private TableBean.DataBean restaurantTable;
/**會員信息*/
private MemberInfo memberInfo;
/**會員積分碼*/
private String verifyCode;
/**會員積分相关实体*/
private OrderPayResponse integralInfo;
/**
* 訂單狀態:0:未支付;1:待確認(已支付, 待餐廳確認);2:制作中（餐厅确认）;3:派送中;4:确认收货（完成）;5:是否评论;6:取消;
*/
public static final byte STATUS_UNPAID = 0;
public static final byte STATUS_NOT_CONFIRM = 1;
public static final byte STATUS_Making = 2;
public static final byte STATUS_Dispatching = 3;
public static final byte STATUS_CONFIRM = 4;
public static final byte STATUS_COMMENT = 5;
public static final byte STATUS_CANCEL = 6;
/**
* 订单类型1：堂食2：外賣3：掃碼點餐5：預點餐7：自取
*/
public static final byte ORDER_TYPE_DOSHOKU = 1;
public static final byte ORDER_TYPE_TAKEAWAY = 2;
public static final byte ORDER_TYPE_SELFCOLLECTION = 7;
@Data
public static final class OrderPayBean implements Serializable{
private long id;
private long lineOrderId;
private int payType;
private String payTime;
private double amount;
private double tipsPrice;
private int status;
private int linePayType;
private double paySales;
private String payName;
}
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderPayRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/response/OrderPayResponse.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
package com.gingersoft.gsa.cloud.table.mvp.model.bean.response;
import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
......@@ -12,7 +15,7 @@ import lombok.Data;
* 描述：
*/
@Data
public class OrderPayRespose implements Serializable {
public class OrderPayResponse implements Serializable {
/**
* verifyCode : 387F9C1D8B2AD91B42982C8E50835A8C
......@@ -27,5 +30,4 @@ public class OrderPayRespose implements Serializable {
/**结余積分*/
private float nowPoints;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/PrintQRCodeRespose.java → table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/response/PrintQRCodeResponse.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean;
package com.gingersoft.gsa.cloud.table.mvp.model.bean.response;
import lombok.Getter;
import lombok.Setter;
......@@ -11,10 +11,17 @@ import lombok.Setter;
*/
@Getter
@Setter
public class PrintQRCodeRespose {
public class PrintQRCodeResponse {
private String code;
private String errMsg;
private String qrcode;
/**
* 是否开启微信小程序功能
* 0:不开启（不显示wmp） 1:开启（wmp） 2:点餐（wmp2） ,3:H5（wmp3） 默认0
*/
private int isWeChatMiniProgram;
/**
* 最後下單時間
*/
private String lastOrderTime;
private String remindTime;
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/BillDiscountAction.java
......@@ -74,7 +74,7 @@ public class BillDiscountAction implements Strategy<Discount> {
exclusiveDiscount(discount);
return;
} else {
if (discount.getExclusive() == 1 && mNomalDiscountList.size()>0) {
if (discount.getExclusive() == 1 && mNomalDiscountList.size() > 0) {
//獨佔折扣
exclusiveDiscount(discount);
return;
......@@ -91,7 +91,7 @@ public class BillDiscountAction implements Strategy<Discount> {
//
// break;
default:
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
break;
}
}
......@@ -149,7 +149,7 @@ public class BillDiscountAction implements Strategy<Discount> {
if (exclusiveReplace) {
mListener.exclusiveRemoveOthers(mNomalDiscountList);
}
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
}
}
});
......@@ -171,7 +171,7 @@ public class BillDiscountAction implements Strategy<Discount> {
if (exclusiveReplace) {
mListener.exclusiveRemoveOthers(mNomalDiscountList);
}
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
}
}
})
......@@ -199,7 +199,7 @@ public class BillDiscountAction implements Strategy<Discount> {
// break;
default:
mListener.exclusiveRemoveOthers(mNomalDiscountList);
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
break;
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/discount/MealDiscountAction.java
......@@ -2,6 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model.discount;
import android.app.Activity;
import android.text.InputType;
import com.gingersoft.gsa.cloud.base.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.base.order.discount.MultyDiscount;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
......@@ -10,6 +11,7 @@ import com.gingersoft.gsa.cloud.patterns.Strategy;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.KeyboardDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.utils.ArmsUtils;
import java.util.List;
/**
......@@ -75,13 +77,13 @@ public class MealDiscountAction implements Strategy<Discount> {
showCustomAmountDialog(discount, false);
break;
case Discount.DISCOUNT_TYPE_KEYBOARD:
showKeyboardDialog(discount,false);
showKeyboardDialog(discount, false);
break;
// case Discount.DISCOUNT_TYPE_FREE_SERVICE_CHARGE:
//
// break;
default:
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
break;
}
}
......@@ -140,7 +142,7 @@ public class MealDiscountAction implements Strategy<Discount> {
if (exclusiveReplace) {
mListener.exclusiveRemoveOthers();
}
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
}
}
});
......@@ -162,7 +164,7 @@ public class MealDiscountAction implements Strategy<Discount> {
if (exclusiveReplace) {
mListener.exclusiveRemoveOthers();
}
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
}
}
})
......@@ -190,7 +192,7 @@ public class MealDiscountAction implements Strategy<Discount> {
// break;
default:
mListener.exclusiveRemoveOthers();
mListener.preformAddDiscount(discount);
mListener.preformAddDiscount(discount.clone());
break;
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/MealService.java
......@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.model.service;
import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import io.reactivex.Observable;
......@@ -55,7 +55,7 @@ public interface MealService {
@FormUrlEncoded
@POST("order/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> loadOrder(@Field("orderId") long orderId);
Observable<BaseOrderResponse> loadOrder(@Field("orderId") long orderId);
// @FormUrlEncoded
@POST("orderDetails/delete" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
......@@ -63,16 +63,16 @@ public interface MealService {
@FormUrlEncoded
@POST("order/calculation/price" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> calculationPrice(@Field("orderId") long orderId);
Observable<BaseOrderResponse> calculationPrice(@Field("orderId") long orderId);
@POST("restaurantTable/print" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> printOrder(@Body RequestBody requestBody);
Observable<BaseOrderResponse> printOrder(@Body RequestBody requestBody);
@GET("restaurantFoodReason/config/list" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FoodReason> getRestaurantFoodReason(@Query("brandId") int brandId , @Query("restaurantId") int restaurantId, @Query("type") int type);
Observable<BaseResult> getRestaurantFoodReason(@Query("brandId") int brandId , @Query("restaurantId") int restaurantId, @Query("type") int type);
@POST("restaurantTable/transfer" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> transferFood(@Body RequestBody requestBody);
Observable<BaseOrderResponse> transferFood(@Body RequestBody requestBody);
@GET(Api.food_list + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FoodBean> downFoodList(@Query("restaurantId") int restaurantId);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/OrderService.java
package com.gingersoft.gsa.cloud.table.mvp.model.service;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
......@@ -24,7 +24,7 @@ public interface OrderService {
Observable<BaseResult> getOrderDetail(@Query("orderId") long orderId);
@GET("order/findOrderById" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> getOrderById(@Query("orderId") long orderId);
Observable<BaseOrderResponse> getOrderById(@Query("orderId") long orderId);
@FormUrlEncoded
@POST("order/cancel" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/service/TableService.java
package com.gingersoft.gsa.cloud.table.mvp.model.service;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResultOld;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.PrintQRCodeRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import java.util.concurrent.TimeUnit;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import io.reactivex.Observable;
import io.rx_cache2.LifeCache;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody;
import retrofit2.http.Body;
......@@ -32,16 +25,19 @@ public interface TableService {
Observable<TableBean> getTables(@Query("restaurantId") int restaurantId);
@GET("restaurantTable/get" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<TableDetail> getTable(@Query("id") int table, @Query("tableNumber") String tableNumber);
Observable<BaseResult> getTable(@Query("id") int table, @Query("tableNumber") String tableNumber);
@POST("restaurantTable/kickOff" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> openTable(@Body RequestBody requestBody);
Observable<BaseOrderResponse> openTable(@Body RequestBody requestBody);
@POST("restaurantTable/update/table" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> turnTable(@Body RequestBody requestBody);
Observable<BaseOrderResponse> turnTable(@Body RequestBody requestBody);
@POST("restaurantTable/set/status" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseOrderRespose> initTable(@Body RequestBody requestBody);
Observable<BaseOrderResponse> initTable(@Body RequestBody requestBody);
@POST("restaurantTable/skyOrderReset" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> resetSkyorder(@Body RequestBody requestBody);
@GET("restaurantTable/getSplitTableAvailable" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> getSplitTables(@Query("tableId") int tableId);
......@@ -54,6 +50,6 @@ public interface TableService {
Observable<BaseResult> getFoodSummarys(@Query("restaurantId") int restaurantId, @Query("isDefault") boolean isDefault, @Query("businessType") byte businessType);
@Headers({"Domain-Name: ricepon_restaurant"})
@POST("scan/addScan" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<PrintQRCodeRespose> addScan(@Body RequestBody requestBody);
@POST("scan/addScanCloudGsa" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> addScan(@Body RequestBody requestBody);
}
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/action/PrintServingPaperAction.java
package com.gingersoft.gsa.cloud.table.mvp.model.table.action;
import android.app.Activity;
import android.content.Context;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.order.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.order.bean.response.OrderResponse;
import com.gingersoft.gsa.cloud.base.order.commodity.OrderDetail;
import com.gingersoft.gsa.cloud.base.order.order.DoshokuOrder;
import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseOrderRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.response.BaseOrderResponse;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
......@@ -63,10 +62,10 @@ public class PrintServingPaperAction extends TableAction {
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
mTablePresenter.loadOrderToPrintParper(tableBean, new OnNetworkCallbackListener<BaseOrderRespose>() {
mTablePresenter.loadOrderToPrintParper(tableBean, new OnNetworkCallbackListener<BaseOrderResponse>() {
@Override
public void onResult(BaseOrderRespose respose) {
public void onResult(BaseOrderResponse respose) {
if (respose.isSuccess()) {
......@@ -76,7 +75,7 @@ public class PrintServingPaperAction extends TableAction {
TableBean.DataBean tableInfo = doshokuOrder.getOpenTableInfo();
tableInfo.setPerson(0);
OrderBean orderBean = respose.getData();
OrderResponse orderBean = respose.getData();
if (orderBean != null && respose.getData().getOrderDetails() != null) {
if (respose.getData().getCreateTime() != null && tableBean != null) {
//將開台時間設置為訂單創建時間
......@@ -84,10 +83,10 @@ public class PrintServingPaperAction extends TableAction {
}
tableInfo.setPerson(orderBean.getPerson());
List<OrderBean.OrderDetailsBean> orderDetailsBeans = respose.getData().getOrderDetails();
List<OrderResponse.OrderDetailsBean> orderDetailsBeans = respose.getData().getOrderDetails();
//緩存訂單信息
doshokuOrder.setOrderPlaced(new OrderBean(orderBean));
doshokuOrder.setOrderPlaced(new OrderResponse(orderBean));
//緩存食品信息
List<OrderDetail> orderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetail.orderTransOrderDetails(orderDetailsBeans));
......
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