Skip to content

S
supplier
Commit ce264d78 by 宁斌
Options

1、完善賬單 食品折扣 

2、新增公共細項
3、彈窗風格統一
parent 4222a1bf
Showing with 1108 additions and 358 deletions
cc-settings.gradle
...@@ -16,10 +16,10 @@ dependencies { ...@@ -16,10 +16,10 @@ dependencies {
implementation project(':arms') implementation project(':arms')
} }
// //
// if (project.name != 'qm-qmui' && project.name != 'arms') { if (project.name != 'qm-qmui' && project.name != 'arms') {
if (project.name != 'arms') { // if (project.name != 'arms') {
// implementation project(':qm-qmui') implementation project(':qm-qmui')
implementation rootProject.ext.dependencies["qmui"] // implementation rootProject.ext.dependencies["qmui"]
} }
implementation rootProject.ext.dependencies["retrofit-url-manager"] implementation rootProject.ext.dependencies["retrofit-url-manager"]
annotationProcessor rootProject.ext.dependencies["butterknife-compiler"] annotationProcessor rootProject.ext.dependencies["butterknife-compiler"]
......
download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/model/DownloadModel.java
...@@ -5,7 +5,7 @@ import android.content.Context; ...@@ -5,7 +5,7 @@ import android.content.Context;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.download.mvp.model.bean.ComboItemRespone; import com.gingersoft.gsa.cloud.download.mvp.model.bean.ComboItemRespone;
......
download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java
...@@ -9,11 +9,9 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; ...@@ -9,11 +9,9 @@ import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.FoodBean; import com.gingersoft.gsa.cloud.base.common.bean.FoodBean;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.Function; import com.gingersoft.gsa.cloud.database.bean.Function;
import com.gingersoft.gsa.cloud.database.greendao.DiscountDao;
import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils; import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
......
download-data/src/main/java/com/gingersoft/gsa/cloud/download/mvp/ui/activity/DownloadActivity.java
...@@ -9,12 +9,14 @@ import android.os.Bundle; ...@@ -9,12 +9,14 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import com.billy.cc.core.component.CC; import androidx.annotation.NonNull;
import com.billy.cc.core.component.CCResult; import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CCUtil; import com.billy.cc.core.component.CCUtil;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.download.R; import com.gingersoft.gsa.cloud.download.R;
...@@ -22,21 +24,14 @@ import com.gingersoft.gsa.cloud.download.R2; ...@@ -22,21 +24,14 @@ import com.gingersoft.gsa.cloud.download.R2;
import com.gingersoft.gsa.cloud.download.di.component.DaggerDownloadComponent; import com.gingersoft.gsa.cloud.download.di.component.DaggerDownloadComponent;
import com.gingersoft.gsa.cloud.download.mvp.contract.DownloadContract; import com.gingersoft.gsa.cloud.download.mvp.contract.DownloadContract;
import com.gingersoft.gsa.cloud.download.mvp.presenter.DownloadPresenter; import com.gingersoft.gsa.cloud.download.mvp.presenter.DownloadPresenter;
import com.gingersoft.gsa.cloud.ui.utils.AndroidWorkaround; import com.gingersoft.gsa.cloud.ui.view.WaveHelper;
import com.gingersoft.gsa.cloud.ui.view.WaveView;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.QMUITopBar;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import static com.jess.arms.utils.Preconditions.checkNotNull; import static com.jess.arms.utils.Preconditions.checkNotNull;
...@@ -67,13 +62,16 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements ...@@ -67,13 +62,16 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
@BindView(R2.id.tv_progress) @BindView(R2.id.tv_progress)
TextView tv_progress; TextView tv_progress;
@BindView(R2.id.wave_download)
WaveView waveView;
private WaveHelper mWaveHelper;
/** /**
* 那個頁面跳轉下載 * 那個頁面跳轉下載
* 1#登錄頁選擇餐廳 * 1#登錄頁選擇餐廳
* 2#其他 * 2#其他
*/ */
private int fromPage =1; private int fromPage = 1;
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
...@@ -98,11 +96,27 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements ...@@ -98,11 +96,27 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mWaveHelper = new WaveHelper(waveView);
mPresenter.initAdapter(); mPresenter.initAdapter();
mPresenter.downAllList(); mPresenter.downAllList();
} }
@Override @Override
protected void onResume() {
super.onResume();
if (mWaveHelper != null)
mWaveHelper.start();
}
@Override
protected void onPause() {
super.onPause();
if (mWaveHelper != null)
mWaveHelper.cancel();
}
@Override
public void initIntent() { public void initIntent() {
fromPage = CCUtil.getNavigateParam(this, "fromPage", 1); fromPage = CCUtil.getNavigateParam(this, "fromPage", 1);
} }
...@@ -110,18 +124,8 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements ...@@ -110,18 +124,8 @@ public class DownloadActivity extends BaseActivity<DownloadPresenter> implements
@Override @Override
public void initTopBar() { public void initTopBar() {
tv_title.setText("數據下載"); tv_title.setText("數據下載");
btn_back.setOnClickListener(new View.OnClickListener() { btn_back.setOnClickListener(v -> killMyself());
@Override btn_refresh.setOnClickListener(v -> mPresenter.downAllList());
public void onClick(View v) {
killMyself();
}
});
btn_refresh.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mPresenter.downAllList();
}
});
} }
@Override @Override
......
download-data/src/main/res/layout/download_data_activity_download.xml
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/down_decoration"> android:background="@mipmap/down_decoration">
<!-- <com.qmuiteam.qmui.widget.QMUITopBar--> <!-- <com.qmuiteam.qmui.widget.QMUITopBar-->
<!-- android:id="@+id/topbar"--> <!-- android:id="@+id/topbar"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="?attr/qmui_topbar_height"--> <!-- android:layout_height="?attr/qmui_topbar_height"-->
<!-- android:layout_marginTop="@dimen/dp_20"--> <!-- android:layout_marginTop="@dimen/dp_20"-->
<!-- android:background="@color/trans" />--> <!-- android:background="@color/trans" />-->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -23,66 +23,79 @@ ...@@ -23,66 +23,79 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/qmui_icon_topbar_back" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"/> android:src="@drawable/qmui_icon_topbar_back" />
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/theme_white_color"
android:text="數據下載"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:textSize="@dimen/sp_16"/> android:text="數據下載"
android:textColor="@color/theme_white_color"
android:textSize="@dimen/sp_16" />
<com.qmuiteam.qmui.alpha.QMUIAlphaImageButton <com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
android:id="@+id/btn_refresh" android:id="@+id/btn_refresh"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/icon_refresh"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_15"/> android:layout_marginRight="@dimen/dp_15"
android:src="@drawable/icon_refresh" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_80" android:layout_marginTop="@dimen/dp_80"
android:weightSum="2"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/frame_top"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> app:layout_constraintBottom_toTopOf="@id/recycle_download"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="1">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:src="@mipmap/down_cloud"/> android:src="@mipmap/down_cloud" />
<TextView <TextView
android:id="@+id/tv_progress" android:id="@+id/tv_progress"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="100%"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_12" android:layout_marginTop="@dimen/dp_12"
android:text="100%"
android:textColor="#13B7F5" android:textColor="#13B7F5"
android:textSize="@dimen/sp_24" /> android:textSize="@dimen/sp_24" />
</FrameLayout> </FrameLayout>
<com.gingersoft.gsa.cloud.ui.view.WaveView
android:id="@+id/wave_download"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:behindWaveColor="#ccc"
app:frontWaveColor="#ffffff"
app:waveShape="square" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycle_download" android:id="@+id/recycle_download"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:fadeScrollbars="false" android:fadeScrollbars="false"
android:background="@mipmap/down_wave" android:listSelector="@color/theme_background_color"
android:paddingTop="@dimen/dp_50" android:paddingTop="@dimen/dp_50"
android:listSelector="@color/theme_background_color"/> app:layout_constraintBottom_toBottomOf="parent"
</LinearLayout> app:layout_constraintTop_toBottomOf="@id/frame_top"
app:layout_constraintVertical_weight="1" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout> </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/HomePresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.HomeContract; import com.gingersoft.gsa.cloud.main.mvp.contract.HomeContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.MainBusinessBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.MainBusinessBean;
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/PaymentMethodReportPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.PaymentMethodReportContract; import com.gingersoft.gsa.cloud.main.mvp.contract.PaymentMethodReportContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.PaymentMethodBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.PaymentMethodBean;
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -37,6 +37,7 @@ import com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MainTopFragment; ...@@ -37,6 +37,7 @@ import com.gingersoft.gsa.cloud.main.mvp.ui.fragment.MainTopFragment;
import com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu; import com.gingersoft.gsa.cloud.main.mvp.ui.view.SlidingMenu;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean; import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.ChooseRestaurantDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
...@@ -202,23 +203,24 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -202,23 +203,24 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
List<Function> functions = new ArrayList<>(); List<Function> functions = new ArrayList<>();
functions.add(new Function((long) 150, 0, 5, "點餐", 0, 0)); functions.add(new Function((long) 150, 0, 5, "點餐", 0, 0));
functions.add(new Function((long) 138, 150, 5, "餐臺模式", R.drawable.ic_dining_table_mode, 0)); functions.add(new Function((long) 138, 150, 5, "餐臺模式", R.drawable.ic_dining_table_mode, 0));
functions.add(new Function((long) 139, 150, 5, "外送模式", R.drawable.ic_delivery_mode, 1)); functions.add(new Function((long) 139, 150, 5, "外送模式", R.drawable.ic_delivery_mode_close, 1));
functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model, 1)); functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 1));
functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode, 1)); functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
functions.add(new Function((long) 151, 0, 5, "管理", 0, 0)); functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
// functions.add(new Function((long) 142, 151, 5, "餐牌管理", R.drawable.ic_meals_menu_management)); // functions.add(new Function((long) 142, 151, 5, "餐牌管理", R.drawable.ic_meals_menu_management));
functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0)); functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
functions.add(new Function((long) 142, 151, 5, "訂單管理", R.drawable.ic_meals_menu_management, 0)); functions.add(new Function((long) 142, 151, 5, "訂單管理", R.drawable.ic_meals_menu_management, 0));
functions.add(new Function((long) 143, 151, 5, "餐臺管理", R.drawable.ic_dining_table_management, 1)); functions.add(new Function((long) 143, 151, 5, "餐臺管理", R.drawable.ic_dining_table_management_close, 1));
functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0)); functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0));
functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management, 1)); functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1));
functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management, 1)); functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1));
functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_meals_menu_management, 1));
functions.add(new Function((long) 152, 0, 5, "員工", 0, 0)); functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
functions.add(new Function((long) 147, 152, 5, "員工管理", R.drawable.ic_staff_management, 1)); functions.add(new Function((long) 147, 152, 5, "員工管理", R.drawable.ic_staff_management_close, 1));
functions.add(new Function((long) 148, 152, 5, "權限管理", R.drawable.ic_authority_management, 1)); functions.add(new Function((long) 148, 152, 5, "權限管理", R.drawable.ic_authority_management_close, 1));
functions.add(new Function((long) 149, 152, 5, "操作記錄", R.drawable.ic_operation_record, 1)); functions.add(new Function((long) 149, 152, 5, "操作記錄", R.drawable.ic_operation_record_close, 1));
//將功能列表數據分組 //將功能列表數據分組
SparseArray<String> parents = new SparseArray<>(); SparseArray<String> parents = new SparseArray<>();
SparseArray<List<Function>> funMap = new SparseArray<>(); SparseArray<List<Function>> funMap = new SparseArray<>();
...@@ -282,6 +284,11 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -282,6 +284,11 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
.setActionName("orderActivity") .setActionName("orderActivity")
.build() .build()
.call(); .call();
}else if (name.equals("沽清管理")) {
CC.obtainBuilder("Component.Manager")
.setActionName("showSoldoutCtrlActivity")
.build()
.call();
} }
} }
...@@ -400,7 +407,7 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N ...@@ -400,7 +407,7 @@ public class NewMainActivity extends BaseActivity<NewMainPresenter> implements N
public void onClick(View v) { public void onClick(View v) {
if (v.getId() == R.id.layout_login_out) { if (v.getId() == R.id.layout_login_out) {
//登出 //登出
mPresenter.loginOut(); CommonTipDialog.showWarnDialog(this,"確認登出?",null,null,"loginOut",null,null);
} else if (v.getId() == R.id.iv_personal_center) { } else if (v.getId() == R.id.iv_personal_center) {
slideMenu.toggle(); slideMenu.toggle();
} else if (v.getId() == R.id.tv_restaurant_name) { } else if (v.getId() == R.id.tv_restaurant_name) {
......
main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -22,7 +22,7 @@ import com.gingersoft.gsa.cloud.base.utils.JsonUtils; ...@@ -22,7 +22,7 @@ import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils; import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterInIt.java
...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils; import com.gingersoft.gsa.cloud.base.utils.view.ImageUtils;
......
print-module/src/main/java/com/joe/print/mvp/ui/adapter/PrinterListAdapter.java
...@@ -7,7 +7,7 @@ import androidx.annotation.Nullable; ...@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
......
print-module/src/main/java/com/joe/print/mvp/ui/fragment/LocalPrintFragment.java
...@@ -11,7 +11,7 @@ import android.widget.Switch; ...@@ -11,7 +11,7 @@ import android.widget.Switch;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
......
public-base/build.gradle
...@@ -43,7 +43,7 @@ android { ...@@ -43,7 +43,7 @@ android {
/** /**
* 版本号 * 版本号
*/ */
schemaVersion 2 schemaVersion 4
/** /**
* greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下） * greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
*/ */
......
public-base/src/main/java/com/gingersoft/gsa/cloud/aspectj/SwitchPrintAspect.java
...@@ -4,7 +4,7 @@ import android.app.Dialog; ...@@ -4,7 +4,7 @@ import android.app.Dialog;
import android.view.View; import android.view.View;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.widget.DialogUtils; import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -20,9 +20,9 @@ import com.gingersoft.gsa.cloud.base.BuildConfig; ...@@ -20,9 +20,9 @@ import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.CurrentAndroidSetting; import com.gingersoft.gsa.cloud.base.common.bean.CurrentAndroidSetting;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.gingersoft.gsa.cloud.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler; import com.gingersoft.gsa.cloud.base.utils.crash.AppCrashHandler;
import com.gingersoft.gsa.cloud.base.utils.file.FileUtils; import com.gingersoft.gsa.cloud.base.utils.file.FileUtils;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderBean.java
...@@ -33,6 +33,8 @@ public class OrderBean { ...@@ -33,6 +33,8 @@ public class OrderBean {
private double discountValue; private double discountValue;
/**折扣類型*/ /**折扣類型*/
private int type; private int type;
/**折扣描述*/
private String remark;
/** /**
* 生成訂單時間 * 生成訂單時間
*/ */
...@@ -50,6 +52,7 @@ public class OrderBean { ...@@ -50,6 +52,7 @@ public class OrderBean {
this.discountAmount = orderBean.discountAmount; this.discountAmount = orderBean.discountAmount;
this.discountValue = orderBean.discountValue; this.discountValue = orderBean.discountValue;
this.type = orderBean.type; this.type = orderBean.type;
this.remark = orderBean.remark;
this.createTime = orderBean.createTime; this.createTime = orderBean.createTime;
} }
...@@ -129,6 +132,14 @@ public class OrderBean { ...@@ -129,6 +132,14 @@ public class OrderBean {
this.type = type; this.type = type;
} }
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
...@@ -158,7 +169,7 @@ public class OrderBean { ...@@ -158,7 +169,7 @@ public class OrderBean {
* createTime : Jan 14, 2020 8:00:11 PM * createTime : Jan 14, 2020 8:00:11 PM
* status : 0 * status : 0
*/ */
private int id; private Long id;
private String productName; private String productName;
private long productId; private long productId;
//單價 //單價
...@@ -175,6 +186,11 @@ public class OrderBean { ...@@ -175,6 +186,11 @@ public class OrderBean {
* 是否参与折扣#0:不參與;1:參與; * 是否参与折扣#0:不參與;1:參與;
*/ */
private long ablediscount; private long ablediscount;
/**折扣ID*/
private Long discountId;
/**折扣實體*/
private RestaurantDiscountVO restaurantDiscountVO;
/** /**
* 自定義字段 * 自定義字段
*/ */
...@@ -199,11 +215,11 @@ public class OrderBean { ...@@ -199,11 +215,11 @@ public class OrderBean {
this.orderId = orderId; this.orderId = orderId;
} }
public int getId() { public Long getId() {
return id; return id;
} }
public void setId(int id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
...@@ -303,6 +319,14 @@ public class OrderBean { ...@@ -303,6 +319,14 @@ public class OrderBean {
this.ablediscount = ablediscount; this.ablediscount = ablediscount;
} }
public Long getDiscountId() {
return discountId;
}
public void setDiscountId(Long discountId) {
this.discountId = discountId;
}
public long getTopId() { public long getTopId() {
return topId; return topId;
} }
...@@ -311,6 +335,14 @@ public class OrderBean { ...@@ -311,6 +335,14 @@ public class OrderBean {
this.topId = topId; this.topId = topId;
} }
public RestaurantDiscountVO getRestaurantDiscountVO() {
return restaurantDiscountVO;
}
public void setRestaurantDiscountVO(RestaurantDiscountVO restaurantDiscountVO) {
this.restaurantDiscountVO = restaurantDiscountVO;
}
@Override @Override
public String toString() { public String toString() {
return "OrderDetailsBean{" + return "OrderDetailsBean{" +
...@@ -320,13 +352,66 @@ public class OrderBean { ...@@ -320,13 +352,66 @@ public class OrderBean {
", price=" + price + ", price=" + price +
", lunchboxPrice=" + lunchboxPrice + ", lunchboxPrice=" + lunchboxPrice +
", number=" + number + ", number=" + number +
", createTime='" + createTime + '\'' +
", status=" + status + ", status=" + status +
", type=" + type + ", type=" + type +
", parentId=" + parentId + ", parentId=" + parentId +
", orderId=" + orderId + ", orderId=" + orderId +
", ablediscount=" + ablediscount +
", discountId=" + discountId +
", topId=" + topId + ", topId=" + topId +
", memberId=" + memberId +
'}'; '}';
} }
public static class RestaurantDiscountVO implements Serializable{
private long id;
private int type;
private float discountValue;
private String remark;
private double discountAmount;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public float getDiscountValue() {
return discountValue;
}
public void setDiscountValue(float discountValue) {
this.discountValue = discountValue;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public double getDiscountAmount() {
return discountAmount;
}
public void setDiscountAmount(double discountAmount) {
this.discountAmount = discountAmount;
}
}
} }
// public static List<OrderDetailsBean> transOrderDetails(List<Food> foods) { // public static List<OrderDetailsBean> transOrderDetails(List<Food> foods) {
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/UserDataUtils.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.base.utils; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.base.utils;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.gingersoft.gsa.cloud.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
/** /**
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/VibratorUtils.java
...@@ -5,7 +5,7 @@ import android.media.AudioManager; ...@@ -5,7 +5,7 @@ import android.media.AudioManager;
import android.media.SoundPool; import android.media.SoundPool;
import android.os.Vibrator; import android.os.Vibrator;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
/** /**
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java
...@@ -2,17 +2,10 @@ package com.gingersoft.gsa.cloud.base.utils.crash; ...@@ -2,17 +2,10 @@ package com.gingersoft.gsa.cloud.base.utils.crash;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.Looper; import android.os.Looper;
import android.telecom.Call;
import android.text.TextUtils;
import android.util.Base64;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import com.elvishew.xlog.XLog; import com.elvishew.xlog.XLog;
...@@ -20,44 +13,33 @@ import com.gingersoft.gsa.cloud.base.Api; ...@@ -20,44 +13,33 @@ import com.gingersoft.gsa.cloud.base.Api;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.base.utils.file.FileUtils; import com.gingersoft.gsa.cloud.base.utils.file.FileUtils;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils; import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.util.QMUIDeviceHelper;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer; import java.io.Writer;
import java.lang.Thread.UncaughtExceptionHandler; import java.lang.Thread.UncaughtExceptionHandler;
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observer; import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import okhttp3.FormBody;
import okhttp3.RequestBody;
public class AppCrashHandler implements UncaughtExceptionHandler { public class AppCrashHandler implements UncaughtExceptionHandler {
/** /**
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
package com.gingersoft.gsa.cloud.base.utils.okhttpUtils; package com.gingersoft.gsa.cloud.base.utils.okhttpUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/AppConstans.java → public-base/src/main/java/com/gingersoft/gsa/cloud/constans/AppConstans.java
package com.gingersoft.gsa.cloud.base.utils.constans; package com.gingersoft.gsa.cloud.constans;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/Constans.java → public-base/src/main/java/com/gingersoft/gsa/cloud/constans/Constans.java
package com.gingersoft.gsa.cloud.base.utils.constans; package com.gingersoft.gsa.cloud.constans;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/app/GoldConstants.java → public-base/src/main/java/com/gingersoft/gsa/cloud/constans/GoldConstants.java
package com.gingersoft.gsa.cloud.table.app; package com.gingersoft.gsa.cloud.constans;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
* 创建日期：2020-01-08 * 创建日期：2020-04-27
* 修订历史：2020-01-08 * 修订历史：2020-04-27
* 描述： * 描述：
*/ */
public interface GoldConstants { public interface GoldConstants {
...@@ -14,7 +14,7 @@ public interface GoldConstants { ...@@ -14,7 +14,7 @@ public interface GoldConstants {
int restaurantId = 26; int restaurantId = 26;
int refreshTime = 3; int refreshTime = 3;
// boolean isRefreshData = false; // boolean isRefreshData = false;
int DetailColCount = 4; int DetailColCount = 4;
int foodGriupColCount = 5;//食品組列數 int foodGriupColCount = 5;//食品組列數
...@@ -22,5 +22,4 @@ public interface GoldConstants { ...@@ -22,5 +22,4 @@ public interface GoldConstants {
int foodGriupColumns = 5;//食品組列數 int foodGriupColumns = 5;//食品組列數
int foodGriupPageSize = 10;//食品組最大顯示數 int foodGriupPageSize = 10;//食品組最大顯示數
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/HttpsConstans.java → public-base/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
package com.gingersoft.gsa.cloud.base.utils.constans; package com.gingersoft.gsa.cloud.constans;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
...@@ -8,6 +8,7 @@ public class HttpsConstans { ...@@ -8,6 +8,7 @@ public class HttpsConstans {
public static String ROOT_SERVER_ADDRESS_FORMAL = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/"; public static String ROOT_SERVER_ADDRESS_FORMAL = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/";
public static final String ROOT_SERVER_ADDRESS_FORMAL_SZ = "http://gingersoft.tpddns.cn:58201/ricepon-cloud-gsa/api/";// 深圳服务器 public static final String ROOT_SERVER_ADDRESS_FORMAL_SZ = "http://gingersoft.tpddns.cn:58201/ricepon-cloud-gsa/api/";// 深圳服务器
public static final String ROOT_SERVER_ADDRESS_FORMAL_HK = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/";// 香港服务器 public static final String ROOT_SERVER_ADDRESS_FORMAL_HK = "http://a.ricepon.com:58201/ricepon-cloud-gsa/api/";// 香港服务器
public static String ROOT_SERVER_YOU_CHANG_HK = "http://192.168.1.142:9012/api/"; //友常本地
public static String ROOT_SERVER_ADDRESS_FORMAL2 = "http://gingersoft.tpddns.cn:53000/mock/49/ricepon-cloud-gsa/api/";//測試服務器 public static String ROOT_SERVER_ADDRESS_FORMAL2 = "http://gingersoft.tpddns.cn:53000/mock/49/ricepon-cloud-gsa/api/";//測試服務器
......
public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/constans/UserConstans.java → public-base/src/main/java/com/gingersoft/gsa/cloud/constans/UserConstans.java
package com.gingersoft.gsa.cloud.base.utils.constans; package com.gingersoft.gsa.cloud.constans;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/bean/ComboItem.java
...@@ -5,7 +5,9 @@ import android.graphics.Color; ...@@ -5,7 +5,9 @@ import android.graphics.Color;
import org.greenrobot.greendao.annotation.Entity; import org.greenrobot.greendao.annotation.Entity;
import org.greenrobot.greendao.annotation.Id; import org.greenrobot.greendao.annotation.Id;
import org.greenrobot.greendao.annotation.Property; import org.greenrobot.greendao.annotation.Property;
import java.util.Date; import java.util.Date;
import org.greenrobot.greendao.annotation.Generated; import org.greenrobot.greendao.annotation.Generated;
import org.greenrobot.greendao.annotation.Transient; import org.greenrobot.greendao.annotation.Transient;
...@@ -22,21 +24,55 @@ public class ComboItem { ...@@ -22,21 +24,55 @@ public class ComboItem {
/** /**
* ID * ID
*/ */
// @Property(nameInDb = "_id")
// @Id(autoincrement = true)
// private Long id;
//
// private Long comId;
//
// private Long fid;
//
// private Long qty;
//
// private Double diffAmt;
//
// private Long seqNo;
//
// private Long visible;
//
// private Date createTime;
//
// private String createBy;
//
// private Date updateTime;
//
// private Long conditions;
//
// private Long isRT;
//
// private Byte deletes;
//
// private Long posId;
//
// private Long restaurant_id;
//
// private Byte isMainAccount;
@Property(nameInDb = "_id") @Property(nameInDb = "_id")
@Id(autoincrement = true) @Id(autoincrement = true)
private Long id; private Long id;
private Long comId; private long comId;
private Long fid; private long fid;
private Long qty; private long qty;
private Double diffAmt; private double diffAmt;
private Long seqNo; private long seqNo;
private Long visible; private long visible;
private Date createTime; private Date createTime;
...@@ -44,18 +80,17 @@ public class ComboItem { ...@@ -44,18 +80,17 @@ public class ComboItem {
private Date updateTime; private Date updateTime;
private Long conditions; private long conditions;
private Long isRT;
private Byte deletes; private long isRT;
private Long posId; private byte deletes;
private Long restaurant_id; private long posId;
private Byte isMainAccount; private long restaurant_id;
private byte isMainAccount;
/** /**
* 自定義字段 * 自定義字段
...@@ -68,13 +103,19 @@ public class ComboItem { ...@@ -68,13 +103,19 @@ public class ComboItem {
private String name2; private String name2;
@Transient @Transient
private long parentId; private long parentId;
/**套餐最大選擇數*/ /**
* 套餐最大選擇數
*/
@Transient @Transient
private int selectQty; private int selectQty = 0;
/**默認選中數*/ /**
* 默認選中數
*/
@Transient @Transient
private String defmodifier = "0"; private String defmodifier = "0";
/**價格*/ /**
* 價格
*/
@Transient @Transient
private double price = 0.00; private double price = 0.00;
/*** 是否自動展開*/ /*** 是否自動展開*/
...@@ -94,12 +135,10 @@ public class ComboItem { ...@@ -94,12 +135,10 @@ public class ComboItem {
private Modifier modifier; private Modifier modifier;
@Generated(hash = 1123579083)
@Generated(hash = 1857315418) public ComboItem(Long id, long comId, long fid, long qty, double diffAmt, long seqNo,
public ComboItem(Long id, Long comId, Long fid, Long qty, Double diffAmt, long visible, Date createTime, String createBy, Date updateTime, long conditions,
Long seqNo, Long visible, Date createTime, String createBy, long isRT, byte deletes, long posId, long restaurant_id, byte isMainAccount) {
Date updateTime, Long conditions, Long isRT, Byte deletes, Long posId,
Long restaurant_id, Byte isMainAccount) {
this.id = id; this.id = id;
this.comId = comId; this.comId = comId;
this.fid = fid; this.fid = fid;
...@@ -123,7 +162,6 @@ public class ComboItem { ...@@ -123,7 +162,6 @@ public class ComboItem {
} }
public Long getId() { public Long getId() {
return id; return id;
} }
...@@ -356,4 +394,56 @@ public class ComboItem { ...@@ -356,4 +394,56 @@ public class ComboItem {
return foodCombo; return foodCombo;
} }
public void setId(long id) {
this.id = id;
}
public void setComId(long comId) {
this.comId = comId;
}
public void setFid(long fid) {
this.fid = fid;
}
public void setQty(long qty) {
this.qty = qty;
}
public void setDiffAmt(double diffAmt) {
this.diffAmt = diffAmt;
}
public void setSeqNo(long seqNo) {
this.seqNo = seqNo;
}
public void setVisible(long visible) {
this.visible = visible;
}
public void setConditions(long conditions) {
this.conditions = conditions;
}
public void setIsRT(long isRT) {
this.isRT = isRT;
}
public void setDeletes(byte deletes) {
this.deletes = deletes;
}
public void setPosId(long posId) {
this.posId = posId;
}
public void setRestaurant_id(long restaurant_id) {
this.restaurant_id = restaurant_id;
}
public void setIsMainAccount(byte isMainAccount) {
this.isMainAccount = isMainAccount;
}
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
...@@ -19,6 +19,27 @@ import org.greenrobot.greendao.annotation.Generated; ...@@ -19,6 +19,27 @@ import org.greenrobot.greendao.annotation.Generated;
@Entity @Entity
public class Discount { public class Discount {
// /**
// * ID
// */
// @Property(nameInDb = "_id")
// @Id(autoincrement = true)
// private Long id;
//
// private Integer restaurant_id;
// /**金額*/
// private Double amount;
// /**折扣*/
// private Double discount_value;
// /**类型#0:金额;1:折扣;*/
// private Integer type;
// /**状态#0:启用;1:禁用;*/
// private Integer status;
// /**折扣描述*/
// private String remark;
// private Date begin_time;
// private Date end_time;
/** /**
* ID * ID
*/ */
...@@ -26,24 +47,23 @@ public class Discount { ...@@ -26,24 +47,23 @@ public class Discount {
@Id(autoincrement = true) @Id(autoincrement = true)
private Long id; private Long id;
private Integer restaurant_id; private int restaurant_id;
/**金額*/ /**金額*/
private Double amount; private double amount;
/**折扣*/ /**折扣*/
private Double discount_value; private double discount_value;
/**类型#0:金额;1:折扣;*/ /**类型#0:金额;1:折扣;*/
private Integer type; private int type;
/**状态#0:启用;1:禁用;*/ /**状态#0:启用;1:禁用;*/
private Integer status; private int status;
/**折扣描述*/ /**折扣描述*/
private String remark; private String remark;
private Date begin_time; private Date begin_time;
private Date end_time; private Date end_time;
@Generated(hash = 947827493) @Generated(hash = 1370540661)
public Discount(Long id, Integer restaurant_id, Double amount, public Discount(Long id, int restaurant_id, double amount, double discount_value,
Double discount_value, Integer type, Integer status, String remark, int type, int status, String remark, Date begin_time, Date end_time) {
Date begin_time, Date end_time) {
this.id = id; this.id = id;
this.restaurant_id = restaurant_id; this.restaurant_id = restaurant_id;
this.amount = amount; this.amount = amount;
...@@ -57,62 +77,80 @@ public class Discount { ...@@ -57,62 +77,80 @@ public class Discount {
@Generated(hash = 1777606421) @Generated(hash = 1777606421)
public Discount() { public Discount() {
} }
public Long getId() { public Long getId() {
return this.id; return id;
} }
public void setId(Long id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
public Integer getRestaurant_id() {
return this.restaurant_id; public int getRestaurant_id() {
return restaurant_id;
} }
public void setRestaurant_id(Integer restaurant_id) {
public void setRestaurant_id(int restaurant_id) {
this.restaurant_id = restaurant_id; this.restaurant_id = restaurant_id;
} }
public Double getAmount() {
return this.amount; public double getAmount() {
return amount;
} }
public void setAmount(Double amount) {
public void setAmount(double amount) {
this.amount = amount; this.amount = amount;
} }
public Double getDiscount_value() {
return this.discount_value; public double getDiscount_value() {
return discount_value;
} }
public void setDiscount_value(Double discount_value) {
public void setDiscount_value(double discount_value) {
this.discount_value = discount_value; this.discount_value = discount_value;
} }
public Integer getType() {
return this.type; public int getType() {
return type;
} }
public void setType(Integer type) {
public void setType(int type) {
this.type = type; this.type = type;
} }
public Integer getStatus() {
return this.status; public int getStatus() {
return status;
} }
public void setStatus(Integer status) {
public void setStatus(int status) {
this.status = status; this.status = status;
} }
public String getRemark() { public String getRemark() {
return this.remark; return remark;
} }
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
public Date getBegin_time() { public Date getBegin_time() {
return this.begin_time; return begin_time;
} }
public void setBegin_time(Date begin_time) { public void setBegin_time(Date begin_time) {
this.begin_time = begin_time; this.begin_time = begin_time;
} }
public Date getEnd_time() { public Date getEnd_time() {
return this.end_time; return end_time;
} }
public void setEnd_time(Date end_time) { public void setEnd_time(Date end_time) {
this.end_time = end_time; this.end_time = end_time;
} }
/** /**
* 計算折扣金額 * 計算折扣金額
* @param discount * @param discount
...@@ -131,9 +169,10 @@ public class Discount { ...@@ -131,9 +169,10 @@ public class Discount {
if(sourcePrice < discountPrice){ if(sourcePrice < discountPrice){
//折扣金額不能超出總額 //折扣金額不能超出總額
discountPrice = sourcePrice; discountPrice = sourcePrice;
}else {
discountPrice = sourcePrice - discountPrice;
} }
// else {
// discountPrice = sourcePrice - discountPrice;
// }
return -MoneyUtil.get_ItemDecimals_money(discountPrice); return -MoneyUtil.get_ItemDecimals_money(discountPrice);
} }
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; ...@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/** /**
* Master of DAO (schema version 2): knows all DAOs. * Master of DAO (schema version 4): knows all DAOs.
*/ */
public class DaoMaster extends AbstractDaoMaster { public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 2; public static final int SCHEMA_VERSION = 4;
/** Creates underlying database table using DAOs. */ /** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) { public static void createAllTables(Database db, boolean ifNotExists) {
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
...@@ -25,11 +25,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -25,11 +25,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
*/ */
public static class Properties { public static class Properties {
public final static Property Id = new Property(0, Long.class, "id", true, "_id"); public final static Property Id = new Property(0, Long.class, "id", true, "_id");
public final static Property Restaurant_id = new Property(1, Integer.class, "restaurant_id", false, "RESTAURANT_ID"); public final static Property Restaurant_id = new Property(1, int.class, "restaurant_id", false, "RESTAURANT_ID");
public final static Property Amount = new Property(2, Double.class, "amount", false, "AMOUNT"); public final static Property Amount = new Property(2, double.class, "amount", false, "AMOUNT");
public final static Property Discount_value = new Property(3, Double.class, "discount_value", false, "DISCOUNT_VALUE"); public final static Property Discount_value = new Property(3, double.class, "discount_value", false, "DISCOUNT_VALUE");
public final static Property Type = new Property(4, Integer.class, "type", false, "TYPE"); public final static Property Type = new Property(4, int.class, "type", false, "TYPE");
public final static Property Status = new Property(5, Integer.class, "status", false, "STATUS"); public final static Property Status = new Property(5, int.class, "status", false, "STATUS");
public final static Property Remark = new Property(6, String.class, "remark", false, "REMARK"); public final static Property Remark = new Property(6, String.class, "remark", false, "REMARK");
public final static Property Begin_time = new Property(7, java.util.Date.class, "begin_time", false, "BEGIN_TIME"); public final static Property Begin_time = new Property(7, java.util.Date.class, "begin_time", false, "BEGIN_TIME");
public final static Property End_time = new Property(8, java.util.Date.class, "end_time", false, "END_TIME"); public final static Property End_time = new Property(8, java.util.Date.class, "end_time", false, "END_TIME");
...@@ -49,11 +49,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -49,11 +49,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
String constraint = ifNotExists? "IF NOT EXISTS ": ""; String constraint = ifNotExists? "IF NOT EXISTS ": "";
db.execSQL("CREATE TABLE " + constraint + "\"DISCOUNT\" (" + // db.execSQL("CREATE TABLE " + constraint + "\"DISCOUNT\" (" + //
"\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
"\"RESTAURANT_ID\" INTEGER," + // 1: restaurant_id "\"RESTAURANT_ID\" INTEGER NOT NULL ," + // 1: restaurant_id
"\"AMOUNT\" REAL," + // 2: amount "\"AMOUNT\" REAL NOT NULL ," + // 2: amount
"\"DISCOUNT_VALUE\" REAL," + // 3: discount_value "\"DISCOUNT_VALUE\" REAL NOT NULL ," + // 3: discount_value
"\"TYPE\" INTEGER," + // 4: type "\"TYPE\" INTEGER NOT NULL ," + // 4: type
"\"STATUS\" INTEGER," + // 5: status "\"STATUS\" INTEGER NOT NULL ," + // 5: status
"\"REMARK\" TEXT," + // 6: remark "\"REMARK\" TEXT," + // 6: remark
"\"BEGIN_TIME\" INTEGER," + // 7: begin_time "\"BEGIN_TIME\" INTEGER," + // 7: begin_time
"\"END_TIME\" INTEGER);"); // 8: end_time "\"END_TIME\" INTEGER);"); // 8: end_time
...@@ -73,31 +73,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -73,31 +73,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getRestaurant_id());
Integer restaurant_id = entity.getRestaurant_id(); stmt.bindDouble(3, entity.getAmount());
if (restaurant_id != null) { stmt.bindDouble(4, entity.getDiscount_value());
stmt.bindLong(2, restaurant_id); stmt.bindLong(5, entity.getType());
} stmt.bindLong(6, entity.getStatus());
Double amount = entity.getAmount();
if (amount != null) {
stmt.bindDouble(3, amount);
}
Double discount_value = entity.getDiscount_value();
if (discount_value != null) {
stmt.bindDouble(4, discount_value);
}
Integer type = entity.getType();
if (type != null) {
stmt.bindLong(5, type);
}
Integer status = entity.getStatus();
if (status != null) {
stmt.bindLong(6, status);
}
String remark = entity.getRemark(); String remark = entity.getRemark();
if (remark != null) { if (remark != null) {
...@@ -123,31 +103,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -123,31 +103,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getRestaurant_id());
Integer restaurant_id = entity.getRestaurant_id(); stmt.bindDouble(3, entity.getAmount());
if (restaurant_id != null) { stmt.bindDouble(4, entity.getDiscount_value());
stmt.bindLong(2, restaurant_id); stmt.bindLong(5, entity.getType());
} stmt.bindLong(6, entity.getStatus());
Double amount = entity.getAmount();
if (amount != null) {
stmt.bindDouble(3, amount);
}
Double discount_value = entity.getDiscount_value();
if (discount_value != null) {
stmt.bindDouble(4, discount_value);
}
Integer type = entity.getType();
if (type != null) {
stmt.bindLong(5, type);
}
Integer status = entity.getStatus();
if (status != null) {
stmt.bindLong(6, status);
}
String remark = entity.getRemark(); String remark = entity.getRemark();
if (remark != null) { if (remark != null) {
...@@ -174,11 +134,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -174,11 +134,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
public Discount readEntity(Cursor cursor, int offset) { public Discount readEntity(Cursor cursor, int offset) {
Discount entity = new Discount( // Discount entity = new Discount( //
cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id
cursor.isNull(offset + 1) ? null : cursor.getInt(offset + 1), // restaurant_id cursor.getInt(offset + 1), // restaurant_id
cursor.isNull(offset + 2) ? null : cursor.getDouble(offset + 2), // amount cursor.getDouble(offset + 2), // amount
cursor.isNull(offset + 3) ? null : cursor.getDouble(offset + 3), // discount_value cursor.getDouble(offset + 3), // discount_value
cursor.isNull(offset + 4) ? null : cursor.getInt(offset + 4), // type cursor.getInt(offset + 4), // type
cursor.isNull(offset + 5) ? null : cursor.getInt(offset + 5), // status cursor.getInt(offset + 5), // status
cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // remark cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // remark
cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)), // begin_time cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)), // begin_time
cursor.isNull(offset + 8) ? null : new java.util.Date(cursor.getLong(offset + 8)) // end_time cursor.isNull(offset + 8) ? null : new java.util.Date(cursor.getLong(offset + 8)) // end_time
...@@ -189,11 +149,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> { ...@@ -189,11 +149,11 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
@Override @Override
public void readEntity(Cursor cursor, Discount entity, int offset) { public void readEntity(Cursor cursor, Discount entity, int offset) {
entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0));
entity.setRestaurant_id(cursor.isNull(offset + 1) ? null : cursor.getInt(offset + 1)); entity.setRestaurant_id(cursor.getInt(offset + 1));
entity.setAmount(cursor.isNull(offset + 2) ? null : cursor.getDouble(offset + 2)); entity.setAmount(cursor.getDouble(offset + 2));
entity.setDiscount_value(cursor.isNull(offset + 3) ? null : cursor.getDouble(offset + 3)); entity.setDiscount_value(cursor.getDouble(offset + 3));
entity.setType(cursor.isNull(offset + 4) ? null : cursor.getInt(offset + 4)); entity.setType(cursor.getInt(offset + 4));
entity.setStatus(cursor.isNull(offset + 5) ? null : cursor.getInt(offset + 5)); entity.setStatus(cursor.getInt(offset + 5));
entity.setRemark(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6)); entity.setRemark(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
entity.setBegin_time(cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7))); entity.setBegin_time(cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)));
entity.setEnd_time(cursor.isNull(offset + 8) ? null : new java.util.Date(cursor.getLong(offset + 8))); entity.setEnd_time(cursor.isNull(offset + 8) ? null : new java.util.Date(cursor.getLong(offset + 8)));
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/utils/ModifierDaoUtils.java
...@@ -193,26 +193,17 @@ public class ModifierDaoUtils { ...@@ -193,26 +193,17 @@ public class ModifierDaoUtils {
/** /**
* 使用queryBuilder进行查询食品 * 使用queryBuilder进行查询食品
* *
* @param mod_msg
* @param visible
* @return * @return
*/ */
public List<Modifier> queryModifierByModMsgAndVisibleQueryBuilder(String mod_msg, int visible) { public List<Modifier> queryModifierByModMsgAndVisibleQueryBuilder() {
ArrayList<Modifier> fms = new ArrayList<>(); ArrayList<Modifier> fms = new ArrayList<>();
QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class); // QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class);
String parentSql = "SELECT * FROM MODIFIER WHERE MOD_MSG=1 and VISIBLE=0 and IS_PARENT=1"; String parentSql = "SELECT * FROM MODIFIER WHERE MOD_MSG=1 and VISIBLE=0 and IS_PARENT=1";
// List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.ModMsg.eq(mod_msg),
// ModifierDao.Properties.Visible.eq(visible),
// ModifierDao.Properties.IsParent.eq(1))).orderAsc(ModifierDao.Properties.SeqNo).list();
List<Modifier> parentModifiers = query_modifier_Child_new(parentSql, 0); List<Modifier> parentModifiers = query_modifier_Child_new(parentSql, 0);
String childSql = "SELECT * FROM MODIFIER WHERE MOD_MSG=1 and VISIBLE=0 and IS_PARENT=0"; String childSql = "SELECT * FROM MODIFIER WHERE MOD_MSG=1 and VISIBLE=0 and IS_PARENT=0";
// List<Modifier> childModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.ModMsg.eq(mod_msg),
// ModifierDao.Properties.Visible.eq(visible))).list();
List<Modifier> childModifiers = query_modifier_Child_new(childSql, 0); List<Modifier> childModifiers = query_modifier_Child_new(childSql, 0);
fms.addAll(parentModifiers); fms.addAll(parentModifiers);
...@@ -224,15 +215,13 @@ public class ModifierDaoUtils { ...@@ -224,15 +215,13 @@ public class ModifierDaoUtils {
/** /**
* 使用queryBuilder进行查询食品 * 使用queryBuilder进行查询食品
* *
* @param mod_taste
* @param visible
* @return * @return
*/ */
public List<Modifier> queryModifierByModModTasteVisibleQueryBuilder(long mod_taste, int visible) { public List<Modifier> queryModifierByModModTasteVisibleQueryBuilder() {
ArrayList<Modifier> fms = new ArrayList<>(); ArrayList<Modifier> fms = new ArrayList<>();
QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class); // QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class);
// List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and( // List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.ModTaste.eq(mod_taste), // ModifierDao.Properties.ModTaste.eq(mod_taste),
...@@ -258,6 +247,38 @@ public class ModifierDaoUtils { ...@@ -258,6 +247,38 @@ public class ModifierDaoUtils {
/** /**
* 使用queryBuilder进行查询食品 * 使用queryBuilder进行查询食品
* @return
*/
public List<Modifier> queryModifierByModModCommVisibleQueryBuilder() {
ArrayList<Modifier> fms = new ArrayList<>();
// QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class);
// List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.ModTaste.eq(mod_taste),
// ModifierDao.Properties.Visible.eq(visible),
// ModifierDao.Properties.IsParent.eq(1))).orderAsc(ModifierDao.Properties.SeqNo).list();
//
// List<Modifier> childModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.ModTaste.eq(mod_taste),
// ModifierDao.Properties.Visible.eq(visible),
// ModifierDao.Properties.IsParent.eq(0))).orderAsc(ModifierDao.Properties.SeqNo).list();
String parentSql = "SELECT * FROM MODIFIER WHERE MOD_COMM=1 and VISIBLE=0 and IS_PARENT=1";
List<Modifier> parentModifiers = query_modifier_Child_new(parentSql, 0);
String childSql = "SELECT * FROM MODIFIER WHERE MOD_COMM=1 and VISIBLE=0 and IS_PARENT=0";
List<Modifier> childModifiers = query_modifier_Child_new(childSql, 0);
fms.addAll(parentModifiers);
fms.addAll(childModifiers);
return fms;
}
/**
* 使用queryBuilder进行查询食品
* *
* @param topid * @param topid
* @return * @return
...@@ -266,7 +287,7 @@ public class ModifierDaoUtils { ...@@ -266,7 +287,7 @@ public class ModifierDaoUtils {
ArrayList<Modifier> fms = new ArrayList<>(); ArrayList<Modifier> fms = new ArrayList<>();
QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class); // QueryBuilder<Modifier> queryBuilder = mManager.getDaoSession().queryBuilder(Modifier.class);
// List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and( // List<Modifier> parentModifiers = queryBuilder.where(queryBuilder.and(
// ModifierDao.Properties.TopId.eq(topid), // ModifierDao.Properties.TopId.eq(topid),
...@@ -290,6 +311,7 @@ public class ModifierDaoUtils { ...@@ -290,6 +311,7 @@ public class ModifierDaoUtils {
return fms; return fms;
} }
public List<Modifier> queryModifiersByFid(long fid, int mode) { public List<Modifier> queryModifiersByFid(long fid, int mode) {
// String sql = " SELECT MODIFIER.mid,MODIFIER_NAME,MODIFIER_NAME1,MODIFIER_NAME2,TOP_ID,PRICE,MOD_COMM,MOD_TASTE,MOD_MSG,VISIBLE,MULTIPLE,IS_PARENT" + // String sql = " SELECT MODIFIER.mid,MODIFIER_NAME,MODIFIER_NAME1,MODIFIER_NAME2,TOP_ID,PRICE,MOD_COMM,MOD_TASTE,MOD_MSG,VISIBLE,MULTIPLE,IS_PARENT" +
...@@ -368,12 +390,15 @@ public class ModifierDaoUtils { ...@@ -368,12 +390,15 @@ public class ModifierDaoUtils {
order.setModMsg(c.getLong(c.getColumnIndex("MOD_MSG"))); order.setModMsg(c.getLong(c.getColumnIndex("MOD_MSG")));
order.setModTaste(c.getLong(c.getColumnIndex("MOD_TASTE"))); order.setModTaste(c.getLong(c.getColumnIndex("MOD_TASTE")));
order.setMultiple(c.getDouble(c.getColumnIndex("MULTIPLE"))); order.setMultiple(c.getDouble(c.getColumnIndex("MULTIPLE")));
if (fid != 0) {
//非公共細項
order.setMaxNumber(c.getInt(c.getColumnIndex("MAX_QTY"))); order.setMaxNumber(c.getInt(c.getColumnIndex("MAX_QTY")));
order.setMinNumber(c.getInt(c.getColumnIndex("MIN_QTY"))); order.setMinNumber(c.getInt(c.getColumnIndex("MIN_QTY")));
String defmodifier = c.getString(c.getColumnIndex("DEFMODIFIER")); String defmodifier = c.getString(c.getColumnIndex("DEFMODIFIER"));
if (!TextUtils.isEmpty(defmodifier) && !", ".equals(defmodifier)) { if (!TextUtils.isEmpty(defmodifier) && !", ".equals(defmodifier)) {
order.setDefmodifier(defmodifier); order.setDefmodifier(defmodifier);
} }
}
// if (order.isVisible()) { // if (order.isVisible()) {
modifiers.add(order); modifiers.add(order);
// } // }
......
public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/GlobalConfiguration.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.globalconfig;
import android.app.Application; import android.app.Application;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGlobalHttpHandler; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGlobalHttpHandler;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGsonConfiguration; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyGsonConfiguration;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyOkhttpConfiguration; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.MyOkhttpConfiguration;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyGlobalHttpHandler.java
package com.gingersoft.gsa.cloud.globalconfig.applyOptions; package com.gingersoft.gsa.cloud.globalconfig.applyOptions;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.jess.arms.http.GlobalHttpHandler; import com.jess.arms.http.GlobalHttpHandler;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyResponseErrorListener.java
...@@ -93,10 +93,10 @@ public class MyResponseErrorListener implements ResponseErrorListener { ...@@ -93,10 +93,10 @@ public class MyResponseErrorListener implements ResponseErrorListener {
OpenTableManage.getDefault().clear(); OpenTableManage.getDefault().clear();
//修改登錄狀態 //修改登錄狀態
GsaCloudApplication.isLogin = false; GsaCloudApplication.isLogin = false;
// CC.obtainBuilder("User.Component.Login") CC.obtainBuilder("User.Component.Login")
// .setActionName("showActivityA") .setActionName("showActivityA")
// .build() .build()
// .call(); .call();
showloggedDialog = false; showloggedDialog = false;
context.finish(); context.finish();
dialog.dismiss(); dialog.dismiss();
......
public-base/src/main/java/com/gingersoft/gsa/cloud/print/PrinterUtils.java
...@@ -23,7 +23,7 @@ import android.graphics.Color; ...@@ -23,7 +23,7 @@ import android.graphics.Color;
import android.graphics.Matrix; import android.graphics.Matrix;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.constans.Constans; import com.gingersoft.gsa.cloud.constans.Constans;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.widget.DialogUtils; import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
......
public-base/src/main/java/com/gingersoft/gsa/cloud/ui/bean/view/SectionTextItem3.java
package com.gingersoft.gsa.cloud.ui.bean.view; package com.gingersoft.gsa.cloud.ui.bean.view;
import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod; import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -19,6 +21,10 @@ public class SectionTextItem3 { ...@@ -19,6 +21,10 @@ public class SectionTextItem3 {
private String centerText; private String centerText;
private String rightText; private String rightText;
private int leftTextStyle;
private int centerTextStyle;
private int rightTextStyle;
public SectionTextItem3() { public SectionTextItem3() {
} }
...@@ -52,6 +58,29 @@ public class SectionTextItem3 { ...@@ -52,6 +58,29 @@ public class SectionTextItem3 {
this.rightText = rightText; this.rightText = rightText;
} }
public int getLeftTextStyle() {
return leftTextStyle;
}
public void setLeftTextStyle(int leftTextStyle) {
this.leftTextStyle = leftTextStyle;
}
public int getCenterTextStyle() {
return centerTextStyle;
}
public void setCenterTextStyle(int centerTextStyle) {
this.centerTextStyle = centerTextStyle;
}
public int getRightTextStyle() {
return rightTextStyle;
}
public void setRightTextStyle(int rightTextStyle) {
this.rightTextStyle = rightTextStyle;
}
public static List<SectionTextItem3> orderDetailTransSectionTextItem3(List<OrderDetail> orderDetailList) { public static List<SectionTextItem3> orderDetailTransSectionTextItem3(List<OrderDetail> orderDetailList) {
List<SectionTextItem3> sectionTextItem3List = new ArrayList<>(); List<SectionTextItem3> sectionTextItem3List = new ArrayList<>();
...@@ -71,7 +100,11 @@ public class SectionTextItem3 { ...@@ -71,7 +100,11 @@ public class SectionTextItem3 {
} }
sectionTextItem3.setLeftText(foodName); sectionTextItem3.setLeftText(foodName);
sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber())); sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber()));
if (orderDetail.getType() == OrderDetail.DISCOUNT_TYPE) {
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice()));
} else {
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice() * orderDetail.getNumber())); sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice() * orderDetail.getNumber()));
}
sectionTextItem3List.add(sectionTextItem3); sectionTextItem3List.add(sectionTextItem3);
} }
return sectionTextItem3List; return sectionTextItem3List;
...@@ -84,9 +117,23 @@ public class SectionTextItem3 { ...@@ -84,9 +117,23 @@ public class SectionTextItem3 {
sectionTextItem3.setLeftText(payMethod.getPayName()); sectionTextItem3.setLeftText(payMethod.getPayName());
sectionTextItem3.setCenterText(String.valueOf(0)); sectionTextItem3.setCenterText(String.valueOf(0));
sectionTextItem3.setRightText(String.valueOf(payMethod.getPayMoney())); sectionTextItem3.setRightText(String.valueOf(payMethod.getPayMoney()));
sectionTextItem3.setLeftTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3.setRightTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3List.add(sectionTextItem3); sectionTextItem3List.add(sectionTextItem3);
} }
return sectionTextItem3List; return sectionTextItem3List;
} }
public static List<SectionTextItem3> discountTransSectionTextItem3(Discount discount) {
List<SectionTextItem3> sectionTextItem3List = new ArrayList<>();
SectionTextItem3 sectionTextItem3 = new SectionTextItem3();
sectionTextItem3.setLeftText(discount.getRemark());
sectionTextItem3.setCenterText(String.valueOf(0));
sectionTextItem3.setRightText(String.valueOf(discount.getAmount()));
sectionTextItem3.setLeftTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3.setRightTextStyle(R.style.order_paymethod_text_style);
sectionTextItem3List.add(sectionTextItem3);
return sectionTextItem3List;
}
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/ui/view/ColorUtils.java 0 → 100644
package com.gingersoft.gsa.cloud.ui.view;
import android.content.res.ColorStateList;
public class ColorUtils {
private static final int ENABLE_ATTR = android.R.attr.state_enabled;
private static final int CHECKED_ATTR = android.R.attr.state_checked;
private static final int PRESSED_ATTR = android.R.attr.state_pressed;
public static ColorStateList generateThumbColorWithTintColor(final int tintColor) {
int[][] states = new int[][]{
{-ENABLE_ATTR, CHECKED_ATTR},
{-ENABLE_ATTR},
{PRESSED_ATTR, -CHECKED_ATTR},
{PRESSED_ATTR, CHECKED_ATTR},
{CHECKED_ATTR},
{-CHECKED_ATTR}
};
int[] colors = new int[] {
tintColor - 0xAA000000,
0xFFBABABA,
tintColor - 0x99000000,
tintColor - 0x99000000,
tintColor | 0xFF000000,
0xFFEEEEEE
};
return new ColorStateList(states, colors);
}
public static ColorStateList generateBackColorWithTintColor(final int tintColor) {
int[][] states = new int[][]{
{-ENABLE_ATTR, CHECKED_ATTR},
{-ENABLE_ATTR},
{CHECKED_ATTR, PRESSED_ATTR},
{-CHECKED_ATTR, PRESSED_ATTR},
{CHECKED_ATTR},
{-CHECKED_ATTR}
};
int[] colors = new int[] {
tintColor - 0xE1000000,
0x10000000,
tintColor - 0xD0000000,
0x20000000,
tintColor - 0xD0000000,
0x20000000
};
return new ColorStateList(states, colors);
}
}
public-base/src/main/java/com/gingersoft/gsa/cloud/ui/view/WaveHelper.java 0 → 100644
package com.gingersoft.gsa.cloud.ui.view;
import android.animation.Animator;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.LinearInterpolator;
import java.util.ArrayList;
import java.util.List;
public class WaveHelper {
private WaveView mWaveView;
private AnimatorSet mAnimatorSet;
public WaveHelper(WaveView waveView) {
mWaveView = waveView;
initAnimation();
}
public void start() {
mWaveView.setShowWave(true);
if (mAnimatorSet != null) {
mAnimatorSet.start();
}
}
private void initAnimation() {
List<Animator> animators = new ArrayList<>();
// horizontal animation.
// wave waves infinitely.
ObjectAnimator waveShiftAnim = ObjectAnimator.ofFloat(
mWaveView, "waveShiftRatio", 0f, 1f);
waveShiftAnim.setRepeatCount(ValueAnimator.INFINITE);
waveShiftAnim.setDuration(1000);
waveShiftAnim.setInterpolator(new LinearInterpolator());
animators.add(waveShiftAnim);
// vertical animation.
// water level increases from 0 to center of WaveView
// ObjectAnimator waterLevelAnim = ObjectAnimator.ofFloat(
// mWaveView, "waterLevelRatio", 0.5f, 0.8f);
// waterLevelAnim.setDuration(10000);
// waterLevelAnim.setInterpolator(new DecelerateInterpolator());
// animators.add(waterLevelAnim);
// amplitude animation.
// wave grows big then grows small, repeatedly
ObjectAnimator amplitudeAnim = ObjectAnimator.ofFloat(
mWaveView, "amplitudeRatio", 0.01f, 0.03f);
amplitudeAnim.setRepeatCount(ValueAnimator.INFINITE);
amplitudeAnim.setRepeatMode(ValueAnimator.REVERSE);
amplitudeAnim.setDuration(5000);
amplitudeAnim.setInterpolator(new LinearInterpolator());
animators.add(amplitudeAnim);
mAnimatorSet = new AnimatorSet();
mAnimatorSet.playTogether(animators);
}
public void cancel() {
if (mAnimatorSet != null) {
// mAnimatorSet.cancel();
mAnimatorSet.end();
}
}
}
public-base/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/CommonTipDialog.java
package com.gingersoft.gsa.cloud.ui.widget.dialog; package com.gingersoft.gsa.cloud.ui.widget.dialog;
import android.app.Activity; import android.app.Activity;
import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog; import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
...@@ -20,7 +21,7 @@ public class CommonTipDialog { ...@@ -20,7 +21,7 @@ public class CommonTipDialog {
/** /**
* 提示確認dialog 確認后且執行對應方法 * 提示dialog 確認后執行對應方法
* @param context * @param context
* @param msg * @param msg
* @param c * @param c
...@@ -29,11 +30,14 @@ public class CommonTipDialog { ...@@ -29,11 +30,14 @@ public class CommonTipDialog {
* @param parameterTypes * @param parameterTypes
* @param parameters * @param parameters
*/ */
public static void showTipAndExecuteMethodDialog(Activity context,String msg, Class c, Object object, String methodName, Class[] parameterTypes, Object[] parameters) { public static void showDoubtDialog(Activity context,String msg, Class c, Object object, String methodName, Class[] parameterTypes, Object[] parameters) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
dialogBuilder.setTitle("溫馨提示"); dialogBuilder.setTitle("溫馨提示");
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
dialogBuilder.setMessage(msg); dialogBuilder.setMessage(msg);
if(!TextUtils.isEmpty(methodName)) {
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss()); dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
}
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> { dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
dialog.dismiss(); dialog.dismiss();
try { try {
...@@ -51,10 +55,121 @@ public class CommonTipDialog { ...@@ -51,10 +55,121 @@ public class CommonTipDialog {
dialogBuilder.create(R.style.MyDialogTheme2).show(); dialogBuilder.create(R.style.MyDialogTheme2).show();
} }
/**
* 危險警示dialog 確認后執行對應方法
* @param context
* @param msg
* @param c
* @param object
* @param methodName
* @param parameterTypes
* @param parameters
*/
public static void showSurpisedDialog(Activity context,String msg, Class c, Object object, String methodName, Class[] parameterTypes, Object[] parameters) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
dialogBuilder.setMessage(msg);
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_surprised);
if(!TextUtils.isEmpty(methodName)) {
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
}
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
dialog.dismiss();
if(TextUtils.isEmpty(methodName)){
return;
}
try {
Method method = c.getDeclaredMethod(methodName, parameterTypes);
method.setAccessible(true);
method.invoke(object, parameters);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
});
dialogBuilder.create(R.style.MyDialogTheme2).show();
}
/**
* 警示dialog 確認后執行對應方法
* @param context
* @param msg
* @param c
* @param object
* @param methodName
* @param parameterTypes
* @param parameters
*/
public static void showWarnDialog(Activity context,String msg, Class c, Object object, String methodName, Class[] parameterTypes, Object[] parameters) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
dialogBuilder.setMessage(msg);
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_warn);
if(!TextUtils.isEmpty(methodName)) {
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
}
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
dialog.dismiss();
if(TextUtils.isEmpty(methodName)){
return;
}
try {
Method method = c.getDeclaredMethod(methodName, parameterTypes);
method.setAccessible(true);
method.invoke(object, parameters);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
});
dialogBuilder.create(R.style.MyDialogTheme2).show();
}
/**
* 取消 dialog 確認后執行對應方法
* @param context
* @param msg
* @param c
* @param object
* @param methodName
* @param parameterTypes
* @param parameters
*/
public static void showCancelDialog(Activity context,String msg, Class c, Object object, String methodName, Class[] parameterTypes, Object[] parameters) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
dialogBuilder.setMessage(msg);
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_cancel);
if(!TextUtils.isEmpty(methodName)) {
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
}
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
dialog.dismiss();
if(TextUtils.isEmpty(methodName)){
return;
}
try {
Method method = c.getDeclaredMethod(methodName, parameterTypes);
method.setAccessible(true);
method.invoke(object, parameters);
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
});
dialogBuilder.create(R.style.MyDialogTheme2).show();
}
public static void showTipDialog(Activity context, String msg) { public static void showTipDialog(Activity context, String msg) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(context);
dialogBuilder.setTitle("溫馨提示"); dialogBuilder.setTitle("溫馨提示");
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
dialogBuilder.setMessage(msg); dialogBuilder.setMessage(msg);
dialogBuilder.addAction("確定", (dialog, index) -> dialog.dismiss()); dialogBuilder.addAction("確定", (dialog, index) -> dialog.dismiss());
dialogBuilder.create(R.style.MyDialogTheme2).show(); dialogBuilder.create(R.style.MyDialogTheme2).show();
......
public-base/src/main/res/values/attrs.xml
...@@ -411,7 +411,27 @@ ...@@ -411,7 +411,27 @@
</declare-styleable> </declare-styleable>
<declare-styleable name="SwitchButton"> <declare-styleable name="SwitchButton">
<attr name="elevation" /> <attr name="kswThumbDrawable" format="reference"/>
<attr name="kswThumbColor" format="color|reference"/>
<attr name="kswThumbMargin" format="dimension|reference"/>
<attr name="kswThumbMarginTop" format="dimension|reference"/>
<attr name="kswThumbMarginBottom" format="dimension|reference"/>
<attr name="kswThumbMarginLeft" format="dimension|reference"/>
<attr name="kswThumbMarginRight" format="dimension|reference"/>
<attr name="kswThumbWidth" format="dimension|reference"/>
<attr name="kswThumbHeight" format="dimension|reference"/>
<attr name="kswThumbRadius" format="dimension|reference"/>
<attr name="kswBackRadius" format="dimension|reference"/>
<attr name="kswBackDrawable" format="reference"/>
<attr name="kswBackColor" format="color|reference"/>
<attr name="kswFadeBack" format="boolean"/>
<attr name="kswBackMeasureRatio" format="float"/>
<attr name="kswAnimationDuration" format="integer"/>
<attr name="kswTintColor" format="color|reference"/>
<attr name="kswTextOn" format="string"/>
<attr name="kswTextOff" format="string"/>
<attr name="kswTextMarginH" format="dimension"/>
<attr name="elevation" format="dimension"/>
<attr name="switcherBtn_width" format="dimension"/> <attr name="switcherBtn_width" format="dimension"/>
<attr name="switcherBtn_height" format="dimension"/> <attr name="switcherBtn_height" format="dimension"/>
<attr name="android:checked" format="boolean" /> <attr name="android:checked" format="boolean" />
...@@ -419,4 +439,18 @@ ...@@ -419,4 +439,18 @@
<attr name="switcherBtn_off_color" format="color" /> <attr name="switcherBtn_off_color" format="color" />
<attr name="switcherBtn_icon_color" format="color" /> <attr name="switcherBtn_icon_color" format="color" />
</declare-styleable> </declare-styleable>
<declare-styleable name="WaveView">
<attr name="waveWaterLevel" format="float" />
<attr name="amplitudeRatio" format="float" />
<attr name="waveLengthRatio" format="float" />
<attr name="waveShiftRatio" format="float" />
<attr name="frontWaveColor" format="color" />
<attr name="behindWaveColor" format="color" />
<attr name="waveShape" format="enum">
<enum name="circle" value="0" />
<enum name="square" value="1" />
</attr>
<attr name="showWave" format="boolean" />
</declare-styleable>
</resources> </resources>
\ No newline at end of file
public-base/src/main/res/values/styles.xml
...@@ -74,11 +74,20 @@ ...@@ -74,11 +74,20 @@
<item name="android:activityCloseExitAnimation">@anim/ui_slide_right_out</item> <item name="android:activityCloseExitAnimation">@anim/ui_slide_right_out</item>
</style> </style>
<style name="ButtonBorderless" parent="Base.Widget.AppCompat.Button.Borderless"> <style name="ButtonBorderless" parent="Base.Widget.AppCompat.Button.Borderless">
<item name="android:padding">0dp</item> <item name="android:padding">0dp</item>
</style> </style>
<style name="order_paymethod_text_style">
<item name="android:textStyle">bold</item>
<item name="android:textSize">16sp</item>
</style>
<style name="order_money_text_style">
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
</style>
<!-- **************************QMUI 相关*******************************--> <!-- **************************QMUI 相关*******************************-->
<style name="QDtextAppearanceListItem"> <style name="QDtextAppearanceListItem">
......
qm-qmui/src/main/java/com/qmuiteam/qmui/widget/dialog/QMUIDialogBuilder.java
...@@ -510,6 +510,7 @@ public abstract class QMUIDialogBuilder<T extends QMUIDialogBuilder> { ...@@ -510,6 +510,7 @@ public abstract class QMUIDialogBuilder<T extends QMUIDialogBuilder> {
lp.rightToRight = ConstraintLayout.LayoutParams.PARENT_ID; lp.rightToRight = ConstraintLayout.LayoutParams.PARENT_ID;
lp.topToTop = ConstraintLayout.LayoutParams.PARENT_ID; lp.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
lp.verticalChainStyle = ConstraintLayout.LayoutParams.CHAIN_PACKED; lp.verticalChainStyle = ConstraintLayout.LayoutParams.CHAIN_PACKED;
lp.topMargin = 30;
return lp; return lp;
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
...@@ -4,7 +4,6 @@ import android.app.Application; ...@@ -4,7 +4,6 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.database.bean.ComboItem; import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.FoodCombo; import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
...@@ -13,14 +12,12 @@ import com.gingersoft.gsa.cloud.database.bean.Modifier; ...@@ -13,14 +12,12 @@ import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils; import com.gingersoft.gsa.cloud.database.utils.DiscountDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodComboDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.FoodModifierDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils; import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.database.bean.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils; import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract; import com.gingersoft.gsa.cloud.table.mvp.contract.MealStandContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason; import com.gingersoft.gsa.cloud.table.mvp.model.bean.FoodReason;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.DeleteOrderRequest;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService; import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService; import com.gingersoft.gsa.cloud.table.mvp.model.service.OrderPayService;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -29,15 +26,12 @@ import com.jess.arms.integration.IRepositoryManager; ...@@ -29,15 +26,12 @@ import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel; import com.jess.arms.mvp.BaseModel;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Function; import io.reactivex.functions.Function;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.http.Field;
/** /**
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderPayModel.java
...@@ -3,8 +3,6 @@ package com.gingersoft.gsa.cloud.table.mvp.model; ...@@ -3,8 +3,6 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService; import com.gingersoft.gsa.cloud.table.mvp.model.service.MealService;
...@@ -17,8 +15,6 @@ import com.jess.arms.mvp.BaseModel; ...@@ -17,8 +15,6 @@ import com.jess.arms.mvp.BaseModel;
import javax.inject.Inject; import javax.inject.Inject;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.functions.Function;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody; import okhttp3.RequestBody;
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/TableModel.java
...@@ -2,8 +2,6 @@ package com.gingersoft.gsa.cloud.table.mvp.model; ...@@ -2,8 +2,6 @@ package com.gingersoft.gsa.cloud.table.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail; import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
...@@ -19,7 +17,6 @@ import javax.inject.Inject; ...@@ -19,7 +17,6 @@ import javax.inject.Inject;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract; import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import io.reactivex.Observable; import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody; import okhttp3.RequestBody;
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java
...@@ -48,6 +48,7 @@ public class OrderDetailItem implements Serializable { ...@@ -48,6 +48,7 @@ public class OrderDetailItem implements Serializable {
private String orderNo; private String orderNo;
private String tableName; private String tableName;
private int tableId; private int tableId;
private int person;
/**總金額*/ /**總金額*/
private double totalAmount; private double totalAmount;
private int totalPoints; private int totalPoints;
...@@ -57,11 +58,21 @@ public class OrderDetailItem implements Serializable { ...@@ -57,11 +58,21 @@ public class OrderDetailItem implements Serializable {
private String orderPayType; private String orderPayType;
private double tipsPrice; private double tipsPrice;
private byte linePayType; private byte linePayType;
/**折扣ID*/
private Long discountId;
/**折扣金額*/
private double discountAmount;
/**折扣比例*/
private double discountValue;
/**折扣名稱*/
private String remark;
/**折扣類型*/
private int type;
/**生成訂單時間*/ /**生成訂單時間*/
private String createTime; private String createTime;
/**結賬時間*/ /**結賬時間*/
private String endTime; private String endTime;
private int person;
private List<OrderBean.OrderDetailsBean> orderDetails; private List<OrderBean.OrderDetailsBean> orderDetails;
/** /**
...@@ -171,6 +182,30 @@ public class OrderDetailItem implements Serializable { ...@@ -171,6 +182,30 @@ public class OrderDetailItem implements Serializable {
this.amount = amount; this.amount = amount;
} }
public double getDiscountAmount() {
return discountAmount;
}
public void setDiscountAmount(double discountAmount) {
this.discountAmount = discountAmount;
}
public double getDiscountValue() {
return discountValue;
}
public void setDiscountValue(double discountValue) {
this.discountValue = discountValue;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public String getCreateTime() { public String getCreateTime() {
return createTime; return createTime;
} }
...@@ -195,6 +230,22 @@ public class OrderDetailItem implements Serializable { ...@@ -195,6 +230,22 @@ public class OrderDetailItem implements Serializable {
this.person = person; this.person = person;
} }
public Long getDiscountId() {
return discountId;
}
public void setDiscountId(Long discountId) {
this.discountId = discountId;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public List<OrderBean.OrderDetailsBean> getOrderDetails() { public List<OrderBean.OrderDetailsBean> getOrderDetails() {
return orderDetails; return orderDetails;
} }
...@@ -203,30 +254,30 @@ public class OrderDetailItem implements Serializable { ...@@ -203,30 +254,30 @@ public class OrderDetailItem implements Serializable {
this.orderDetails = orderDetails; this.orderDetails = orderDetails;
} }
public static List<OrderDetail> orderTransOrderDetails(List<OrderBean.OrderDetailsBean> orderDetails) { // public static List<OrderDetail> orderTransOrderDetails(List<OrderBean.OrderDetailsBean> orderDetails) {
List<OrderDetail> orderDetailList = new ArrayList<>(); // List<OrderDetail> orderDetailList = new ArrayList<>();
OrderDetail parentOrderDetail = null; // OrderDetail parentOrderDetail = null;
for (OrderBean.OrderDetailsBean orderDetailsBean : orderDetails) { // for (OrderBean.OrderDetailsBean orderDetailsBean : orderDetails) {
OrderDetail orderDetail = new OrderDetail(); // OrderDetail orderDetail = new OrderDetail();
orderDetail.setId(orderDetailsBean.getId()); // orderDetail.setId(orderDetailsBean.getId());
orderDetail.setProductId(orderDetailsBean.getProductId()); // orderDetail.setProductId(orderDetailsBean.getProductId());
orderDetail.setOrderId(orderDetailsBean.getOrderId()); // orderDetail.setOrderId(orderDetailsBean.getOrderId());
orderDetail.setParentId(orderDetailsBean.getParentId()); // orderDetail.setParentId(orderDetailsBean.getParentId());
orderDetail.setProductName(orderDetailsBean.getProductName()); // orderDetail.setProductName(orderDetailsBean.getProductName());
orderDetail.setNumber(orderDetailsBean.getNumber()); // orderDetail.setNumber(orderDetailsBean.getNumber());
orderDetail.setPrice(orderDetailsBean.getPrice()); // orderDetail.setPrice(orderDetailsBean.getPrice());
orderDetail.setVisible(orderDetailsBean.getStatus() == 0); // orderDetail.setVisible(orderDetailsBean.getStatus() == 0);
// orderDetail.setAutomod(foods.getAutomod()); //// orderDetail.setAutomod(foods.getAutomod());
orderDetail.setIsfood(orderDetailsBean.getType() == FOOD_TYPE); // orderDetail.setIsfood(orderDetailsBean.getType() == FOOD_TYPE);
orderDetail.setNew(false); // orderDetail.setNew(false);
orderDetail.setType(orderDetailsBean.getType()); // orderDetail.setType(orderDetailsBean.getType());
orderDetail.setItemType(getItemType(orderDetailsBean, parentOrderDetail)); // orderDetail.setItemType(getItemType(orderDetailsBean, parentOrderDetail));
orderDetailList.add(orderDetail); // orderDetailList.add(orderDetail);
if (orderDetail.isIsfood()) { // if (orderDetail.isIsfood()) {
parentOrderDetail = orderDetail; // parentOrderDetail = orderDetail;
} // }
} // }
return orderDetailList; // return orderDetailList;
} // }
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/AddOrderRequest.java
...@@ -17,7 +17,7 @@ public class AddOrderRequest { ...@@ -17,7 +17,7 @@ public class AddOrderRequest {
private long orderId; private long orderId;
/**整單折扣ID*/ /**整單折扣ID*/
private long detailsId; private Long discountId;
private Map<String, List<OrderBean.OrderDetailsBean>> maps; private Map<String, List<OrderBean.OrderDetailsBean>> maps;
public long getOrderId() { public long getOrderId() {
...@@ -28,12 +28,12 @@ public class AddOrderRequest { ...@@ -28,12 +28,12 @@ public class AddOrderRequest {
this.orderId = orderId; this.orderId = orderId;
} }
public long getDetailsId() { public Long getDiscountId() {
return detailsId; return discountId;
} }
public void setDetailsId(long detailsId) { public void setDiscountId(Long discountId) {
this.detailsId = detailsId; this.discountId = discountId;
} }
public Map<String, List<OrderBean.OrderDetailsBean>> getMaps() { public Map<String, List<OrderBean.OrderDetailsBean>> getMaps() {
...@@ -48,7 +48,7 @@ public class AddOrderRequest { ...@@ -48,7 +48,7 @@ public class AddOrderRequest {
public String toString() { public String toString() {
return "AddOrderRequest{" + return "AddOrderRequest{" +
"orderId=" + orderId + "orderId=" + orderId +
", detailsId=" + detailsId + ", discountId=" + discountId +
", maps=" + maps + ", maps=" + maps +
'}'; '}';
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/request/CreateOrderRequest.java
...@@ -20,7 +20,7 @@ public class CreateOrderRequest { ...@@ -20,7 +20,7 @@ public class CreateOrderRequest {
private String tableName; private String tableName;
private int restaurantId; private int restaurantId;
/**整單折扣ID*/ /**整單折扣ID*/
private long detailsId; private Long discountId;
private Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails; private Map<Long, List<OrderBean.OrderDetailsBean>> orderDetails;
public int getPerson() { public int getPerson() {
...@@ -55,12 +55,12 @@ public class CreateOrderRequest { ...@@ -55,12 +55,12 @@ public class CreateOrderRequest {
this.restaurantId = restaurantId; this.restaurantId = restaurantId;
} }
public long getDetailsId() { public Long getDiscountId() {
return detailsId; return discountId;
} }
public void setDetailsId(long detailsId) { public void setDiscountId(Long discountId) {
this.detailsId = detailsId; this.discountId = discountId;
} }
public Map<Long, List<OrderBean.OrderDetailsBean>> getOrderDetails() { public Map<Long, List<OrderBean.OrderDetailsBean>> getOrderDetails() {
...@@ -149,7 +149,7 @@ public class CreateOrderRequest { ...@@ -149,7 +149,7 @@ public class CreateOrderRequest {
", tableId=" + tableId + ", tableId=" + tableId +
", tableName='" + tableName + '\'' + ", tableName='" + tableName + '\'' +
", restaurantId=" + restaurantId + ", restaurantId=" + restaurantId +
", detailsId=" + detailsId + ", discountId=" + discountId +
", orderDetails=" + orderDetails + ", orderDetails=" + orderDetails +
'}'; '}';
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/FineItemAllPresenter.java
...@@ -105,6 +105,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode ...@@ -105,6 +105,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode
VibratorUtils.pressButtonSound(mApplication); VibratorUtils.pressButtonSound(mApplication);
if (context instanceof MealStandActivity) { if (context instanceof MealStandActivity) {
operartPage = 2; operartPage = 2;
MealStandActivity mealStandActivity = (MealStandActivity) context; MealStandActivity mealStandActivity = (MealStandActivity) context;
...@@ -123,7 +124,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode ...@@ -123,7 +124,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode
//// } //// }
//// } //// }
// } else { // } else {
initFineItemKindItemData(datasBean.getMid()); initChildFineItemItemData(datasBean.getMid());
// } // }
} else { } else {
addModifierItem(datasBean); addModifierItem(datasBean);
...@@ -184,7 +185,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode ...@@ -184,7 +185,7 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode
private void soldoutCtrlModifierItem(Context context, Modifier datasBean) { private void soldoutCtrlModifierItem(Context context, Modifier datasBean) {
//有子细项 //有子细项
if (datasBean.isParent()) { if (datasBean.isParent()) {
initFineItemKindItemData(datasBean.getMid()); initChildFineItemItemData(datasBean.getMid());
} else { } else {
//操作類型(暂停操作、恢复操作) //操作類型(暂停操作、恢复操作)
if (!isStopOpeart(datasBean)) { if (!isStopOpeart(datasBean)) {
...@@ -229,13 +230,13 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode ...@@ -229,13 +230,13 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode
return isStopOpeart; return isStopOpeart;
} }
public void initAllFineItemData(long mid) { public void initModMsgFineItemData(long mid) {
mFineItemOneLastPosition = -1; mFineItemOneLastPosition = -1;
//获取数据 //获取数据
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication); ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication);
List<Modifier> modifierList = modifierDaoUtils.queryModifierByModMsgAndVisibleQueryBuilder("1",0); List<Modifier> modifierList = modifierDaoUtils.queryModifierByModMsgAndVisibleQueryBuilder();
if (modifierList == null || modifierList.size() == 0) { if (modifierList == null || modifierList.size() == 0) {
mFineItemOneList.clear(); mFineItemOneList.clear();
...@@ -251,7 +252,51 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode ...@@ -251,7 +252,51 @@ public class FineItemAllPresenter extends BasePresenter<FineItemAllContract.Mode
mFineItemAllAdapter.notifyDataSetChanged(); mFineItemAllAdapter.notifyDataSetChanged();
} }
public void initFineItemKindItemData(long fid) { public void initModSasteFineItemKindData(long fid) {
mFineItemOneLastPosition = -1;
//获取数据
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication);
List<Modifier> modifierList = modifierDaoUtils.queryModifierByModModTasteVisibleQueryBuilder();
if (modifierList == null || modifierList.size() == 0) {
mFineItemOneList.clear();
mFineItemAllAdapter.notifyDataSetChanged();
return;
}
setFid(modifierList, fid);
mFineItemOneList.clear();
mFineItemOneList.addAll(modifierList);
mRootView.setFineItemAllRecycleSpanCount(mFineItemOneList.size());
mFineItemAllAdapter.notifyDataSetChanged();
}
public void initModCommFineItemKindData(long fid) {
mFineItemOneLastPosition = -1;
//获取数据
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication);
List<Modifier> modifierList = modifierDaoUtils.queryModifierByModModCommVisibleQueryBuilder();
if (modifierList == null || modifierList.size() == 0) {
mFineItemOneList.clear();
mFineItemAllAdapter.notifyDataSetChanged();
return;
}
setFid(modifierList, fid);
mFineItemOneList.clear();
mFineItemOneList.addAll(modifierList);
mRootView.setFineItemAllRecycleSpanCount(mFineItemOneList.size());
mFineItemAllAdapter.notifyDataSetChanged();
}
public void initChildFineItemItemData(long fid) {
//获取数据 //获取数据
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication); ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication);
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/FineItemKindPresenter.java
...@@ -238,7 +238,7 @@ public class FineItemKindPresenter extends BasePresenter<FineItemKindContract.Mo ...@@ -238,7 +238,7 @@ public class FineItemKindPresenter extends BasePresenter<FineItemKindContract.Mo
//获取数据 //获取数据
ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication); ModifierDaoUtils modifierDaoUtils = new ModifierDaoUtils(mApplication);
List<Modifier> modifierList = modifierDaoUtils.queryModifierByModModTasteVisibleQueryBuilder(1, 0); List<Modifier> modifierList = modifierDaoUtils.queryModifierByModModTasteVisibleQueryBuilder();
if (modifierList == null || modifierList.size() == 0) { if (modifierList == null || modifierList.size() == 0) {
mFineItemOneList.clear(); mFineItemOneList.clear();
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -18,13 +18,10 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean; ...@@ -18,13 +18,10 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.Function; import com.gingersoft.gsa.cloud.database.bean.Function;
import com.gingersoft.gsa.cloud.function.FunctionManager;
import com.gingersoft.gsa.cloud.function.FunctionModule;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.print.PrinterUtils; import com.gingersoft.gsa.cloud.print.PrinterUtils;
import com.gingersoft.gsa.cloud.table.app.GoldConstants;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail; import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
...@@ -490,7 +487,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -490,7 +487,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
String msg = "轉移到" + tableBean.getTableName() + "號檯?"; String msg = "轉移到" + tableBean.getTableName() + "號檯?";
Class[] parameterTypes = {TableBean.DataBean.class}; Class[] parameterTypes = {TableBean.DataBean.class};
Object[] parameters = {tableBean}; Object[] parameters = {tableBean};
CommonTipDialog.showTipAndExecuteMethodDialog(IActivity, msg, OrderContentPresenter.class, OrderContentPresenter.this, CommonTipDialog.showDoubtDialog(IActivity, msg, OrderContentPresenter.class, OrderContentPresenter.this,
"transferFood", parameterTypes, parameters); "transferFood", parameterTypes, parameters);
} else { } else {
mRootView.showMessage(tableBean.getTableName() + "號檯操作中"); mRootView.showMessage(tableBean.getTableName() + "號檯操作中");
...@@ -505,7 +502,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -505,7 +502,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
private void transferFood(TableBean.DataBean dataBean) { private void transferFood(TableBean.DataBean dataBean) {
String orderDetailsIds = getSelectFoodIds(); String orderDetailsIds = getSelectOldFoodIds();
long orderId = MyOrderManage.getInstance().getOrderId(); long orderId = MyOrderManage.getInstance().getOrderId();
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
...@@ -78,13 +78,16 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -78,13 +78,16 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
*/ */
private final int orderPayType = 0; private final int orderPayType = 0;
/**找零*/ /**
* 找零
*/
public static final int LINE_PAY_TYPE_CHANGE = 1; public static final int LINE_PAY_TYPE_CHANGE = 1;
/**貼士*/ /**
* 貼士
*/
public static final int LINE_PAY_TYPE_TIPS = 2; public static final int LINE_PAY_TYPE_TIPS = 2;
@Inject @Inject
public OrderPayPresenter(OrderPayContract.Model model, OrderPayContract.View rootView) { public OrderPayPresenter(OrderPayContract.Model model, OrderPayContract.View rootView) {
super(model, rootView); super(model, rootView);
...@@ -323,8 +326,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -323,8 +326,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
* 結賬前創建訂單或添加食品 * 結賬前創建訂單或添加食品
*/ */
public void sendOrderBefore() { public void sendOrderBefore() {
if (hasNesOrderFoods()) { if (hasNesOrderFoods() || getNesOrderDiscount() != null) {
//有食品未送單 先送單 //有食品或折扣未送單 先送單
sendOrder(false); sendOrder(false);
} else { } else {
//去結賬 //去結賬
...@@ -410,6 +413,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -410,6 +413,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
/** /**
* 獲取食品總金額 * 獲取食品總金額
*
* @return * @return
*/ */
private double getAmount() { private double getAmount() {
...@@ -418,15 +422,14 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -418,15 +422,14 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
return getBillMoney(); return getBillMoney();
} }
/** /**
* 獲取支付差額 * 獲取支付差額
* *
* @return * @return
*/ */
public double getDifferenceMoney() { public double getDifferenceMoney() {
double billMoney = getBillMoney(); double differenceMoney = MoneyUtil.sub(getTotalAmount(), getBillMoney());
return MoneyUtil.get_ItemDecimals_money(getTotalAmount() - billMoney); return MoneyUtil.get_ItemDecimals_money(differenceMoney);
} }
/** /**
...@@ -437,7 +440,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -437,7 +440,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
private double getBillMoney() { private double getBillMoney() {
double totalMoney = 0.0; double totalMoney = 0.0;
for (PayMethod method : mBillMoneyList) { for (PayMethod method : mBillMoneyList) {
totalMoney += method.getPayMoney(); totalMoney = MoneyUtil.sum(totalMoney, method.getPayMoney());
} }
return totalMoney; return totalMoney;
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -14,6 +14,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; ...@@ -14,6 +14,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration; import com.gingersoft.gsa.cloud.base.utils.CommonConfiguration;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.database.bean.Discount; import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.FoodCombo; import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
import com.gingersoft.gsa.cloud.database.bean.Function; import com.gingersoft.gsa.cloud.database.bean.Function;
...@@ -22,7 +23,6 @@ import com.gingersoft.gsa.cloud.function.FModule; ...@@ -22,7 +23,6 @@ import com.gingersoft.gsa.cloud.function.FModule;
import com.gingersoft.gsa.cloud.function.FunctionManager; import com.gingersoft.gsa.cloud.function.FunctionManager;
import com.gingersoft.gsa.cloud.function.FunctionModule; import com.gingersoft.gsa.cloud.function.FunctionModule;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.app.GoldConstants;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract; import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose; import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
...@@ -30,6 +30,7 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail; ...@@ -30,6 +30,7 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil; import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.TableActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
...@@ -207,7 +208,11 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -207,7 +208,11 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}) })
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> {
if (show && refreshLayout == null) {
mRootView.hideLoading();
}
})
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<TableBean>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<TableBean>(mErrorHandler) {
...@@ -321,7 +326,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -321,7 +326,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
OpenTableManage.getDefault().setTableBean(openTableBean); OpenTableManage.getDefault().setTableBean(openTableBean);
mRootView.startMealStandActivity(); mRootView.startMealStandActivity();
} else { } else {
mRootView.showMessage(respose.getErrMsg()); CommonTipDialog.showSurpisedDialog(IActivity,respose.getErrMsg(),null,null,null,null,null);
} }
} }
}); });
...@@ -450,7 +455,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -450,7 +455,10 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}) })
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> {
if(showMessage)
mRootView.hideLoading();
})
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseRespose>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<BaseRespose>(mErrorHandler) {
...@@ -525,7 +533,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -525,7 +533,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
public void showOperatTipDialog(TableBean.DataBean dataBean) { public void showOperatTipDialog(TableBean.DataBean dataBean) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity);
dialogBuilder.setTitle("溫馨提示"); dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
//是否合併檯 //是否合併檯
boolean isMergeTable = false; boolean isMergeTable = false;
switch (mCurrentOperatType) { switch (mCurrentOperatType) {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/AllOrderPresenter.java
...@@ -4,7 +4,6 @@ import android.app.Application; ...@@ -4,7 +4,6 @@ import android.app.Application;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.util.Log; import android.util.Log;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; import com.gingersoft.gsa.cloud.base.common.bean.OrderBean;
import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
...@@ -140,6 +139,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -140,6 +139,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
private void showCancelDialog(long orderId) { private void showCancelDialog(long orderId) {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(IActivity);
dialogBuilder.setTitle("溫馨提示"); dialogBuilder.setTitle("溫馨提示");
dialogBuilder.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
dialogBuilder.setMessage("是否取消訂單?"); dialogBuilder.setMessage("是否取消訂單?");
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss()); dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss());
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> { dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
...@@ -175,6 +175,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -175,6 +175,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
/** /**
* 獲取支付方式 * 獲取支付方式
*
* @param orderDetailItem * @param orderDetailItem
* @return * @return
*/ */
...@@ -184,12 +185,12 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -184,12 +185,12 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
payMethod.setPayName(orderDetailItem.getPayName()); payMethod.setPayName(orderDetailItem.getPayName());
payMethod.setPayMoney(orderDetailItem.getTotalAmount()); payMethod.setPayMoney(orderDetailItem.getTotalAmount());
payMethodList.add(payMethod); payMethodList.add(payMethod);
if(orderDetailItem.getTipsPrice() != 0){ if (orderDetailItem.getTipsPrice() != 0) {
//打印添加找零或貼士行 //打印添加找零或貼士行
String linePayType = orderDetailItem.getLinePayType() == 1?"找零":"貼士"; String linePayType = orderDetailItem.getLinePayType() == 1 ? "找零" : "貼士";
PayMethod payMethod2 = new PayMethod(); PayMethod payMethod2 = new PayMethod();
//這裡打印退一格 //這裡打印退一格
payMethod2.setPayName( " " + linePayType); payMethod2.setPayName(" " + linePayType);
payMethod2.setPayMoney(orderDetailItem.getTipsPrice()); payMethod2.setPayMoney(orderDetailItem.getTipsPrice());
payMethodList.add(payMethod2); payMethodList.add(payMethod2);
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/OrderCenterPresenter.java
...@@ -128,8 +128,10 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -128,8 +128,10 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
noMoreData = false; noMoreData = false;
} }
} else { } else {
if(!noMoreData){
mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null); mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null);
} }
}
} else { } else {
mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null); mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null);
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
...@@ -199,7 +199,9 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements ...@@ -199,7 +199,9 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
String tableno = ""; String tableno = "";
if (!OpenTableManage.getDefault().isSplite()) { if (!OpenTableManage.getDefault().isSplite()) {
if (OpenTableManage.getDefault().getTableBean() != null) {
tableno = OpenTableManage.getDefault().getTableBean().getTableName(); tableno = OpenTableManage.getDefault().getTableBean().getTableName();
}
} else { } else {
tableno = OpenTableManage.getDefault().getTableBean().getTableName().trim() + "-" + OpenTableManage.getDefault().getSplitNo().trim(); tableno = OpenTableManage.getDefault().getTableBean().getTableName().trim() + "-" + OpenTableManage.getDefault().getSplitNo().trim();
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
...@@ -15,9 +15,9 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage; ...@@ -15,9 +15,9 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage; import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
import com.gingersoft.gsa.cloud.base.qmui.arch.QMUIFragmentPagerAdapter; import com.gingersoft.gsa.cloud.base.qmui.arch.QMUIFragmentPagerAdapter;
import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.app.GoldConstants;
import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant; import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
import com.gingersoft.gsa.cloud.table.di.component.DaggerTableComponent; import com.gingersoft.gsa.cloud.table.di.component.DaggerTableComponent;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
......
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