Skip to content

S
supplier
Commit ce264d78 by 宁斌
Options

1、完善賬單 食品折扣 

2、新增公共細項
3、彈窗風格統一
parent 4222a1bf
Showing with 3589 additions and 2157 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>
<androidx.recyclerview.widget.RecyclerView <com.gingersoft.gsa.cloud.ui.view.WaveView
android:id="@+id/recycle_download" android:id="@+id/wave_download"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_weight="1" app:behindWaveColor="#ccc"
android:fadeScrollbars="false" app:frontWaveColor="#ffffff"
android:background="@mipmap/down_wave" app:waveShape="square" />
android:paddingTop="@dimen/dp_50"
android:listSelector="@color/theme_background_color"/> <androidx.recyclerview.widget.RecyclerView
</LinearLayout> android:id="@+id/recycle_download"
android:layout_width="match_parent"
android:layout_height="0dp"
android:fadeScrollbars="false"
android:listSelector="@color/theme_background_color"
android:paddingTop="@dimen/dp_50"
app:layout_constraintBottom_toBottomOf="parent"
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/common/bean/OrderDetail.java
package com.gingersoft.gsa.cloud.base.common.bean; package com.gingersoft.gsa.cloud.base.common.bean;
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.MoneyUtil;
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.Food; import com.gingersoft.gsa.cloud.database.bean.Food;
...@@ -10,6 +11,7 @@ import java.io.Serializable; ...@@ -10,6 +11,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
...@@ -45,7 +47,7 @@ public class OrderDetail implements Serializable { ...@@ -45,7 +47,7 @@ public class OrderDetail implements Serializable {
//折扣比例 //折扣比例
private double PERCENTAGE = 0.00; private double PERCENTAGE = 0.00;
//套餐编號 //套餐编號
private long comid ; private long comid;
//細項編號 //細項編號
private long mid; private long mid;
//修改数量前的数量 //修改数量前的数量
...@@ -161,6 +163,10 @@ public class OrderDetail implements Serializable { ...@@ -161,6 +163,10 @@ public class OrderDetail implements Serializable {
*/ */
private String majorName; private String majorName;
/** /**
* 折扣實體
*/
private Discount discount;
/**
* 状态#0:正常;1:删除; * 状态#0:正常;1:删除;
*/ */
private Byte status = STATUS_NORMAL; private Byte status = STATUS_NORMAL;
...@@ -401,6 +407,14 @@ public class OrderDetail implements Serializable { ...@@ -401,6 +407,14 @@ public class OrderDetail implements Serializable {
isComboAuto = comboAuto; isComboAuto = comboAuto;
} }
public Discount getDiscount() {
return discount;
}
public void setDiscount(Discount discount) {
this.discount = discount;
}
public void setId(long id) { public void setId(long id) {
this.id = id; this.id = id;
} }
...@@ -516,13 +530,18 @@ public class OrderDetail implements Serializable { ...@@ -516,13 +530,18 @@ public class OrderDetail implements Serializable {
/** /**
* 已送單食品轉換 * 已送單食品轉換
* *
* @param orderDetails * @param orderList
* @return * @return
*/ */
public static List<OrderDetail> orderTransOrderDetails(List<OrderBean.OrderDetailsBean> orderDetails) { public static List<OrderDetail> orderTransOrderDetails(List<OrderBean.OrderDetailsBean> orderList) {
List<OrderDetail> orderDetailList = new ArrayList<>(); List<OrderDetail> orderDetailList = new ArrayList<>();
OrderDetail parentOrderDetail = null; OrderDetail parentOrderDetail = null;
for (OrderBean.OrderDetailsBean orderDetailsBean : orderDetails) { long parentId = 0;
//每個套餐食品折扣總額
double discountAmount = 0;
//已到結尾或者下一個食品是主食品
for (int i = 0; i < orderList.size(); i++) {
OrderBean.OrderDetailsBean orderDetailsBean = orderList.get(i);
OrderDetail orderDetail = new OrderDetail(); OrderDetail orderDetail = new OrderDetail();
orderDetail.setId(orderDetailsBean.getId()); orderDetail.setId(orderDetailsBean.getId());
orderDetail.setProductId(orderDetailsBean.getProductId()); orderDetail.setProductId(orderDetailsBean.getProductId());
...@@ -539,6 +558,25 @@ public class OrderDetail implements Serializable { ...@@ -539,6 +558,25 @@ public class OrderDetail implements Serializable {
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.getItemType() == 1) {
parentId = orderDetail.getId();
discountAmount = 0;
}
if (orderDetailsBean.getRestaurantDiscountVO() != null) {
discountAmount = MoneyUtil.sum(discountAmount, orderDetail.getPrice());
//往下找
int nextIndex = i + 1;
if (orderList.size() == nextIndex || orderList.get(nextIndex).getParentId() == 0) {
//已到結尾或者下一個食品是主食品
Discount discount = getDiscountItem(orderDetailsBean.getRestaurantDiscountVO(), parentId, discountAmount);
if (discount != null) {
orderDetailList.add(discountTransOrderDetail(discount,false, parentId, discountAmount));
}
}
}
if (orderDetail.isIsfood()) { if (orderDetail.isIsfood()) {
parentOrderDetail = orderDetail; parentOrderDetail = orderDetail;
} }
...@@ -546,7 +584,18 @@ public class OrderDetail implements Serializable { ...@@ -546,7 +584,18 @@ public class OrderDetail implements Serializable {
return orderDetailList; return orderDetailList;
} }
public static int getItemType(OrderBean.OrderDetailsBean orderDetailsBean, OrderDetail parentOrderDetail) { private static Discount getDiscountItem(OrderBean.OrderDetailsBean.RestaurantDiscountVO discountBean, long parentId, double discountAmount) {
Discount discount = new Discount();
discount.setId(discountBean.getId());
discount.setDiscount_value(discountBean.getDiscountValue());
discount.setAmount(discountAmount);
discount.setType(discountBean.getType());
discount.setRemark(discountBean.getRemark());
return discount;
}
public static int getItemType(OrderBean.OrderDetailsBean orderDetailsBean, OrderDetail
parentOrderDetail) {
if (orderDetailsBean != null) { if (orderDetailsBean != null) {
if (orderDetailsBean.getParentId() == 0) { if (orderDetailsBean.getParentId() == 0) {
return 1; return 1;
...@@ -618,12 +667,13 @@ public class OrderDetail implements Serializable { ...@@ -618,12 +667,13 @@ public class OrderDetail implements Serializable {
* @param isRvMealClicked * @param isRvMealClicked
* @return * @return
*/ */
public static OrderDetail comboTransOrderDetail(ComboItem foodCombo, long id, int number, int prop, boolean isRvMealClicked) { public static OrderDetail comboTransOrderDetail(ComboItem foodCombo, long id, int number,
int prop, boolean isRvMealClicked) {
OrderDetail orderDetail = new OrderDetail(); OrderDetail orderDetail = new OrderDetail();
orderDetail.setProductName(foodCombo.getName()); orderDetail.setProductName(foodCombo.getName());
// if (foodCombo.getFid() != null) { // if (foodCombo.getFid() != null) {
// orderDetail.setTopId(foodCombo.getFid()); // orderDetail.setTopId(foodCombo.getFid());
orderDetail.setTopId(foodCombo.getComId()); orderDetail.setTopId(foodCombo.getComId());
// } // }
if (foodCombo.getComId() != null) { if (foodCombo.getComId() != null) {
orderDetail.setProductId(foodCombo.getFid()); orderDetail.setProductId(foodCombo.getFid());
...@@ -684,26 +734,98 @@ public class OrderDetail implements Serializable { ...@@ -684,26 +734,98 @@ public class OrderDetail implements Serializable {
* @param discount * @param discount
* @return * @return
*/ */
public static OrderDetail discountTransOrderDetail(Discount discount, double sourcePrice) { public static OrderDetail discountTransOrderDetail(Discount discount, boolean isNew,long id, double sourcePrice) {
double discountPrice = Discount.calculationDiscount(discount,sourcePrice); double discountPrice = Discount.calculationDiscount(discount, sourcePrice);
OrderDetail orderDetail = new OrderDetail(); OrderDetail orderDetail = new OrderDetail();
orderDetail.setProductName(discount.getRemark()); orderDetail.setProductName(discount.getRemark());
orderDetail.setTopId(discount.getId()); orderDetail.setId(discount.getId());
orderDetail.setParentId(discount.getId()); orderDetail.setTopId(id);
orderDetail.setParentId(id);
orderDetail.setProductId(discount.getId()); orderDetail.setProductId(discount.getId());
orderDetail.setNumber(1); orderDetail.setNumber(1);
orderDetail.setPrice(discountPrice); orderDetail.setPrice(discountPrice);
orderDetail.setUnit_price(discountPrice); orderDetail.setUnit_price(discountPrice);
orderDetail.setOrderId(MyOrderManage.getInstance().getOrderId()); orderDetail.setOrderId(MyOrderManage.getInstance().getOrderId());
orderDetail.setIsfood(false); orderDetail.setIsfood(false);
orderDetail.setNew(true); orderDetail.setNew(isNew);
orderDetail.setType(DISCOUNT_TYPE); orderDetail.setType(DISCOUNT_TYPE);
orderDetail.setItemType(2); orderDetail.setItemType(2);
orderDetail.setProp(DISCOUNT_PROP); orderDetail.setProp(DISCOUNT_PROP);
orderDetail.setSelected(2); orderDetail.setSelected(2);
orderDetail.setDiscount(discount);
return orderDetail; return orderDetail;
} }
/**
* 此食品是否包含折扣
*
* @param orderDetails
* @param start_position
* @param end_position
* @return
*/
public static boolean hasFoodDiscount(List<OrderDetail> orderDetails, int start_position,
int end_position) {
boolean hasDiscount = false;
if (start_position == 0 && end_position == 0) {
return hasDiscount;
}
for (int i = orderDetails.size() - 1; i >= 0; i--) {
if (start_position <= i && i <= end_position) {
OrderDetail orderDetail1 = orderDetails.get(i);
//添加折扣實體
if (orderDetail1.getType() == OrderDetail.DISCOUNT_TYPE) {
hasDiscount = true;
break;
}
}
}
return hasDiscount;
}
// public static List<OrderDetail> productNameBeanTransOrderDetail(List<OrderDetails.DataBean.PRODUCTNAMEBean> orderDetails) {
// if (orderDetails != null) {
// List<OrderDetail> orderDetailList = new ArrayList<>();
// for (OrderDetails.DataBean.PRODUCTNAMEBean bean : orderDetails) {
// OrderDetail orderData = new OrderDetail();
// orderData.setProductName(bean.getPRODUCT_NAME());
// orderData.setPrice(Double.parseDouble(Objects.requireNonNull(bean.getPRICE())));
// orderData.setNumber(Integer.parseInt(Objects.requireNonNull(bean.getNum())));
// orderData.setPrintseting(bean.getPrintseting());
// orderData.setItemType(1);
// if (bean.getChild() != null) {
// for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBeanX : bean.getChild()) {
// OrderDetail childOrderData = new OrderDetail();
// childOrderData.setProductName(childBeanX.getPRODUCT_NAME());
// childOrderData.setPrice(Double.parseDouble(Objects.requireNonNull(childBeanX.getPRICE())));
// childOrderData.setNumber(Integer.parseInt(Objects.requireNonNull(childBeanX.getNum())));
// childOrderData.setPrintseting(childBeanX.getPrintseting());
// childOrderData.setItemType(2);
// if (childBeanX.getChild() != null) {
// for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean : childBeanX.getChild()) {
// OrderDetail childOrderData2 = new OrderDetail();
// childOrderData2.setProductName(childBean.getPRODUCT_NAME());
// childOrderData2.setPrice(Double.parseDouble(Objects.requireNonNull(childBean.getPRICE())));
// childOrderData2.setNumber(Integer.parseInt(Objects.requireNonNull(childBean.getNum())));
// childOrderData2.setPrintseting(childBean.getPrintseting());
// childOrderData2.setItemType(3);
// orderDetailList.add(childOrderData2);
// }
// }
// orderDetailList.add(childOrderData);
// }
// }
// orderDetailList.add(orderData);
// }
// return orderDetailList;
// }
// return null;
// }
} }
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/bean/Food.java
...@@ -28,6 +28,277 @@ import com.gingersoft.gsa.cloud.database.greendao.FoodDao; ...@@ -28,6 +28,277 @@ import com.gingersoft.gsa.cloud.database.greendao.FoodDao;
@Entity @Entity
public class Food { public class Food {
// /**
// * ID
// */
// @Property(nameInDb = "FID")
// @Id(autoincrement = true)
// private Long id;
//
// /**
// * 上級ID (如0=最高級)
// */
// private Long parentId;
// /**
// * 商户ID
// */
// private Long restaurantId;
// /**食品ID*/
//// private Long fid;
// /**
// * 是否組別
// */
// private Byte isParent;
// /**
// * 排序
// */
// private Long seqNo;
// /**
// * 名稱1
// */
// private String foodName;
// /**
// * 食品名称1
// */
// private String foodName1;
// /**
// * 食品名称2
// */
// private String foodName2;
// /**
// * 自定義食品編號
// */
// private String plu;
// /**
// * 本地对应ID
// */
// private String posFid;
// /**
// * 描述
// */
// private String foodDesc;
// /**
// * 限制比例#0不做判断;（人数*N）
// */
// private Long limitAmount;
// /**
// * 限制类型#1:表示每次送单限制 ;2:表示整单限制
// */
// private Long limitType;
// /**
// * 餐种
// */
// private Long foodSummary;
// /**
// * 0=顯示, 1=隱藏, 2=暫停,3=只显示,不操作
// */
// private Long invisible;
// /**
// * 自動跳出細項頁
// */
// private Byte autoMod;
// /**
// * 金額
// */
// private Double price;
// /**
// * 原價 (刪除線)
// */
// private Double marketPrice;
// /**
// * 餐盒费
// */
// private Double lunchboxPrice;
// /**
// * 食品小图片
// */
// private String imgUrlSmall;
// /**
// * 食品大图片
// */
// private String imageurl;
// /**
// * ricepon显示状态，当为0的时候，取Invisible的状态:0=顯示, 1=隱藏, 2=暫停
// */
// private Long riceponInvisible;
// /**
// * 成本
// */
// private Double cost;
// /**
// * 開始日期
// */
// private Date startDate;
// /**
// * 結束日期
// */
// private Date endDate;
// /**
// * 贊
// */
// private Long like;
// /**
// * 已售
// */
// private Long totalSold;
// /**
// * 是否显示已售
// */
// private Long isSold;
// /**
// * 创建人
// */
// private String createBy;
//
// private Date createTime;
// /**
// * 更新人
// */
// private String updateBy;
// /**
// * 更新时间
// */
// private Date updateTime;
// /**
// * 時段, 請關聯到m_period_info
// */
// private Long periodId;
// /**
// * 是否参与折扣#1:可折扣
// */
// private Long ableDiscount;
// /**
// * 是否外卖#0:是;1:否
// */
// private Long takeaway;
// /**
// * 餐頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯
// */
// private Long blueEdit;
// /**
// * 購物車中是否可編輯 (加入口味) 0=隱藏購物車中食品的編輯按鈕 1=顯示按鈕
// */
// private Long cartEdit;
// /**
// * 相同項目自動合併 0=不自動合併 1=自動合併
// */
// private Long autoMerge;
// /**
// * 打印設定, 用逗號分隔, *=切紙
// */
// private String printSeting;
// /**
// * 是否打印叫号小票
// */
// private Long isPrintQueueCode;
// /**
// * 打印叫号小票对应队ID
// */
// private Long queueHeadId;
// /**
// * 是否需要經理批準
// */
// private Long approve;
// /**
// * 0=系統顏色, 1=黑色, 2=紅色
// */
// private Long printFont;
// /**
// * 自動顯示細項
// */
// private Long advPrice;
// /**
// * 當金額=0時, 是否打印在帳單上
// */
// private Long printToBill;
// /**
// * 額外食品加分
// */
// private Double pointsAdd;
// /**
// * 額外積分比率
// */
// private Long pointsRatio;
// /**
// * 換購食品所需積分
// */
// private Double pointsRedeem;
// /**
// * 是否打印主项
// */
// private Long ktPrintMainItem;
// /**
// * 是否打印价格
// */
// private Long ktShowPrice;
// /**
// * 0食品清单打印 账单打印//1食品清单不打印 账单不打印//2食品清单打印 账单不打印//3食品清单不打印 账单打印
// */
// private Long printTo;
// /**
// * 食品数量是否同步 餐台人数
// */
// private Long toPax;
// /**
// * 食品类型 0普通食品 1称重食品
// */
// private Long foodType;
// /**
// * gspos自定义表中的Id
// */
// private Long majorMainId;
// /**
// * 部门Id
// */
// private Long deptId;
// /**
// * 是否收取服務費
// */
// private Byte serviceCharge;
// /**
// * 顏色ID
// */
// private Long colorId;
// /**
// * 0:新增；1:修改；2:刪除
// */
// private Long conditions;
// /**
// * 是否同步 0：否 1：是
// */
// private Long isRt;
// /**
// * 是否删除：0正常，1删除
// */
// private Long deletes;
// /**
// * 是否時長食物 0=普通食品 1=計費食品 2=免費N小時 3=時段對沖 4=入場費食品
// */
// private Long isTimingFood;
// /**
// * 最低持續時間
// */
// private Long minLongTime;
//
// private Long unitTime;
// /**
// * 單位價格
// */
// private Double unitPrice;
// /**
// * 免費時間(小時)
// */
// private Long freeLongTime;
// /**
// * 免費開始時間
// */
// private Date freePeriodBegin;
// /**
// * 是否參與會員喜好統計 0 參與 1 不參與
// */
// private Long isStatistic;
/** /**
* ID * ID
*/ */
...@@ -38,21 +309,21 @@ public class Food { ...@@ -38,21 +309,21 @@ public class Food {
/** /**
* 上級ID (如0=最高級) * 上級ID (如0=最高級)
*/ */
private Long parentId; private long parentId;
/** /**
* 商户ID * 商户ID
*/ */
private Long restaurantId; private long restaurantId;
/**食品ID*/ /**食品ID*/
// private Long fid; // private Long fid;
/** /**
* 是否組別 * 是否組別
*/ */
private Byte isParent; private byte isParent;
/** /**
* 排序 * 排序
*/ */
private Long seqNo; private long seqNo;
/** /**
* 名稱1 * 名稱1
*/ */
...@@ -80,35 +351,35 @@ public class Food { ...@@ -80,35 +351,35 @@ public class Food {
/** /**
* 限制比例#0不做判断;（人数*N） * 限制比例#0不做判断;（人数*N）
*/ */
private Long limitAmount; private long limitAmount;
/** /**
* 限制类型#1:表示每次送单限制 ;2:表示整单限制 * 限制类型#1:表示每次送单限制 ;2:表示整单限制
*/ */
private Long limitType; private long limitType;
/** /**
* 餐种 * 餐种
*/ */
private Long foodSummary; private long foodSummary;
/** /**
* 0=顯示, 1=隱藏, 2=暫停,3=只显示,不操作 * 0=顯示, 1=隱藏, 2=暫停,3=只显示,不操作
*/ */
private Long invisible; private long invisible;
/** /**
* 自動跳出細項頁 * 自動跳出細項頁
*/ */
private Byte autoMod; private byte autoMod;
/** /**
* 金額 * 金額
*/ */
private Double price; private double price;
/** /**
* 原價 (刪除線) * 原價 (刪除線)
*/ */
private Double marketPrice; private double marketPrice;
/** /**
* 餐盒费 * 餐盒费
*/ */
private Double lunchboxPrice; private double lunchboxPrice;
/** /**
* 食品小图片 * 食品小图片
*/ */
...@@ -120,11 +391,11 @@ public class Food { ...@@ -120,11 +391,11 @@ public class Food {
/** /**
* ricepon显示状态，当为0的时候，取Invisible的状态:0=顯示, 1=隱藏, 2=暫停 * ricepon显示状态，当为0的时候，取Invisible的状态:0=顯示, 1=隱藏, 2=暫停
*/ */
private Long riceponInvisible; private long riceponInvisible;
/** /**
* 成本 * 成本
*/ */
private Double cost; private double cost;
/** /**
* 開始日期 * 開始日期
*/ */
...@@ -136,15 +407,15 @@ public class Food { ...@@ -136,15 +407,15 @@ public class Food {
/** /**
* 贊 * 贊
*/ */
private Long like; private long like;
/** /**
* 已售 * 已售
*/ */
private Long totalSold; private long totalSold;
/** /**
* 是否显示已售 * 是否显示已售
*/ */
private Long isSold; private long isSold;
/** /**
* 创建人 * 创建人
*/ */
...@@ -162,27 +433,27 @@ public class Food { ...@@ -162,27 +433,27 @@ public class Food {
/** /**
* 時段, 請關聯到m_period_info * 時段, 請關聯到m_period_info
*/ */
private Long periodId; private long periodId;
/** /**
* 是否参与折扣#1:可折扣 * 是否参与折扣#1:可折扣
*/ */
private Long ableDiscount; private long ableDiscount;
/** /**
* 是否外卖#0:是;1:否 * 是否外卖#0:是;1:否
*/ */
private Long takeaway; private long takeaway;
/** /**
* 餐頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯 * 餐頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯
*/ */
private Long blueEdit; private long blueEdit;
/** /**
* 購物車中是否可編輯 (加入口味) 0=隱藏購物車中食品的編輯按鈕 1=顯示按鈕 * 購物車中是否可編輯 (加入口味) 0=隱藏購物車中食品的編輯按鈕 1=顯示按鈕
*/ */
private Long cartEdit; private long cartEdit;
/** /**
* 相同項目自動合併 0=不自動合併 1=自動合併 * 相同項目自動合併 0=不自動合併 1=自動合併
*/ */
private Long autoMerge; private long autoMerge;
/** /**
* 打印設定, 用逗號分隔, *=切紙 * 打印設定, 用逗號分隔, *=切紙
*/ */
...@@ -190,105 +461,105 @@ public class Food { ...@@ -190,105 +461,105 @@ public class Food {
/** /**
* 是否打印叫号小票 * 是否打印叫号小票
*/ */
private Long isPrintQueueCode; private long isPrintQueueCode;
/** /**
* 打印叫号小票对应队ID * 打印叫号小票对应队ID
*/ */
private Long queueHeadId; private long queueHeadId;
/** /**
* 是否需要經理批準 * 是否需要經理批準
*/ */
private Long approve; private long approve;
/** /**
* 0=系統顏色, 1=黑色, 2=紅色 * 0=系統顏色, 1=黑色, 2=紅色
*/ */
private Long printFont; private long printFont;
/** /**
* 自動顯示細項 * 自動顯示細項
*/ */
private Long advPrice; private long advPrice;
/** /**
* 當金額=0時, 是否打印在帳單上 * 當金額=0時, 是否打印在帳單上
*/ */
private Long printToBill; private long printToBill;
/** /**
* 額外食品加分 * 額外食品加分
*/ */
private Double pointsAdd; private double pointsAdd;
/** /**
* 額外積分比率 * 額外積分比率
*/ */
private Long pointsRatio; private long pointsRatio;
/** /**
* 換購食品所需積分 * 換購食品所需積分
*/ */
private Double pointsRedeem; private double pointsRedeem;
/** /**
* 是否打印主项 * 是否打印主项
*/ */
private Long ktPrintMainItem; private long ktPrintMainItem;
/** /**
* 是否打印价格 * 是否打印价格
*/ */
private Long ktShowPrice; private long ktShowPrice;
/** /**
* 0食品清单打印 账单打印//1食品清单不打印 账单不打印//2食品清单打印 账单不打印//3食品清单不打印 账单打印 * 0食品清单打印 账单打印//1食品清单不打印 账单不打印//2食品清单打印 账单不打印//3食品清单不打印 账单打印
*/ */
private Long printTo; private long printTo;
/** /**
* 食品数量是否同步 餐台人数 * 食品数量是否同步 餐台人数
*/ */
private Long toPax; private long toPax;
/** /**
* 食品类型 0普通食品 1称重食品 * 食品类型 0普通食品 1称重食品
*/ */
private Long foodType; private long foodType;
/** /**
* gspos自定义表中的Id * gspos自定义表中的Id
*/ */
private Long majorMainId; private long majorMainId;
/** /**
* 部门Id * 部门Id
*/ */
private Long deptId; private long deptId;
/** /**
* 是否收取服務費 * 是否收取服務費
*/ */
private Byte serviceCharge; private byte serviceCharge;
/** /**
* 顏色ID * 顏色ID
*/ */
private Long colorId; private long colorId;
/** /**
* 0:新增；1:修改；2:刪除 * 0:新增；1:修改；2:刪除
*/ */
private Long conditions; private long conditions;
/** /**
* 是否同步 0：否 1：是 * 是否同步 0：否 1：是
*/ */
private Long isRt; private long isRt;
/** /**
* 是否删除：0正常，1删除 * 是否删除：0正常，1删除
*/ */
private Long deletes; private long deletes;
/** /**
* 是否時長食物 0=普通食品 1=計費食品 2=免費N小時 3=時段對沖 4=入場費食品 * 是否時長食物 0=普通食品 1=計費食品 2=免費N小時 3=時段對沖 4=入場費食品
*/ */
private Long isTimingFood; private long isTimingFood;
/** /**
* 最低持續時間 * 最低持續時間
*/ */
private Long minLongTime; private long minLongTime;
private Long unitTime; private long unitTime;
/** /**
* 單位價格 * 單位價格
*/ */
private Double unitPrice; private double unitPrice;
/** /**
* 免費時間(小時) * 免費時間(小時)
*/ */
private Long freeLongTime; private long freeLongTime;
/** /**
* 免費開始時間 * 免費開始時間
*/ */
...@@ -296,7 +567,7 @@ public class Food { ...@@ -296,7 +567,7 @@ public class Food {
/** /**
* 是否參與會員喜好統計 0 參與 1 不參與 * 是否參與會員喜好統計 0 參與 1 不參與
*/ */
private Long isStatistic; private long isStatistic;
/** /**
* 自定義字段 * 自定義字段
...@@ -325,25 +596,25 @@ public class Food { ...@@ -325,25 +596,25 @@ public class Food {
private boolean isComboFood = false; private boolean isComboFood = false;
@Generated(hash = 1640870418) @Generated(hash = 972927256)
public Food(Long id, Long parentId, Long restaurantId, Byte isParent, public Food(Long id, long parentId, long restaurantId, byte isParent,
Long seqNo, String foodName, String foodName1, String foodName2, long seqNo, String foodName, String foodName1, String foodName2,
String plu, String posFid, String foodDesc, Long limitAmount, String plu, String posFid, String foodDesc, long limitAmount,
Long limitType, Long foodSummary, Long invisible, Byte autoMod, long limitType, long foodSummary, long invisible, byte autoMod,
Double price, Double marketPrice, Double lunchboxPrice, double price, double marketPrice, double lunchboxPrice,
String imgUrlSmall, String imageurl, Long riceponInvisible, Double cost, String imgUrlSmall, String imageurl, long riceponInvisible, double cost,
Date startDate, Date endDate, Long like, Long totalSold, Long isSold, Date startDate, Date endDate, long like, long totalSold, long isSold,
String createBy, Date createTime, String updateBy, Date updateTime, String createBy, Date createTime, String updateBy, Date updateTime,
Long periodId, Long ableDiscount, Long takeaway, Long blueEdit, long periodId, long ableDiscount, long takeaway, long blueEdit,
Long cartEdit, Long autoMerge, String printSeting, long cartEdit, long autoMerge, String printSeting,
Long isPrintQueueCode, Long queueHeadId, Long approve, Long printFont, long isPrintQueueCode, long queueHeadId, long approve, long printFont,
Long advPrice, Long printToBill, Double pointsAdd, Long pointsRatio, long advPrice, long printToBill, double pointsAdd, long pointsRatio,
Double pointsRedeem, Long ktPrintMainItem, Long ktShowPrice, double pointsRedeem, long ktPrintMainItem, long ktShowPrice,
Long printTo, Long toPax, Long foodType, Long majorMainId, Long deptId, long printTo, long toPax, long foodType, long majorMainId, long deptId,
Byte serviceCharge, Long colorId, Long conditions, Long isRt, byte serviceCharge, long colorId, long conditions, long isRt,
Long deletes, Long isTimingFood, Long minLongTime, Long unitTime, long deletes, long isTimingFood, long minLongTime, long unitTime,
Double unitPrice, Long freeLongTime, Date freePeriodBegin, double unitPrice, long freeLongTime, Date freePeriodBegin,
Long isStatistic) { long isStatistic) {
this.id = id; this.id = id;
this.parentId = parentId; this.parentId = parentId;
this.restaurantId = restaurantId; this.restaurantId = restaurantId;
...@@ -1010,4 +1281,208 @@ public class Food { ...@@ -1010,4 +1281,208 @@ public class Food {
isComboFood = comboFood; isComboFood = comboFood;
} }
public void setId(long id) {
this.id = id;
}
public void setParentId(long parentId) {
this.parentId = parentId;
}
public void setRestaurantId(long restaurantId) {
this.restaurantId = restaurantId;
}
public void setIsParent(byte isParent) {
this.isParent = isParent;
}
public void setSeqNo(long seqNo) {
this.seqNo = seqNo;
}
public void setLimitAmount(long limitAmount) {
this.limitAmount = limitAmount;
}
public void setLimitType(long limitType) {
this.limitType = limitType;
}
public void setFoodSummary(long foodSummary) {
this.foodSummary = foodSummary;
}
public void setInvisible(long invisible) {
this.invisible = invisible;
}
public void setAutoMod(byte autoMod) {
this.autoMod = autoMod;
}
public void setPrice(double price) {
this.price = price;
}
public void setMarketPrice(double marketPrice) {
this.marketPrice = marketPrice;
}
public void setLunchboxPrice(double lunchboxPrice) {
this.lunchboxPrice = lunchboxPrice;
}
public void setRiceponInvisible(long riceponInvisible) {
this.riceponInvisible = riceponInvisible;
}
public void setCost(double cost) {
this.cost = cost;
}
public void setLike(long like) {
this.like = like;
}
public void setTotalSold(long totalSold) {
this.totalSold = totalSold;
}
public void setIsSold(long isSold) {
this.isSold = isSold;
}
public void setPeriodId(long periodId) {
this.periodId = periodId;
}
public void setAbleDiscount(long ableDiscount) {
this.ableDiscount = ableDiscount;
}
public void setTakeaway(long takeaway) {
this.takeaway = takeaway;
}
public void setBlueEdit(long blueEdit) {
this.blueEdit = blueEdit;
}
public void setCartEdit(long cartEdit) {
this.cartEdit = cartEdit;
}
public void setAutoMerge(long autoMerge) {
this.autoMerge = autoMerge;
}
public void setIsPrintQueueCode(long isPrintQueueCode) {
this.isPrintQueueCode = isPrintQueueCode;
}
public void setQueueHeadId(long queueHeadId) {
this.queueHeadId = queueHeadId;
}
public void setApprove(long approve) {
this.approve = approve;
}
public void setPrintFont(long printFont) {
this.printFont = printFont;
}
public void setAdvPrice(long advPrice) {
this.advPrice = advPrice;
}
public void setPrintToBill(long printToBill) {
this.printToBill = printToBill;
}
public void setPointsAdd(double pointsAdd) {
this.pointsAdd = pointsAdd;
}
public void setPointsRatio(long pointsRatio) {
this.pointsRatio = pointsRatio;
}
public void setPointsRedeem(double pointsRedeem) {
this.pointsRedeem = pointsRedeem;
}
public void setKtPrintMainItem(long ktPrintMainItem) {
this.ktPrintMainItem = ktPrintMainItem;
}
public void setKtShowPrice(long ktShowPrice) {
this.ktShowPrice = ktShowPrice;
}
public void setPrintTo(long printTo) {
this.printTo = printTo;
}
public void setToPax(long toPax) {
this.toPax = toPax;
}
public void setFoodType(long foodType) {
this.foodType = foodType;
}
public void setMajorMainId(long majorMainId) {
this.majorMainId = majorMainId;
}
public void setDeptId(long deptId) {
this.deptId = deptId;
}
public void setServiceCharge(byte serviceCharge) {
this.serviceCharge = serviceCharge;
}
public void setColorId(long colorId) {
this.colorId = colorId;
}
public void setConditions(long conditions) {
this.conditions = conditions;
}
public void setIsRt(long isRt) {
this.isRt = isRt;
}
public void setDeletes(long deletes) {
this.deletes = deletes;
}
public void setIsTimingFood(long isTimingFood) {
this.isTimingFood = isTimingFood;
}
public void setMinLongTime(long minLongTime) {
this.minLongTime = minLongTime;
}
public void setUnitTime(long unitTime) {
this.unitTime = unitTime;
}
public void setUnitPrice(double unitPrice) {
this.unitPrice = unitPrice;
}
public void setFreeLongTime(long freeLongTime) {
this.freeLongTime = freeLongTime;
}
public void setIsStatistic(long isStatistic) {
this.isStatistic = isStatistic;
}
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/database/bean/Modifier.java
...@@ -21,31 +21,214 @@ import java.util.Date; ...@@ -21,31 +21,214 @@ import java.util.Date;
@Entity @Entity
public class Modifier { public class Modifier {
// @Property(nameInDb = "_id")
// @Id(autoincrement = true)
// private Long dbid;
//
// private Long mid;
// /**
// * 食品分类ID
// */
// private Long topId;
//
// private Long restaurantId;
//
// private String modifierName;
//
// private Long seqNo;
//
// private Double marketPrice;
//
// private Double price;
// /**
// * 餐盒费
// */
// private Double lunchboxPrice;
//
// private Long colorId;
// /**
// * 圖片
// */
// private String imageUrl;
// /**
// * 0=顯示, 1=隱藏, 2=暫停
// */
// private Long invisible;
// /**
// * 成本
// */
// private Double cost;
// /**
// * 開始日期
// */
// private Date startDate;
// /**
// * 結束日期
// */
// private Date endDate;
// /**
// * 贊
// */
// private Long like;
// /**
// * 已售
// */
// private Long totalSold;
// /**
// * gspos自定义表中的Id
// */
// private Long majorMainId;
// /**
// * 報表部門分組
// */
// private Long deptId;
// /**
// * 创建人
// */
// private String createBy;
// /**
// * 创建时间
// */
// private Date createTime;
// /**
// * 更新人
// */
// private String updateBy;
// /**
// * 更新时间
// */
// private Date updateTime;
// /**
// * 本地对应ID
// */
// private String posFid;
// /**
// * 父级ID
// */
// private String pId;
// /**
// * 細項下有細項時, 是否自動打開細項 0=不開開 1=打開
// */
// private Long autoMod;
// /**
// * 頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯
// */
// private Long blueEdit;
// /**
// * 相同項目自動合併 0=不自動合併 1=自動合併
// */
// private Long autoMerge;
// /**
// * 自定義細項 (如細項有下一層, 當層的自定義細項會失效) 0=否 1=是
// */
// private Long customMsg;
// /**
// * 是否組別 1 为组别
// */
// private Long isParent;
// /**
// * 食品名称1
// */
// private String modifierName1;
// /**
// * 食品名称2
// */
// private String modifierName2;
// /**
// * 金額=-994時, 取這個數值乘主項金額
// */
// private Double multiple;
// /**
// * 打印設定
// */
// private String printSet;
// /**
// * 廚房打印設定
// */
// private String ktSetting;
// /**
// * 多選
// */
// private Long modComm;
// /**
// * 口味
// */
// private Long modTaste;
// /**
// * 訊息
// */
// private Long modMsg;
// /**
// * TRUE=追單, FALSE=不處理
// */
// private Long ktFireCourse;
// /**
// * 是否参与折扣#1:可折扣
// */
// private Long ableDisCount;
// /**
// * 打印到帳單
// */
// private Long printToBill;
// /**
// * 廚房單打印主項
// */
// private Long ktPrintMainItem;
// /**
// * 廚房單顯示單價
// */
// private Long ktShowPrice;
// /**
// * 廚房打印顏色
// */
// private Long ktFont;
// /**
// * 0:新增；1：修改：2刪除
// */
// private Long conditions;
// /**
// * 是否同步 0：否 1：是
// */
// private Long isRt;
// /**
// * 隱藏
// */
// private Byte visible;
// /**
// * 是否删除：0正常，1删除
// */
// private Long deletes;
// /**
// * 是否參與會員喜好統計 0 參與 1 不參與
// */
// private Long isStatistic;
@Property(nameInDb = "_id") @Property(nameInDb = "_id")
@Id(autoincrement = true) @Id(autoincrement = true)
private Long dbid; private Long dbid;
private Long mid; private long mid;
/** /**
* 食品分类ID * 食品分类ID
*/ */
private Long topId; private long topId;
private Long restaurantId; private long restaurantId;
private String modifierName; private String modifierName;
private Long seqNo; private long seqNo;
private double marketPrice;
private Double marketPrice; private double price;
private Double price;
/** /**
* 餐盒费 * 餐盒费
*/ */
private Double lunchboxPrice; private double lunchboxPrice;
private Long colorId; private long colorId;
/** /**
* 圖片 * 圖片
*/ */
...@@ -53,11 +236,11 @@ public class Modifier { ...@@ -53,11 +236,11 @@ public class Modifier {
/** /**
* 0=顯示, 1=隱藏, 2=暫停 * 0=顯示, 1=隱藏, 2=暫停
*/ */
private Long invisible; private long invisible;
/** /**
* 成本 * 成本
*/ */
private Double cost; private double cost;
/** /**
* 開始日期 * 開始日期
*/ */
...@@ -69,19 +252,19 @@ public class Modifier { ...@@ -69,19 +252,19 @@ public class Modifier {
/** /**
* 贊 * 贊
*/ */
private Long like; private long like;
/** /**
* 已售 * 已售
*/ */
private Long totalSold; private long totalSold;
/** /**
* gspos自定义表中的Id * gspos自定义表中的Id
*/ */
private Long majorMainId; private long majorMainId;
/** /**
* 報表部門分組 * 報表部門分組
*/ */
private Long deptId; private long deptId;
/** /**
* 创建人 * 创建人
*/ */
...@@ -109,23 +292,23 @@ public class Modifier { ...@@ -109,23 +292,23 @@ public class Modifier {
/** /**
* 細項下有細項時, 是否自動打開細項 0=不開開 1=打開 * 細項下有細項時, 是否自動打開細項 0=不開開 1=打開
*/ */
private Long autoMod; private long autoMod;
/** /**
* 頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯 * 頁面中藍色按鈕有沒有編輯按鈕 (筆的圖按) 0=不可編輯 1=可編輯
*/ */
private Long blueEdit; private long blueEdit;
/** /**
* 相同項目自動合併 0=不自動合併 1=自動合併 * 相同項目自動合併 0=不自動合併 1=自動合併
*/ */
private Long autoMerge; private long autoMerge;
/** /**
* 自定義細項 (如細項有下一層, 當層的自定義細項會失效) 0=否 1=是 * 自定義細項 (如細項有下一層, 當層的自定義細項會失效) 0=否 1=是
*/ */
private Long customMsg; private long customMsg;
/** /**
* 是否組別 1 为组别 * 是否組別 1 为组别
*/ */
private Long isParent; private long isParent;
/** /**
* 食品名称1 * 食品名称1
*/ */
...@@ -137,7 +320,7 @@ public class Modifier { ...@@ -137,7 +320,7 @@ public class Modifier {
/** /**
* 金額=-994時, 取這個數值乘主項金額 * 金額=-994時, 取這個數值乘主項金額
*/ */
private Double multiple; private double multiple;
/** /**
* 打印設定 * 打印設定
*/ */
...@@ -149,60 +332,59 @@ public class Modifier { ...@@ -149,60 +332,59 @@ public class Modifier {
/** /**
* 多選 * 多選
*/ */
private Long modComm; private long modComm;
/** /**
* 口味 * 口味
*/ */
private Long modTaste; private long modTaste;
/** /**
* 訊息 * 訊息
*/ */
private Long modMsg; private long modMsg;
/** /**
* TRUE=追單, FALSE=不處理 * TRUE=追單, FALSE=不處理
*/ */
private Long ktFireCourse; private long ktFireCourse;
/** /**
* 是否参与折扣#1:可折扣 * 是否参与折扣#1:可折扣
*/ */
private Long ableDisCount; private long ableDisCount;
/** /**
* 打印到帳單 * 打印到帳單
*/ */
private Long printToBill; private long printToBill;
/** /**
* 廚房單打印主項 * 廚房單打印主項
*/ */
private Long ktPrintMainItem; private long ktPrintMainItem;
/** /**
* 廚房單顯示單價 * 廚房單顯示單價
*/ */
private Long ktShowPrice; private long ktShowPrice;
/** /**
* 廚房打印顏色 * 廚房打印顏色
*/ */
private Long ktFont; private long ktFont;
/** /**
* 0:新增；1：修改：2刪除 * 0:新增；1：修改：2刪除
*/ */
private Long conditions; private long conditions;
/** /**
* 是否同步 0：否 1：是 * 是否同步 0：否 1：是
*/ */
private Long isRt; private long isRt;
/** /**
* 隱藏 * 隱藏
*/ */
private Byte visible; private byte visible;
/** /**
* 是否删除：0正常，1删除 * 是否删除：0正常，1删除
*/ */
private Long deletes; private long deletes;
/** /**
* 是否參與會員喜好統計 0 參與 1 不參與 * 是否參與會員喜好統計 0 參與 1 不參與
*/ */
private Long isStatistic; private long isStatistic;
/** /**
* 自定義字段 * 自定義字段
...@@ -227,7 +409,9 @@ public class Modifier { ...@@ -227,7 +409,9 @@ public class Modifier {
@Transient @Transient
/**最小選中數*/ /**最小選中數*/
private int minNumber = 1; private int minNumber = 1;
/**默認選中數*/ /**
* 默認選中數
*/
@Transient @Transient
private String defmodifier = "0"; private String defmodifier = "0";
@Transient @Transient
...@@ -239,20 +423,27 @@ public class Modifier { ...@@ -239,20 +423,27 @@ public class Modifier {
@Generated(hash = 869528398) @Generated(hash = 385685553)
public Modifier(Long dbid, Long mid, Long topId, Long restaurantId, public Modifier() {
String modifierName, Long seqNo, Double marketPrice, Double price, }
Double lunchboxPrice, Long colorId, String imageUrl, Long invisible,
Double cost, Date startDate, Date endDate, Long like, Long totalSold,
Long majorMainId, Long deptId, String createBy, Date createTime,
@Generated(hash = 1490458360)
public Modifier(Long dbid, long mid, long topId, long restaurantId,
String modifierName, long seqNo, double marketPrice, double price,
double lunchboxPrice, long colorId, String imageUrl, long invisible,
double cost, Date startDate, Date endDate, long like, long totalSold,
long majorMainId, long deptId, String createBy, Date createTime,
String updateBy, Date updateTime, String posFid, String pId, String updateBy, Date updateTime, String posFid, String pId,
Long autoMod, Long blueEdit, Long autoMerge, Long customMsg, long autoMod, long blueEdit, long autoMerge, long customMsg,
Long isParent, String modifierName1, String modifierName2, long isParent, String modifierName1, String modifierName2,
Double multiple, String printSet, String ktSetting, Long modComm, double multiple, String printSet, String ktSetting, long modComm,
Long modTaste, Long modMsg, Long ktFireCourse, Long ableDisCount, long modTaste, long modMsg, long ktFireCourse, long ableDisCount,
Long printToBill, Long ktPrintMainItem, Long ktShowPrice, Long ktFont, long printToBill, long ktPrintMainItem, long ktShowPrice, long ktFont,
Long conditions, Long isRt, Byte visible, Long deletes, long conditions, long isRt, byte visible, long deletes,
Long isStatistic) { long isStatistic) {
this.dbid = dbid; this.dbid = dbid;
this.mid = mid; this.mid = mid;
this.topId = topId; this.topId = topId;
...@@ -304,9 +495,6 @@ public class Modifier { ...@@ -304,9 +495,6 @@ public class Modifier {
this.isStatistic = isStatistic; this.isStatistic = isStatistic;
} }
@Generated(hash = 385685553)
public Modifier() {
}
...@@ -789,4 +977,144 @@ public class Modifier { ...@@ -789,4 +977,144 @@ public class Modifier {
this.defmodifier = defmodifier; this.defmodifier = defmodifier;
} }
public void setDbid(long dbid) {
this.dbid = dbid;
}
public void setMid(long mid) {
this.mid = mid;
}
public void setTopId(long topId) {
this.topId = topId;
}
public void setRestaurantId(long restaurantId) {
this.restaurantId = restaurantId;
}
public void setSeqNo(long seqNo) {
this.seqNo = seqNo;
}
public void setMarketPrice(double marketPrice) {
this.marketPrice = marketPrice;
}
public void setPrice(double price) {
this.price = price;
}
public void setLunchboxPrice(double lunchboxPrice) {
this.lunchboxPrice = lunchboxPrice;
}
public void setColorId(long colorId) {
this.colorId = colorId;
}
public void setInvisible(long invisible) {
this.invisible = invisible;
}
public void setCost(double cost) {
this.cost = cost;
}
public void setLike(long like) {
this.like = like;
}
public void setTotalSold(long totalSold) {
this.totalSold = totalSold;
}
public void setMajorMainId(long majorMainId) {
this.majorMainId = majorMainId;
}
public void setDeptId(long deptId) {
this.deptId = deptId;
}
public void setAutoMod(long autoMod) {
this.autoMod = autoMod;
}
public void setBlueEdit(long blueEdit) {
this.blueEdit = blueEdit;
}
public void setAutoMerge(long autoMerge) {
this.autoMerge = autoMerge;
}
public void setCustomMsg(long customMsg) {
this.customMsg = customMsg;
}
public void setIsParent(long isParent) {
this.isParent = isParent;
}
public void setMultiple(double multiple) {
this.multiple = multiple;
}
public void setModComm(long modComm) {
this.modComm = modComm;
}
public void setModTaste(long modTaste) {
this.modTaste = modTaste;
}
public void setModMsg(long modMsg) {
this.modMsg = modMsg;
}
public void setKtFireCourse(long ktFireCourse) {
this.ktFireCourse = ktFireCourse;
}
public void setAbleDisCount(long ableDisCount) {
this.ableDisCount = ableDisCount;
}
public void setPrintToBill(long printToBill) {
this.printToBill = printToBill;
}
public void setKtPrintMainItem(long ktPrintMainItem) {
this.ktPrintMainItem = ktPrintMainItem;
}
public void setKtShowPrice(long ktShowPrice) {
this.ktShowPrice = ktShowPrice;
}
public void setKtFont(long ktFont) {
this.ktFont = ktFont;
}
public void setConditions(long conditions) {
this.conditions = conditions;
}
public void setIsRt(long isRt) {
this.isRt = isRt;
}
public void setVisible(byte visible) {
this.visible = visible;
}
public void setDeletes(long deletes) {
this.deletes = deletes;
}
public void setIsStatistic(long isStatistic) {
this.isStatistic = isStatistic;
}
} }
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ComboItemDao.java
...@@ -25,21 +25,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -25,21 +25,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, 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 ComId = new Property(1, Long.class, "comId", false, "COM_ID"); public final static Property ComId = new Property(1, long.class, "comId", false, "COM_ID");
public final static Property Fid = new Property(2, Long.class, "fid", false, "FID"); public final static Property Fid = new Property(2, long.class, "fid", false, "FID");
public final static Property Qty = new Property(3, Long.class, "qty", false, "QTY"); public final static Property Qty = new Property(3, long.class, "qty", false, "QTY");
public final static Property DiffAmt = new Property(4, Double.class, "diffAmt", false, "DIFF_AMT"); public final static Property DiffAmt = new Property(4, double.class, "diffAmt", false, "DIFF_AMT");
public final static Property SeqNo = new Property(5, Long.class, "seqNo", false, "SEQ_NO"); public final static Property SeqNo = new Property(5, long.class, "seqNo", false, "SEQ_NO");
public final static Property Visible = new Property(6, Long.class, "visible", false, "VISIBLE"); public final static Property Visible = new Property(6, long.class, "visible", false, "VISIBLE");
public final static Property CreateTime = new Property(7, java.util.Date.class, "createTime", false, "CREATE_TIME"); public final static Property CreateTime = new Property(7, java.util.Date.class, "createTime", false, "CREATE_TIME");
public final static Property CreateBy = new Property(8, String.class, "createBy", false, "CREATE_BY"); public final static Property CreateBy = new Property(8, String.class, "createBy", false, "CREATE_BY");
public final static Property UpdateTime = new Property(9, java.util.Date.class, "updateTime", false, "UPDATE_TIME"); public final static Property UpdateTime = new Property(9, java.util.Date.class, "updateTime", false, "UPDATE_TIME");
public final static Property Conditions = new Property(10, Long.class, "conditions", false, "CONDITIONS"); public final static Property Conditions = new Property(10, long.class, "conditions", false, "CONDITIONS");
public final static Property IsRT = new Property(11, Long.class, "isRT", false, "IS_RT"); public final static Property IsRT = new Property(11, long.class, "isRT", false, "IS_RT");
public final static Property Deletes = new Property(12, Byte.class, "deletes", false, "DELETES"); public final static Property Deletes = new Property(12, byte.class, "deletes", false, "DELETES");
public final static Property PosId = new Property(13, Long.class, "posId", false, "POS_ID"); public final static Property PosId = new Property(13, long.class, "posId", false, "POS_ID");
public final static Property Restaurant_id = new Property(14, Long.class, "restaurant_id", false, "RESTAURANT_ID"); public final static Property Restaurant_id = new Property(14, long.class, "restaurant_id", false, "RESTAURANT_ID");
public final static Property IsMainAccount = new Property(15, Byte.class, "isMainAccount", false, "IS_MAIN_ACCOUNT"); public final static Property IsMainAccount = new Property(15, byte.class, "isMainAccount", false, "IS_MAIN_ACCOUNT");
} }
...@@ -56,21 +56,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -56,21 +56,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
String constraint = ifNotExists? "IF NOT EXISTS ": ""; String constraint = ifNotExists? "IF NOT EXISTS ": "";
db.execSQL("CREATE TABLE " + constraint + "\"COMBO_ITEM\" (" + // db.execSQL("CREATE TABLE " + constraint + "\"COMBO_ITEM\" (" + //
"\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
"\"COM_ID\" INTEGER," + // 1: comId "\"COM_ID\" INTEGER NOT NULL ," + // 1: comId
"\"FID\" INTEGER," + // 2: fid "\"FID\" INTEGER NOT NULL ," + // 2: fid
"\"QTY\" INTEGER," + // 3: qty "\"QTY\" INTEGER NOT NULL ," + // 3: qty
"\"DIFF_AMT\" REAL," + // 4: diffAmt "\"DIFF_AMT\" REAL NOT NULL ," + // 4: diffAmt
"\"SEQ_NO\" INTEGER," + // 5: seqNo "\"SEQ_NO\" INTEGER NOT NULL ," + // 5: seqNo
"\"VISIBLE\" INTEGER," + // 6: visible "\"VISIBLE\" INTEGER NOT NULL ," + // 6: visible
"\"CREATE_TIME\" INTEGER," + // 7: createTime "\"CREATE_TIME\" INTEGER," + // 7: createTime
"\"CREATE_BY\" TEXT," + // 8: createBy "\"CREATE_BY\" TEXT," + // 8: createBy
"\"UPDATE_TIME\" INTEGER," + // 9: updateTime "\"UPDATE_TIME\" INTEGER," + // 9: updateTime
"\"CONDITIONS\" INTEGER," + // 10: conditions "\"CONDITIONS\" INTEGER NOT NULL ," + // 10: conditions
"\"IS_RT\" INTEGER," + // 11: isRT "\"IS_RT\" INTEGER NOT NULL ," + // 11: isRT
"\"DELETES\" INTEGER," + // 12: deletes "\"DELETES\" INTEGER NOT NULL ," + // 12: deletes
"\"POS_ID\" INTEGER," + // 13: posId "\"POS_ID\" INTEGER NOT NULL ," + // 13: posId
"\"RESTAURANT_ID\" INTEGER," + // 14: restaurant_id "\"RESTAURANT_ID\" INTEGER NOT NULL ," + // 14: restaurant_id
"\"IS_MAIN_ACCOUNT\" INTEGER);"); // 15: isMainAccount "\"IS_MAIN_ACCOUNT\" INTEGER NOT NULL );"); // 15: isMainAccount
} }
/** Drops the underlying database table. */ /** Drops the underlying database table. */
...@@ -87,36 +87,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -87,36 +87,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getComId());
Long comId = entity.getComId(); stmt.bindLong(3, entity.getFid());
if (comId != null) { stmt.bindLong(4, entity.getQty());
stmt.bindLong(2, comId); stmt.bindDouble(5, entity.getDiffAmt());
} stmt.bindLong(6, entity.getSeqNo());
stmt.bindLong(7, entity.getVisible());
Long fid = entity.getFid();
if (fid != null) {
stmt.bindLong(3, fid);
}
Long qty = entity.getQty();
if (qty != null) {
stmt.bindLong(4, qty);
}
Double diffAmt = entity.getDiffAmt();
if (diffAmt != null) {
stmt.bindDouble(5, diffAmt);
}
Long seqNo = entity.getSeqNo();
if (seqNo != null) {
stmt.bindLong(6, seqNo);
}
Long visible = entity.getVisible();
if (visible != null) {
stmt.bindLong(7, visible);
}
java.util.Date createTime = entity.getCreateTime(); java.util.Date createTime = entity.getCreateTime();
if (createTime != null) { if (createTime != null) {
...@@ -132,36 +108,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -132,36 +108,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
if (updateTime != null) { if (updateTime != null) {
stmt.bindLong(10, updateTime.getTime()); stmt.bindLong(10, updateTime.getTime());
} }
stmt.bindLong(11, entity.getConditions());
Long conditions = entity.getConditions(); stmt.bindLong(12, entity.getIsRT());
if (conditions != null) { stmt.bindLong(13, entity.getDeletes());
stmt.bindLong(11, conditions); stmt.bindLong(14, entity.getPosId());
} stmt.bindLong(15, entity.getRestaurant_id());
stmt.bindLong(16, entity.getIsMainAccount());
Long isRT = entity.getIsRT();
if (isRT != null) {
stmt.bindLong(12, isRT);
}
Byte deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(13, deletes);
}
Long posId = entity.getPosId();
if (posId != null) {
stmt.bindLong(14, posId);
}
Long restaurant_id = entity.getRestaurant_id();
if (restaurant_id != null) {
stmt.bindLong(15, restaurant_id);
}
Byte isMainAccount = entity.getIsMainAccount();
if (isMainAccount != null) {
stmt.bindLong(16, isMainAccount);
}
} }
@Override @Override
...@@ -172,36 +124,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -172,36 +124,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getComId());
Long comId = entity.getComId(); stmt.bindLong(3, entity.getFid());
if (comId != null) { stmt.bindLong(4, entity.getQty());
stmt.bindLong(2, comId); stmt.bindDouble(5, entity.getDiffAmt());
} stmt.bindLong(6, entity.getSeqNo());
stmt.bindLong(7, entity.getVisible());
Long fid = entity.getFid();
if (fid != null) {
stmt.bindLong(3, fid);
}
Long qty = entity.getQty();
if (qty != null) {
stmt.bindLong(4, qty);
}
Double diffAmt = entity.getDiffAmt();
if (diffAmt != null) {
stmt.bindDouble(5, diffAmt);
}
Long seqNo = entity.getSeqNo();
if (seqNo != null) {
stmt.bindLong(6, seqNo);
}
Long visible = entity.getVisible();
if (visible != null) {
stmt.bindLong(7, visible);
}
java.util.Date createTime = entity.getCreateTime(); java.util.Date createTime = entity.getCreateTime();
if (createTime != null) { if (createTime != null) {
...@@ -217,36 +145,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -217,36 +145,12 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
if (updateTime != null) { if (updateTime != null) {
stmt.bindLong(10, updateTime.getTime()); stmt.bindLong(10, updateTime.getTime());
} }
stmt.bindLong(11, entity.getConditions());
Long conditions = entity.getConditions(); stmt.bindLong(12, entity.getIsRT());
if (conditions != null) { stmt.bindLong(13, entity.getDeletes());
stmt.bindLong(11, conditions); stmt.bindLong(14, entity.getPosId());
} stmt.bindLong(15, entity.getRestaurant_id());
stmt.bindLong(16, entity.getIsMainAccount());
Long isRT = entity.getIsRT();
if (isRT != null) {
stmt.bindLong(12, isRT);
}
Byte deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(13, deletes);
}
Long posId = entity.getPosId();
if (posId != null) {
stmt.bindLong(14, posId);
}
Long restaurant_id = entity.getRestaurant_id();
if (restaurant_id != null) {
stmt.bindLong(15, restaurant_id);
}
Byte isMainAccount = entity.getIsMainAccount();
if (isMainAccount != null) {
stmt.bindLong(16, isMainAccount);
}
} }
@Override @Override
...@@ -258,21 +162,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -258,21 +162,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
public ComboItem readEntity(Cursor cursor, int offset) { public ComboItem readEntity(Cursor cursor, int offset) {
ComboItem entity = new ComboItem( // ComboItem entity = new ComboItem( //
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.getLong(offset + 1), // comId cursor.getLong(offset + 1), // comId
cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2), // fid cursor.getLong(offset + 2), // fid
cursor.isNull(offset + 3) ? null : cursor.getLong(offset + 3), // qty cursor.getLong(offset + 3), // qty
cursor.isNull(offset + 4) ? null : cursor.getDouble(offset + 4), // diffAmt cursor.getDouble(offset + 4), // diffAmt
cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5), // seqNo cursor.getLong(offset + 5), // seqNo
cursor.isNull(offset + 6) ? null : cursor.getLong(offset + 6), // visible cursor.getLong(offset + 6), // visible
cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)), // createTime cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)), // createTime
cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // createBy cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // createBy
cursor.isNull(offset + 9) ? null : new java.util.Date(cursor.getLong(offset + 9)), // updateTime cursor.isNull(offset + 9) ? null : new java.util.Date(cursor.getLong(offset + 9)), // updateTime
cursor.isNull(offset + 10) ? null : cursor.getLong(offset + 10), // conditions cursor.getLong(offset + 10), // conditions
cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11), // isRT cursor.getLong(offset + 11), // isRT
cursor.isNull(offset + 12) ? null : (byte) cursor.getShort(offset + 12), // deletes (byte) cursor.getShort(offset + 12), // deletes
cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13), // posId cursor.getLong(offset + 13), // posId
cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14), // restaurant_id cursor.getLong(offset + 14), // restaurant_id
cursor.isNull(offset + 15) ? null : (byte) cursor.getShort(offset + 15) // isMainAccount (byte) cursor.getShort(offset + 15) // isMainAccount
); );
return entity; return entity;
} }
...@@ -280,21 +184,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> { ...@@ -280,21 +184,21 @@ public class ComboItemDao extends AbstractDao<ComboItem, Long> {
@Override @Override
public void readEntity(Cursor cursor, ComboItem entity, int offset) { public void readEntity(Cursor cursor, ComboItem 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.setComId(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1)); entity.setComId(cursor.getLong(offset + 1));
entity.setFid(cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2)); entity.setFid(cursor.getLong(offset + 2));
entity.setQty(cursor.isNull(offset + 3) ? null : cursor.getLong(offset + 3)); entity.setQty(cursor.getLong(offset + 3));
entity.setDiffAmt(cursor.isNull(offset + 4) ? null : cursor.getDouble(offset + 4)); entity.setDiffAmt(cursor.getDouble(offset + 4));
entity.setSeqNo(cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5)); entity.setSeqNo(cursor.getLong(offset + 5));
entity.setVisible(cursor.isNull(offset + 6) ? null : cursor.getLong(offset + 6)); entity.setVisible(cursor.getLong(offset + 6));
entity.setCreateTime(cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7))); entity.setCreateTime(cursor.isNull(offset + 7) ? null : new java.util.Date(cursor.getLong(offset + 7)));
entity.setCreateBy(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8)); entity.setCreateBy(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));
entity.setUpdateTime(cursor.isNull(offset + 9) ? null : new java.util.Date(cursor.getLong(offset + 9))); entity.setUpdateTime(cursor.isNull(offset + 9) ? null : new java.util.Date(cursor.getLong(offset + 9)));
entity.setConditions(cursor.isNull(offset + 10) ? null : cursor.getLong(offset + 10)); entity.setConditions(cursor.getLong(offset + 10));
entity.setIsRT(cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11)); entity.setIsRT(cursor.getLong(offset + 11));
entity.setDeletes(cursor.isNull(offset + 12) ? null : (byte) cursor.getShort(offset + 12)); entity.setDeletes((byte) cursor.getShort(offset + 12));
entity.setPosId(cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13)); entity.setPosId(cursor.getLong(offset + 13));
entity.setRestaurant_id(cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14)); entity.setRestaurant_id(cursor.getLong(offset + 14));
entity.setIsMainAccount(cursor.isNull(offset + 15) ? null : (byte) cursor.getShort(offset + 15)); entity.setIsMainAccount((byte) cursor.getShort(offset + 15));
} }
@Override @Override
......
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/greendao/FoodDao.java
...@@ -25,72 +25,72 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -25,72 +25,72 @@ public class FoodDao extends AbstractDao<Food, Long> {
*/ */
public static class Properties { public static class Properties {
public final static Property Id = new Property(0, Long.class, "id", true, "FID"); public final static Property Id = new Property(0, Long.class, "id", true, "FID");
public final static Property ParentId = new Property(1, Long.class, "parentId", false, "PARENT_ID"); public final static Property ParentId = new Property(1, long.class, "parentId", false, "PARENT_ID");
public final static Property RestaurantId = new Property(2, Long.class, "restaurantId", false, "RESTAURANT_ID"); public final static Property RestaurantId = new Property(2, long.class, "restaurantId", false, "RESTAURANT_ID");
public final static Property IsParent = new Property(3, Byte.class, "isParent", false, "IS_PARENT"); public final static Property IsParent = new Property(3, byte.class, "isParent", false, "IS_PARENT");
public final static Property SeqNo = new Property(4, Long.class, "seqNo", false, "SEQ_NO"); public final static Property SeqNo = new Property(4, long.class, "seqNo", false, "SEQ_NO");
public final static Property FoodName = new Property(5, String.class, "foodName", false, "FOOD_NAME"); public final static Property FoodName = new Property(5, String.class, "foodName", false, "FOOD_NAME");
public final static Property FoodName1 = new Property(6, String.class, "foodName1", false, "FOOD_NAME1"); public final static Property FoodName1 = new Property(6, String.class, "foodName1", false, "FOOD_NAME1");
public final static Property FoodName2 = new Property(7, String.class, "foodName2", false, "FOOD_NAME2"); public final static Property FoodName2 = new Property(7, String.class, "foodName2", false, "FOOD_NAME2");
public final static Property Plu = new Property(8, String.class, "plu", false, "PLU"); public final static Property Plu = new Property(8, String.class, "plu", false, "PLU");
public final static Property PosFid = new Property(9, String.class, "posFid", false, "POS_FID"); public final static Property PosFid = new Property(9, String.class, "posFid", false, "POS_FID");
public final static Property FoodDesc = new Property(10, String.class, "foodDesc", false, "FOOD_DESC"); public final static Property FoodDesc = new Property(10, String.class, "foodDesc", false, "FOOD_DESC");
public final static Property LimitAmount = new Property(11, Long.class, "limitAmount", false, "LIMIT_AMOUNT"); public final static Property LimitAmount = new Property(11, long.class, "limitAmount", false, "LIMIT_AMOUNT");
public final static Property LimitType = new Property(12, Long.class, "limitType", false, "LIMIT_TYPE"); public final static Property LimitType = new Property(12, long.class, "limitType", false, "LIMIT_TYPE");
public final static Property FoodSummary = new Property(13, Long.class, "foodSummary", false, "FOOD_SUMMARY"); public final static Property FoodSummary = new Property(13, long.class, "foodSummary", false, "FOOD_SUMMARY");
public final static Property Invisible = new Property(14, Long.class, "invisible", false, "INVISIBLE"); public final static Property Invisible = new Property(14, long.class, "invisible", false, "INVISIBLE");
public final static Property AutoMod = new Property(15, Byte.class, "autoMod", false, "AUTO_MOD"); public final static Property AutoMod = new Property(15, byte.class, "autoMod", false, "AUTO_MOD");
public final static Property Price = new Property(16, Double.class, "price", false, "PRICE"); public final static Property Price = new Property(16, double.class, "price", false, "PRICE");
public final static Property MarketPrice = new Property(17, Double.class, "marketPrice", false, "MARKET_PRICE"); public final static Property MarketPrice = new Property(17, double.class, "marketPrice", false, "MARKET_PRICE");
public final static Property LunchboxPrice = new Property(18, Double.class, "lunchboxPrice", false, "LUNCHBOX_PRICE"); public final static Property LunchboxPrice = new Property(18, double.class, "lunchboxPrice", false, "LUNCHBOX_PRICE");
public final static Property ImgUrlSmall = new Property(19, String.class, "imgUrlSmall", false, "IMG_URL_SMALL"); public final static Property ImgUrlSmall = new Property(19, String.class, "imgUrlSmall", false, "IMG_URL_SMALL");
public final static Property Imageurl = new Property(20, String.class, "imageurl", false, "IMAGEURL"); public final static Property Imageurl = new Property(20, String.class, "imageurl", false, "IMAGEURL");
public final static Property RiceponInvisible = new Property(21, Long.class, "riceponInvisible", false, "RICEPON_INVISIBLE"); public final static Property RiceponInvisible = new Property(21, long.class, "riceponInvisible", false, "RICEPON_INVISIBLE");
public final static Property Cost = new Property(22, Double.class, "cost", false, "COST"); public final static Property Cost = new Property(22, double.class, "cost", false, "COST");
public final static Property StartDate = new Property(23, java.util.Date.class, "startDate", false, "START_DATE"); public final static Property StartDate = new Property(23, java.util.Date.class, "startDate", false, "START_DATE");
public final static Property EndDate = new Property(24, java.util.Date.class, "endDate", false, "END_DATE"); public final static Property EndDate = new Property(24, java.util.Date.class, "endDate", false, "END_DATE");
public final static Property Like = new Property(25, Long.class, "like", false, "LIKE"); public final static Property Like = new Property(25, long.class, "like", false, "LIKE");
public final static Property TotalSold = new Property(26, Long.class, "totalSold", false, "TOTAL_SOLD"); public final static Property TotalSold = new Property(26, long.class, "totalSold", false, "TOTAL_SOLD");
public final static Property IsSold = new Property(27, Long.class, "isSold", false, "IS_SOLD"); public final static Property IsSold = new Property(27, long.class, "isSold", false, "IS_SOLD");
public final static Property CreateBy = new Property(28, String.class, "createBy", false, "CREATE_BY"); public final static Property CreateBy = new Property(28, String.class, "createBy", false, "CREATE_BY");
public final static Property CreateTime = new Property(29, java.util.Date.class, "createTime", false, "CREATE_TIME"); public final static Property CreateTime = new Property(29, java.util.Date.class, "createTime", false, "CREATE_TIME");
public final static Property UpdateBy = new Property(30, String.class, "updateBy", false, "UPDATE_BY"); public final static Property UpdateBy = new Property(30, String.class, "updateBy", false, "UPDATE_BY");
public final static Property UpdateTime = new Property(31, java.util.Date.class, "updateTime", false, "UPDATE_TIME"); public final static Property UpdateTime = new Property(31, java.util.Date.class, "updateTime", false, "UPDATE_TIME");
public final static Property PeriodId = new Property(32, Long.class, "periodId", false, "PERIOD_ID"); public final static Property PeriodId = new Property(32, long.class, "periodId", false, "PERIOD_ID");
public final static Property AbleDiscount = new Property(33, Long.class, "ableDiscount", false, "ABLE_DISCOUNT"); public final static Property AbleDiscount = new Property(33, long.class, "ableDiscount", false, "ABLE_DISCOUNT");
public final static Property Takeaway = new Property(34, Long.class, "takeaway", false, "TAKEAWAY"); public final static Property Takeaway = new Property(34, long.class, "takeaway", false, "TAKEAWAY");
public final static Property BlueEdit = new Property(35, Long.class, "blueEdit", false, "BLUE_EDIT"); public final static Property BlueEdit = new Property(35, long.class, "blueEdit", false, "BLUE_EDIT");
public final static Property CartEdit = new Property(36, Long.class, "cartEdit", false, "CART_EDIT"); public final static Property CartEdit = new Property(36, long.class, "cartEdit", false, "CART_EDIT");
public final static Property AutoMerge = new Property(37, Long.class, "autoMerge", false, "AUTO_MERGE"); public final static Property AutoMerge = new Property(37, long.class, "autoMerge", false, "AUTO_MERGE");
public final static Property PrintSeting = new Property(38, String.class, "printSeting", false, "PRINT_SETING"); public final static Property PrintSeting = new Property(38, String.class, "printSeting", false, "PRINT_SETING");
public final static Property IsPrintQueueCode = new Property(39, Long.class, "isPrintQueueCode", false, "IS_PRINT_QUEUE_CODE"); public final static Property IsPrintQueueCode = new Property(39, long.class, "isPrintQueueCode", false, "IS_PRINT_QUEUE_CODE");
public final static Property QueueHeadId = new Property(40, Long.class, "queueHeadId", false, "QUEUE_HEAD_ID"); public final static Property QueueHeadId = new Property(40, long.class, "queueHeadId", false, "QUEUE_HEAD_ID");
public final static Property Approve = new Property(41, Long.class, "approve", false, "APPROVE"); public final static Property Approve = new Property(41, long.class, "approve", false, "APPROVE");
public final static Property PrintFont = new Property(42, Long.class, "printFont", false, "PRINT_FONT"); public final static Property PrintFont = new Property(42, long.class, "printFont", false, "PRINT_FONT");
public final static Property AdvPrice = new Property(43, Long.class, "advPrice", false, "ADV_PRICE"); public final static Property AdvPrice = new Property(43, long.class, "advPrice", false, "ADV_PRICE");
public final static Property PrintToBill = new Property(44, Long.class, "printToBill", false, "PRINT_TO_BILL"); public final static Property PrintToBill = new Property(44, long.class, "printToBill", false, "PRINT_TO_BILL");
public final static Property PointsAdd = new Property(45, Double.class, "pointsAdd", false, "POINTS_ADD"); public final static Property PointsAdd = new Property(45, double.class, "pointsAdd", false, "POINTS_ADD");
public final static Property PointsRatio = new Property(46, Long.class, "pointsRatio", false, "POINTS_RATIO"); public final static Property PointsRatio = new Property(46, long.class, "pointsRatio", false, "POINTS_RATIO");
public final static Property PointsRedeem = new Property(47, Double.class, "pointsRedeem", false, "POINTS_REDEEM"); public final static Property PointsRedeem = new Property(47, double.class, "pointsRedeem", false, "POINTS_REDEEM");
public final static Property KtPrintMainItem = new Property(48, Long.class, "ktPrintMainItem", false, "KT_PRINT_MAIN_ITEM"); public final static Property KtPrintMainItem = new Property(48, long.class, "ktPrintMainItem", false, "KT_PRINT_MAIN_ITEM");
public final static Property KtShowPrice = new Property(49, Long.class, "ktShowPrice", false, "KT_SHOW_PRICE"); public final static Property KtShowPrice = new Property(49, long.class, "ktShowPrice", false, "KT_SHOW_PRICE");
public final static Property PrintTo = new Property(50, Long.class, "printTo", false, "PRINT_TO"); public final static Property PrintTo = new Property(50, long.class, "printTo", false, "PRINT_TO");
public final static Property ToPax = new Property(51, Long.class, "toPax", false, "TO_PAX"); public final static Property ToPax = new Property(51, long.class, "toPax", false, "TO_PAX");
public final static Property FoodType = new Property(52, Long.class, "foodType", false, "FOOD_TYPE"); public final static Property FoodType = new Property(52, long.class, "foodType", false, "FOOD_TYPE");
public final static Property MajorMainId = new Property(53, Long.class, "majorMainId", false, "MAJOR_MAIN_ID"); public final static Property MajorMainId = new Property(53, long.class, "majorMainId", false, "MAJOR_MAIN_ID");
public final static Property DeptId = new Property(54, Long.class, "deptId", false, "DEPT_ID"); public final static Property DeptId = new Property(54, long.class, "deptId", false, "DEPT_ID");
public final static Property ServiceCharge = new Property(55, Byte.class, "serviceCharge", false, "SERVICE_CHARGE"); public final static Property ServiceCharge = new Property(55, byte.class, "serviceCharge", false, "SERVICE_CHARGE");
public final static Property ColorId = new Property(56, Long.class, "colorId", false, "COLOR_ID"); public final static Property ColorId = new Property(56, long.class, "colorId", false, "COLOR_ID");
public final static Property Conditions = new Property(57, Long.class, "conditions", false, "CONDITIONS"); public final static Property Conditions = new Property(57, long.class, "conditions", false, "CONDITIONS");
public final static Property IsRt = new Property(58, Long.class, "isRt", false, "IS_RT"); public final static Property IsRt = new Property(58, long.class, "isRt", false, "IS_RT");
public final static Property Deletes = new Property(59, Long.class, "deletes", false, "DELETES"); public final static Property Deletes = new Property(59, long.class, "deletes", false, "DELETES");
public final static Property IsTimingFood = new Property(60, Long.class, "isTimingFood", false, "IS_TIMING_FOOD"); public final static Property IsTimingFood = new Property(60, long.class, "isTimingFood", false, "IS_TIMING_FOOD");
public final static Property MinLongTime = new Property(61, Long.class, "minLongTime", false, "MIN_LONG_TIME"); public final static Property MinLongTime = new Property(61, long.class, "minLongTime", false, "MIN_LONG_TIME");
public final static Property UnitTime = new Property(62, Long.class, "unitTime", false, "UNIT_TIME"); public final static Property UnitTime = new Property(62, long.class, "unitTime", false, "UNIT_TIME");
public final static Property UnitPrice = new Property(63, Double.class, "unitPrice", false, "UNIT_PRICE"); public final static Property UnitPrice = new Property(63, double.class, "unitPrice", false, "UNIT_PRICE");
public final static Property FreeLongTime = new Property(64, Long.class, "freeLongTime", false, "FREE_LONG_TIME"); public final static Property FreeLongTime = new Property(64, long.class, "freeLongTime", false, "FREE_LONG_TIME");
public final static Property FreePeriodBegin = new Property(65, java.util.Date.class, "freePeriodBegin", false, "FREE_PERIOD_BEGIN"); public final static Property FreePeriodBegin = new Property(65, java.util.Date.class, "freePeriodBegin", false, "FREE_PERIOD_BEGIN");
public final static Property IsStatistic = new Property(66, Long.class, "isStatistic", false, "IS_STATISTIC"); public final static Property IsStatistic = new Property(66, long.class, "isStatistic", false, "IS_STATISTIC");
} }
...@@ -107,72 +107,72 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -107,72 +107,72 @@ public class FoodDao extends AbstractDao<Food, Long> {
String constraint = ifNotExists? "IF NOT EXISTS ": ""; String constraint = ifNotExists? "IF NOT EXISTS ": "";
db.execSQL("CREATE TABLE " + constraint + "\"FOOD\" (" + // db.execSQL("CREATE TABLE " + constraint + "\"FOOD\" (" + //
"\"FID\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"FID\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
"\"PARENT_ID\" INTEGER," + // 1: parentId "\"PARENT_ID\" INTEGER NOT NULL ," + // 1: parentId
"\"RESTAURANT_ID\" INTEGER," + // 2: restaurantId "\"RESTAURANT_ID\" INTEGER NOT NULL ," + // 2: restaurantId
"\"IS_PARENT\" INTEGER," + // 3: isParent "\"IS_PARENT\" INTEGER NOT NULL ," + // 3: isParent
"\"SEQ_NO\" INTEGER," + // 4: seqNo "\"SEQ_NO\" INTEGER NOT NULL ," + // 4: seqNo
"\"FOOD_NAME\" TEXT," + // 5: foodName "\"FOOD_NAME\" TEXT," + // 5: foodName
"\"FOOD_NAME1\" TEXT," + // 6: foodName1 "\"FOOD_NAME1\" TEXT," + // 6: foodName1
"\"FOOD_NAME2\" TEXT," + // 7: foodName2 "\"FOOD_NAME2\" TEXT," + // 7: foodName2
"\"PLU\" TEXT," + // 8: plu "\"PLU\" TEXT," + // 8: plu
"\"POS_FID\" TEXT," + // 9: posFid "\"POS_FID\" TEXT," + // 9: posFid
"\"FOOD_DESC\" TEXT," + // 10: foodDesc "\"FOOD_DESC\" TEXT," + // 10: foodDesc
"\"LIMIT_AMOUNT\" INTEGER," + // 11: limitAmount "\"LIMIT_AMOUNT\" INTEGER NOT NULL ," + // 11: limitAmount
"\"LIMIT_TYPE\" INTEGER," + // 12: limitType "\"LIMIT_TYPE\" INTEGER NOT NULL ," + // 12: limitType
"\"FOOD_SUMMARY\" INTEGER," + // 13: foodSummary "\"FOOD_SUMMARY\" INTEGER NOT NULL ," + // 13: foodSummary
"\"INVISIBLE\" INTEGER," + // 14: invisible "\"INVISIBLE\" INTEGER NOT NULL ," + // 14: invisible
"\"AUTO_MOD\" INTEGER," + // 15: autoMod "\"AUTO_MOD\" INTEGER NOT NULL ," + // 15: autoMod
"\"PRICE\" REAL," + // 16: price "\"PRICE\" REAL NOT NULL ," + // 16: price
"\"MARKET_PRICE\" REAL," + // 17: marketPrice "\"MARKET_PRICE\" REAL NOT NULL ," + // 17: marketPrice
"\"LUNCHBOX_PRICE\" REAL," + // 18: lunchboxPrice "\"LUNCHBOX_PRICE\" REAL NOT NULL ," + // 18: lunchboxPrice
"\"IMG_URL_SMALL\" TEXT," + // 19: imgUrlSmall "\"IMG_URL_SMALL\" TEXT," + // 19: imgUrlSmall
"\"IMAGEURL\" TEXT," + // 20: imageurl "\"IMAGEURL\" TEXT," + // 20: imageurl
"\"RICEPON_INVISIBLE\" INTEGER," + // 21: riceponInvisible "\"RICEPON_INVISIBLE\" INTEGER NOT NULL ," + // 21: riceponInvisible
"\"COST\" REAL," + // 22: cost "\"COST\" REAL NOT NULL ," + // 22: cost
"\"START_DATE\" INTEGER," + // 23: startDate "\"START_DATE\" INTEGER," + // 23: startDate
"\"END_DATE\" INTEGER," + // 24: endDate "\"END_DATE\" INTEGER," + // 24: endDate
"\"LIKE\" INTEGER," + // 25: like "\"LIKE\" INTEGER NOT NULL ," + // 25: like
"\"TOTAL_SOLD\" INTEGER," + // 26: totalSold "\"TOTAL_SOLD\" INTEGER NOT NULL ," + // 26: totalSold
"\"IS_SOLD\" INTEGER," + // 27: isSold "\"IS_SOLD\" INTEGER NOT NULL ," + // 27: isSold
"\"CREATE_BY\" TEXT," + // 28: createBy "\"CREATE_BY\" TEXT," + // 28: createBy
"\"CREATE_TIME\" INTEGER," + // 29: createTime "\"CREATE_TIME\" INTEGER," + // 29: createTime
"\"UPDATE_BY\" TEXT," + // 30: updateBy "\"UPDATE_BY\" TEXT," + // 30: updateBy
"\"UPDATE_TIME\" INTEGER," + // 31: updateTime "\"UPDATE_TIME\" INTEGER," + // 31: updateTime
"\"PERIOD_ID\" INTEGER," + // 32: periodId "\"PERIOD_ID\" INTEGER NOT NULL ," + // 32: periodId
"\"ABLE_DISCOUNT\" INTEGER," + // 33: ableDiscount "\"ABLE_DISCOUNT\" INTEGER NOT NULL ," + // 33: ableDiscount
"\"TAKEAWAY\" INTEGER," + // 34: takeaway "\"TAKEAWAY\" INTEGER NOT NULL ," + // 34: takeaway
"\"BLUE_EDIT\" INTEGER," + // 35: blueEdit "\"BLUE_EDIT\" INTEGER NOT NULL ," + // 35: blueEdit
"\"CART_EDIT\" INTEGER," + // 36: cartEdit "\"CART_EDIT\" INTEGER NOT NULL ," + // 36: cartEdit
"\"AUTO_MERGE\" INTEGER," + // 37: autoMerge "\"AUTO_MERGE\" INTEGER NOT NULL ," + // 37: autoMerge
"\"PRINT_SETING\" TEXT," + // 38: printSeting "\"PRINT_SETING\" TEXT," + // 38: printSeting
"\"IS_PRINT_QUEUE_CODE\" INTEGER," + // 39: isPrintQueueCode "\"IS_PRINT_QUEUE_CODE\" INTEGER NOT NULL ," + // 39: isPrintQueueCode
"\"QUEUE_HEAD_ID\" INTEGER," + // 40: queueHeadId "\"QUEUE_HEAD_ID\" INTEGER NOT NULL ," + // 40: queueHeadId
"\"APPROVE\" INTEGER," + // 41: approve "\"APPROVE\" INTEGER NOT NULL ," + // 41: approve
"\"PRINT_FONT\" INTEGER," + // 42: printFont "\"PRINT_FONT\" INTEGER NOT NULL ," + // 42: printFont
"\"ADV_PRICE\" INTEGER," + // 43: advPrice "\"ADV_PRICE\" INTEGER NOT NULL ," + // 43: advPrice
"\"PRINT_TO_BILL\" INTEGER," + // 44: printToBill "\"PRINT_TO_BILL\" INTEGER NOT NULL ," + // 44: printToBill
"\"POINTS_ADD\" REAL," + // 45: pointsAdd "\"POINTS_ADD\" REAL NOT NULL ," + // 45: pointsAdd
"\"POINTS_RATIO\" INTEGER," + // 46: pointsRatio "\"POINTS_RATIO\" INTEGER NOT NULL ," + // 46: pointsRatio
"\"POINTS_REDEEM\" REAL," + // 47: pointsRedeem "\"POINTS_REDEEM\" REAL NOT NULL ," + // 47: pointsRedeem
"\"KT_PRINT_MAIN_ITEM\" INTEGER," + // 48: ktPrintMainItem "\"KT_PRINT_MAIN_ITEM\" INTEGER NOT NULL ," + // 48: ktPrintMainItem
"\"KT_SHOW_PRICE\" INTEGER," + // 49: ktShowPrice "\"KT_SHOW_PRICE\" INTEGER NOT NULL ," + // 49: ktShowPrice
"\"PRINT_TO\" INTEGER," + // 50: printTo "\"PRINT_TO\" INTEGER NOT NULL ," + // 50: printTo
"\"TO_PAX\" INTEGER," + // 51: toPax "\"TO_PAX\" INTEGER NOT NULL ," + // 51: toPax
"\"FOOD_TYPE\" INTEGER," + // 52: foodType "\"FOOD_TYPE\" INTEGER NOT NULL ," + // 52: foodType
"\"MAJOR_MAIN_ID\" INTEGER," + // 53: majorMainId "\"MAJOR_MAIN_ID\" INTEGER NOT NULL ," + // 53: majorMainId
"\"DEPT_ID\" INTEGER," + // 54: deptId "\"DEPT_ID\" INTEGER NOT NULL ," + // 54: deptId
"\"SERVICE_CHARGE\" INTEGER," + // 55: serviceCharge "\"SERVICE_CHARGE\" INTEGER NOT NULL ," + // 55: serviceCharge
"\"COLOR_ID\" INTEGER," + // 56: colorId "\"COLOR_ID\" INTEGER NOT NULL ," + // 56: colorId
"\"CONDITIONS\" INTEGER," + // 57: conditions "\"CONDITIONS\" INTEGER NOT NULL ," + // 57: conditions
"\"IS_RT\" INTEGER," + // 58: isRt "\"IS_RT\" INTEGER NOT NULL ," + // 58: isRt
"\"DELETES\" INTEGER," + // 59: deletes "\"DELETES\" INTEGER NOT NULL ," + // 59: deletes
"\"IS_TIMING_FOOD\" INTEGER," + // 60: isTimingFood "\"IS_TIMING_FOOD\" INTEGER NOT NULL ," + // 60: isTimingFood
"\"MIN_LONG_TIME\" INTEGER," + // 61: minLongTime "\"MIN_LONG_TIME\" INTEGER NOT NULL ," + // 61: minLongTime
"\"UNIT_TIME\" INTEGER," + // 62: unitTime "\"UNIT_TIME\" INTEGER NOT NULL ," + // 62: unitTime
"\"UNIT_PRICE\" REAL," + // 63: unitPrice "\"UNIT_PRICE\" REAL NOT NULL ," + // 63: unitPrice
"\"FREE_LONG_TIME\" INTEGER," + // 64: freeLongTime "\"FREE_LONG_TIME\" INTEGER NOT NULL ," + // 64: freeLongTime
"\"FREE_PERIOD_BEGIN\" INTEGER," + // 65: freePeriodBegin "\"FREE_PERIOD_BEGIN\" INTEGER," + // 65: freePeriodBegin
"\"IS_STATISTIC\" INTEGER);"); // 66: isStatistic "\"IS_STATISTIC\" INTEGER NOT NULL );"); // 66: isStatistic
} }
/** Drops the underlying database table. */ /** Drops the underlying database table. */
...@@ -189,26 +189,10 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -189,26 +189,10 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getParentId());
Long parentId = entity.getParentId(); stmt.bindLong(3, entity.getRestaurantId());
if (parentId != null) { stmt.bindLong(4, entity.getIsParent());
stmt.bindLong(2, parentId); stmt.bindLong(5, entity.getSeqNo());
}
Long restaurantId = entity.getRestaurantId();
if (restaurantId != null) {
stmt.bindLong(3, restaurantId);
}
Byte isParent = entity.getIsParent();
if (isParent != null) {
stmt.bindLong(4, isParent);
}
Long seqNo = entity.getSeqNo();
if (seqNo != null) {
stmt.bindLong(5, seqNo);
}
String foodName = entity.getFoodName(); String foodName = entity.getFoodName();
if (foodName != null) { if (foodName != null) {
...@@ -239,46 +223,14 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -239,46 +223,14 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (foodDesc != null) { if (foodDesc != null) {
stmt.bindString(11, foodDesc); stmt.bindString(11, foodDesc);
} }
stmt.bindLong(12, entity.getLimitAmount());
Long limitAmount = entity.getLimitAmount(); stmt.bindLong(13, entity.getLimitType());
if (limitAmount != null) { stmt.bindLong(14, entity.getFoodSummary());
stmt.bindLong(12, limitAmount); stmt.bindLong(15, entity.getInvisible());
} stmt.bindLong(16, entity.getAutoMod());
stmt.bindDouble(17, entity.getPrice());
Long limitType = entity.getLimitType(); stmt.bindDouble(18, entity.getMarketPrice());
if (limitType != null) { stmt.bindDouble(19, entity.getLunchboxPrice());
stmt.bindLong(13, limitType);
}
Long foodSummary = entity.getFoodSummary();
if (foodSummary != null) {
stmt.bindLong(14, foodSummary);
}
Long invisible = entity.getInvisible();
if (invisible != null) {
stmt.bindLong(15, invisible);
}
Byte autoMod = entity.getAutoMod();
if (autoMod != null) {
stmt.bindLong(16, autoMod);
}
Double price = entity.getPrice();
if (price != null) {
stmt.bindDouble(17, price);
}
Double marketPrice = entity.getMarketPrice();
if (marketPrice != null) {
stmt.bindDouble(18, marketPrice);
}
Double lunchboxPrice = entity.getLunchboxPrice();
if (lunchboxPrice != null) {
stmt.bindDouble(19, lunchboxPrice);
}
String imgUrlSmall = entity.getImgUrlSmall(); String imgUrlSmall = entity.getImgUrlSmall();
if (imgUrlSmall != null) { if (imgUrlSmall != null) {
...@@ -289,16 +241,8 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -289,16 +241,8 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (imageurl != null) { if (imageurl != null) {
stmt.bindString(21, imageurl); stmt.bindString(21, imageurl);
} }
stmt.bindLong(22, entity.getRiceponInvisible());
Long riceponInvisible = entity.getRiceponInvisible(); stmt.bindDouble(23, entity.getCost());
if (riceponInvisible != null) {
stmt.bindLong(22, riceponInvisible);
}
Double cost = entity.getCost();
if (cost != null) {
stmt.bindDouble(23, cost);
}
java.util.Date startDate = entity.getStartDate(); java.util.Date startDate = entity.getStartDate();
if (startDate != null) { if (startDate != null) {
...@@ -309,21 +253,9 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -309,21 +253,9 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (endDate != null) { if (endDate != null) {
stmt.bindLong(25, endDate.getTime()); stmt.bindLong(25, endDate.getTime());
} }
stmt.bindLong(26, entity.getLike());
Long like = entity.getLike(); stmt.bindLong(27, entity.getTotalSold());
if (like != null) { stmt.bindLong(28, entity.getIsSold());
stmt.bindLong(26, like);
}
Long totalSold = entity.getTotalSold();
if (totalSold != null) {
stmt.bindLong(27, totalSold);
}
Long isSold = entity.getIsSold();
if (isSold != null) {
stmt.bindLong(28, isSold);
}
String createBy = entity.getCreateBy(); String createBy = entity.getCreateBy();
if (createBy != null) { if (createBy != null) {
...@@ -344,181 +276,49 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -344,181 +276,49 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (updateTime != null) { if (updateTime != null) {
stmt.bindLong(32, updateTime.getTime()); stmt.bindLong(32, updateTime.getTime());
} }
stmt.bindLong(33, entity.getPeriodId());
Long periodId = entity.getPeriodId(); stmt.bindLong(34, entity.getAbleDiscount());
if (periodId != null) { stmt.bindLong(35, entity.getTakeaway());
stmt.bindLong(33, periodId); stmt.bindLong(36, entity.getBlueEdit());
} stmt.bindLong(37, entity.getCartEdit());
stmt.bindLong(38, entity.getAutoMerge());
Long ableDiscount = entity.getAbleDiscount();
if (ableDiscount != null) {
stmt.bindLong(34, ableDiscount);
}
Long takeaway = entity.getTakeaway();
if (takeaway != null) {
stmt.bindLong(35, takeaway);
}
Long blueEdit = entity.getBlueEdit();
if (blueEdit != null) {
stmt.bindLong(36, blueEdit);
}
Long cartEdit = entity.getCartEdit();
if (cartEdit != null) {
stmt.bindLong(37, cartEdit);
}
Long autoMerge = entity.getAutoMerge();
if (autoMerge != null) {
stmt.bindLong(38, autoMerge);
}
String printSeting = entity.getPrintSeting(); String printSeting = entity.getPrintSeting();
if (printSeting != null) { if (printSeting != null) {
stmt.bindString(39, printSeting); stmt.bindString(39, printSeting);
} }
stmt.bindLong(40, entity.getIsPrintQueueCode());
Long isPrintQueueCode = entity.getIsPrintQueueCode(); stmt.bindLong(41, entity.getQueueHeadId());
if (isPrintQueueCode != null) { stmt.bindLong(42, entity.getApprove());
stmt.bindLong(40, isPrintQueueCode); stmt.bindLong(43, entity.getPrintFont());
} stmt.bindLong(44, entity.getAdvPrice());
stmt.bindLong(45, entity.getPrintToBill());
Long queueHeadId = entity.getQueueHeadId(); stmt.bindDouble(46, entity.getPointsAdd());
if (queueHeadId != null) { stmt.bindLong(47, entity.getPointsRatio());
stmt.bindLong(41, queueHeadId); stmt.bindDouble(48, entity.getPointsRedeem());
} stmt.bindLong(49, entity.getKtPrintMainItem());
stmt.bindLong(50, entity.getKtShowPrice());
Long approve = entity.getApprove(); stmt.bindLong(51, entity.getPrintTo());
if (approve != null) { stmt.bindLong(52, entity.getToPax());
stmt.bindLong(42, approve); stmt.bindLong(53, entity.getFoodType());
} stmt.bindLong(54, entity.getMajorMainId());
stmt.bindLong(55, entity.getDeptId());
Long printFont = entity.getPrintFont(); stmt.bindLong(56, entity.getServiceCharge());
if (printFont != null) { stmt.bindLong(57, entity.getColorId());
stmt.bindLong(43, printFont); stmt.bindLong(58, entity.getConditions());
} stmt.bindLong(59, entity.getIsRt());
stmt.bindLong(60, entity.getDeletes());
Long advPrice = entity.getAdvPrice(); stmt.bindLong(61, entity.getIsTimingFood());
if (advPrice != null) { stmt.bindLong(62, entity.getMinLongTime());
stmt.bindLong(44, advPrice); stmt.bindLong(63, entity.getUnitTime());
} stmt.bindDouble(64, entity.getUnitPrice());
stmt.bindLong(65, entity.getFreeLongTime());
Long printToBill = entity.getPrintToBill();
if (printToBill != null) {
stmt.bindLong(45, printToBill);
}
Double pointsAdd = entity.getPointsAdd();
if (pointsAdd != null) {
stmt.bindDouble(46, pointsAdd);
}
Long pointsRatio = entity.getPointsRatio();
if (pointsRatio != null) {
stmt.bindLong(47, pointsRatio);
}
Double pointsRedeem = entity.getPointsRedeem();
if (pointsRedeem != null) {
stmt.bindDouble(48, pointsRedeem);
}
Long ktPrintMainItem = entity.getKtPrintMainItem();
if (ktPrintMainItem != null) {
stmt.bindLong(49, ktPrintMainItem);
}
Long ktShowPrice = entity.getKtShowPrice();
if (ktShowPrice != null) {
stmt.bindLong(50, ktShowPrice);
}
Long printTo = entity.getPrintTo();
if (printTo != null) {
stmt.bindLong(51, printTo);
}
Long toPax = entity.getToPax();
if (toPax != null) {
stmt.bindLong(52, toPax);
}
Long foodType = entity.getFoodType();
if (foodType != null) {
stmt.bindLong(53, foodType);
}
Long majorMainId = entity.getMajorMainId();
if (majorMainId != null) {
stmt.bindLong(54, majorMainId);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(55, deptId);
}
Byte serviceCharge = entity.getServiceCharge();
if (serviceCharge != null) {
stmt.bindLong(56, serviceCharge);
}
Long colorId = entity.getColorId();
if (colorId != null) {
stmt.bindLong(57, colorId);
}
Long conditions = entity.getConditions();
if (conditions != null) {
stmt.bindLong(58, conditions);
}
Long isRt = entity.getIsRt();
if (isRt != null) {
stmt.bindLong(59, isRt);
}
Long deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(60, deletes);
}
Long isTimingFood = entity.getIsTimingFood();
if (isTimingFood != null) {
stmt.bindLong(61, isTimingFood);
}
Long minLongTime = entity.getMinLongTime();
if (minLongTime != null) {
stmt.bindLong(62, minLongTime);
}
Long unitTime = entity.getUnitTime();
if (unitTime != null) {
stmt.bindLong(63, unitTime);
}
Double unitPrice = entity.getUnitPrice();
if (unitPrice != null) {
stmt.bindDouble(64, unitPrice);
}
Long freeLongTime = entity.getFreeLongTime();
if (freeLongTime != null) {
stmt.bindLong(65, freeLongTime);
}
java.util.Date freePeriodBegin = entity.getFreePeriodBegin(); java.util.Date freePeriodBegin = entity.getFreePeriodBegin();
if (freePeriodBegin != null) { if (freePeriodBegin != null) {
stmt.bindLong(66, freePeriodBegin.getTime()); stmt.bindLong(66, freePeriodBegin.getTime());
} }
stmt.bindLong(67, entity.getIsStatistic());
Long isStatistic = entity.getIsStatistic();
if (isStatistic != null) {
stmt.bindLong(67, isStatistic);
}
} }
@Override @Override
...@@ -529,26 +329,10 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -529,26 +329,10 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (id != null) { if (id != null) {
stmt.bindLong(1, id); stmt.bindLong(1, id);
} }
stmt.bindLong(2, entity.getParentId());
Long parentId = entity.getParentId(); stmt.bindLong(3, entity.getRestaurantId());
if (parentId != null) { stmt.bindLong(4, entity.getIsParent());
stmt.bindLong(2, parentId); stmt.bindLong(5, entity.getSeqNo());
}
Long restaurantId = entity.getRestaurantId();
if (restaurantId != null) {
stmt.bindLong(3, restaurantId);
}
Byte isParent = entity.getIsParent();
if (isParent != null) {
stmt.bindLong(4, isParent);
}
Long seqNo = entity.getSeqNo();
if (seqNo != null) {
stmt.bindLong(5, seqNo);
}
String foodName = entity.getFoodName(); String foodName = entity.getFoodName();
if (foodName != null) { if (foodName != null) {
...@@ -579,46 +363,14 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -579,46 +363,14 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (foodDesc != null) { if (foodDesc != null) {
stmt.bindString(11, foodDesc); stmt.bindString(11, foodDesc);
} }
stmt.bindLong(12, entity.getLimitAmount());
Long limitAmount = entity.getLimitAmount(); stmt.bindLong(13, entity.getLimitType());
if (limitAmount != null) { stmt.bindLong(14, entity.getFoodSummary());
stmt.bindLong(12, limitAmount); stmt.bindLong(15, entity.getInvisible());
} stmt.bindLong(16, entity.getAutoMod());
stmt.bindDouble(17, entity.getPrice());
Long limitType = entity.getLimitType(); stmt.bindDouble(18, entity.getMarketPrice());
if (limitType != null) { stmt.bindDouble(19, entity.getLunchboxPrice());
stmt.bindLong(13, limitType);
}
Long foodSummary = entity.getFoodSummary();
if (foodSummary != null) {
stmt.bindLong(14, foodSummary);
}
Long invisible = entity.getInvisible();
if (invisible != null) {
stmt.bindLong(15, invisible);
}
Byte autoMod = entity.getAutoMod();
if (autoMod != null) {
stmt.bindLong(16, autoMod);
}
Double price = entity.getPrice();
if (price != null) {
stmt.bindDouble(17, price);
}
Double marketPrice = entity.getMarketPrice();
if (marketPrice != null) {
stmt.bindDouble(18, marketPrice);
}
Double lunchboxPrice = entity.getLunchboxPrice();
if (lunchboxPrice != null) {
stmt.bindDouble(19, lunchboxPrice);
}
String imgUrlSmall = entity.getImgUrlSmall(); String imgUrlSmall = entity.getImgUrlSmall();
if (imgUrlSmall != null) { if (imgUrlSmall != null) {
...@@ -629,16 +381,8 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -629,16 +381,8 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (imageurl != null) { if (imageurl != null) {
stmt.bindString(21, imageurl); stmt.bindString(21, imageurl);
} }
stmt.bindLong(22, entity.getRiceponInvisible());
Long riceponInvisible = entity.getRiceponInvisible(); stmt.bindDouble(23, entity.getCost());
if (riceponInvisible != null) {
stmt.bindLong(22, riceponInvisible);
}
Double cost = entity.getCost();
if (cost != null) {
stmt.bindDouble(23, cost);
}
java.util.Date startDate = entity.getStartDate(); java.util.Date startDate = entity.getStartDate();
if (startDate != null) { if (startDate != null) {
...@@ -649,21 +393,9 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -649,21 +393,9 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (endDate != null) { if (endDate != null) {
stmt.bindLong(25, endDate.getTime()); stmt.bindLong(25, endDate.getTime());
} }
stmt.bindLong(26, entity.getLike());
Long like = entity.getLike(); stmt.bindLong(27, entity.getTotalSold());
if (like != null) { stmt.bindLong(28, entity.getIsSold());
stmt.bindLong(26, like);
}
Long totalSold = entity.getTotalSold();
if (totalSold != null) {
stmt.bindLong(27, totalSold);
}
Long isSold = entity.getIsSold();
if (isSold != null) {
stmt.bindLong(28, isSold);
}
String createBy = entity.getCreateBy(); String createBy = entity.getCreateBy();
if (createBy != null) { if (createBy != null) {
...@@ -684,181 +416,49 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -684,181 +416,49 @@ public class FoodDao extends AbstractDao<Food, Long> {
if (updateTime != null) { if (updateTime != null) {
stmt.bindLong(32, updateTime.getTime()); stmt.bindLong(32, updateTime.getTime());
} }
stmt.bindLong(33, entity.getPeriodId());
Long periodId = entity.getPeriodId(); stmt.bindLong(34, entity.getAbleDiscount());
if (periodId != null) { stmt.bindLong(35, entity.getTakeaway());
stmt.bindLong(33, periodId); stmt.bindLong(36, entity.getBlueEdit());
} stmt.bindLong(37, entity.getCartEdit());
stmt.bindLong(38, entity.getAutoMerge());
Long ableDiscount = entity.getAbleDiscount();
if (ableDiscount != null) {
stmt.bindLong(34, ableDiscount);
}
Long takeaway = entity.getTakeaway();
if (takeaway != null) {
stmt.bindLong(35, takeaway);
}
Long blueEdit = entity.getBlueEdit();
if (blueEdit != null) {
stmt.bindLong(36, blueEdit);
}
Long cartEdit = entity.getCartEdit();
if (cartEdit != null) {
stmt.bindLong(37, cartEdit);
}
Long autoMerge = entity.getAutoMerge();
if (autoMerge != null) {
stmt.bindLong(38, autoMerge);
}
String printSeting = entity.getPrintSeting(); String printSeting = entity.getPrintSeting();
if (printSeting != null) { if (printSeting != null) {
stmt.bindString(39, printSeting); stmt.bindString(39, printSeting);
} }
stmt.bindLong(40, entity.getIsPrintQueueCode());
Long isPrintQueueCode = entity.getIsPrintQueueCode(); stmt.bindLong(41, entity.getQueueHeadId());
if (isPrintQueueCode != null) { stmt.bindLong(42, entity.getApprove());
stmt.bindLong(40, isPrintQueueCode); stmt.bindLong(43, entity.getPrintFont());
} stmt.bindLong(44, entity.getAdvPrice());
stmt.bindLong(45, entity.getPrintToBill());
Long queueHeadId = entity.getQueueHeadId(); stmt.bindDouble(46, entity.getPointsAdd());
if (queueHeadId != null) { stmt.bindLong(47, entity.getPointsRatio());
stmt.bindLong(41, queueHeadId); stmt.bindDouble(48, entity.getPointsRedeem());
} stmt.bindLong(49, entity.getKtPrintMainItem());
stmt.bindLong(50, entity.getKtShowPrice());
Long approve = entity.getApprove(); stmt.bindLong(51, entity.getPrintTo());
if (approve != null) { stmt.bindLong(52, entity.getToPax());
stmt.bindLong(42, approve); stmt.bindLong(53, entity.getFoodType());
} stmt.bindLong(54, entity.getMajorMainId());
stmt.bindLong(55, entity.getDeptId());
Long printFont = entity.getPrintFont(); stmt.bindLong(56, entity.getServiceCharge());
if (printFont != null) { stmt.bindLong(57, entity.getColorId());
stmt.bindLong(43, printFont); stmt.bindLong(58, entity.getConditions());
} stmt.bindLong(59, entity.getIsRt());
stmt.bindLong(60, entity.getDeletes());
Long advPrice = entity.getAdvPrice(); stmt.bindLong(61, entity.getIsTimingFood());
if (advPrice != null) { stmt.bindLong(62, entity.getMinLongTime());
stmt.bindLong(44, advPrice); stmt.bindLong(63, entity.getUnitTime());
} stmt.bindDouble(64, entity.getUnitPrice());
stmt.bindLong(65, entity.getFreeLongTime());
Long printToBill = entity.getPrintToBill();
if (printToBill != null) {
stmt.bindLong(45, printToBill);
}
Double pointsAdd = entity.getPointsAdd();
if (pointsAdd != null) {
stmt.bindDouble(46, pointsAdd);
}
Long pointsRatio = entity.getPointsRatio();
if (pointsRatio != null) {
stmt.bindLong(47, pointsRatio);
}
Double pointsRedeem = entity.getPointsRedeem();
if (pointsRedeem != null) {
stmt.bindDouble(48, pointsRedeem);
}
Long ktPrintMainItem = entity.getKtPrintMainItem();
if (ktPrintMainItem != null) {
stmt.bindLong(49, ktPrintMainItem);
}
Long ktShowPrice = entity.getKtShowPrice();
if (ktShowPrice != null) {
stmt.bindLong(50, ktShowPrice);
}
Long printTo = entity.getPrintTo();
if (printTo != null) {
stmt.bindLong(51, printTo);
}
Long toPax = entity.getToPax();
if (toPax != null) {
stmt.bindLong(52, toPax);
}
Long foodType = entity.getFoodType();
if (foodType != null) {
stmt.bindLong(53, foodType);
}
Long majorMainId = entity.getMajorMainId();
if (majorMainId != null) {
stmt.bindLong(54, majorMainId);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(55, deptId);
}
Byte serviceCharge = entity.getServiceCharge();
if (serviceCharge != null) {
stmt.bindLong(56, serviceCharge);
}
Long colorId = entity.getColorId();
if (colorId != null) {
stmt.bindLong(57, colorId);
}
Long conditions = entity.getConditions();
if (conditions != null) {
stmt.bindLong(58, conditions);
}
Long isRt = entity.getIsRt();
if (isRt != null) {
stmt.bindLong(59, isRt);
}
Long deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(60, deletes);
}
Long isTimingFood = entity.getIsTimingFood();
if (isTimingFood != null) {
stmt.bindLong(61, isTimingFood);
}
Long minLongTime = entity.getMinLongTime();
if (minLongTime != null) {
stmt.bindLong(62, minLongTime);
}
Long unitTime = entity.getUnitTime();
if (unitTime != null) {
stmt.bindLong(63, unitTime);
}
Double unitPrice = entity.getUnitPrice();
if (unitPrice != null) {
stmt.bindDouble(64, unitPrice);
}
Long freeLongTime = entity.getFreeLongTime();
if (freeLongTime != null) {
stmt.bindLong(65, freeLongTime);
}
java.util.Date freePeriodBegin = entity.getFreePeriodBegin(); java.util.Date freePeriodBegin = entity.getFreePeriodBegin();
if (freePeriodBegin != null) { if (freePeriodBegin != null) {
stmt.bindLong(66, freePeriodBegin.getTime()); stmt.bindLong(66, freePeriodBegin.getTime());
} }
stmt.bindLong(67, entity.getIsStatistic());
Long isStatistic = entity.getIsStatistic();
if (isStatistic != null) {
stmt.bindLong(67, isStatistic);
}
} }
@Override @Override
...@@ -870,72 +470,72 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -870,72 +470,72 @@ public class FoodDao extends AbstractDao<Food, Long> {
public Food readEntity(Cursor cursor, int offset) { public Food readEntity(Cursor cursor, int offset) {
Food entity = new Food( // Food entity = new Food( //
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.getLong(offset + 1), // parentId cursor.getLong(offset + 1), // parentId
cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2), // restaurantId cursor.getLong(offset + 2), // restaurantId
cursor.isNull(offset + 3) ? null : (byte) cursor.getShort(offset + 3), // isParent (byte) cursor.getShort(offset + 3), // isParent
cursor.isNull(offset + 4) ? null : cursor.getLong(offset + 4), // seqNo cursor.getLong(offset + 4), // seqNo
cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // foodName cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // foodName
cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // foodName1 cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // foodName1
cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // foodName2 cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // foodName2
cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // plu cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // plu
cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // posFid cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // posFid
cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // foodDesc cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // foodDesc
cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11), // limitAmount cursor.getLong(offset + 11), // limitAmount
cursor.isNull(offset + 12) ? null : cursor.getLong(offset + 12), // limitType cursor.getLong(offset + 12), // limitType
cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13), // foodSummary cursor.getLong(offset + 13), // foodSummary
cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14), // invisible cursor.getLong(offset + 14), // invisible
cursor.isNull(offset + 15) ? null : (byte) cursor.getShort(offset + 15), // autoMod (byte) cursor.getShort(offset + 15), // autoMod
cursor.isNull(offset + 16) ? null : cursor.getDouble(offset + 16), // price cursor.getDouble(offset + 16), // price
cursor.isNull(offset + 17) ? null : cursor.getDouble(offset + 17), // marketPrice cursor.getDouble(offset + 17), // marketPrice
cursor.isNull(offset + 18) ? null : cursor.getDouble(offset + 18), // lunchboxPrice cursor.getDouble(offset + 18), // lunchboxPrice
cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // imgUrlSmall cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // imgUrlSmall
cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // imageurl cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20), // imageurl
cursor.isNull(offset + 21) ? null : cursor.getLong(offset + 21), // riceponInvisible cursor.getLong(offset + 21), // riceponInvisible
cursor.isNull(offset + 22) ? null : cursor.getDouble(offset + 22), // cost cursor.getDouble(offset + 22), // cost
cursor.isNull(offset + 23) ? null : new java.util.Date(cursor.getLong(offset + 23)), // startDate cursor.isNull(offset + 23) ? null : new java.util.Date(cursor.getLong(offset + 23)), // startDate
cursor.isNull(offset + 24) ? null : new java.util.Date(cursor.getLong(offset + 24)), // endDate cursor.isNull(offset + 24) ? null : new java.util.Date(cursor.getLong(offset + 24)), // endDate
cursor.isNull(offset + 25) ? null : cursor.getLong(offset + 25), // like cursor.getLong(offset + 25), // like
cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26), // totalSold cursor.getLong(offset + 26), // totalSold
cursor.isNull(offset + 27) ? null : cursor.getLong(offset + 27), // isSold cursor.getLong(offset + 27), // isSold
cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28), // createBy cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28), // createBy
cursor.isNull(offset + 29) ? null : new java.util.Date(cursor.getLong(offset + 29)), // createTime cursor.isNull(offset + 29) ? null : new java.util.Date(cursor.getLong(offset + 29)), // createTime
cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // updateBy cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // updateBy
cursor.isNull(offset + 31) ? null : new java.util.Date(cursor.getLong(offset + 31)), // updateTime cursor.isNull(offset + 31) ? null : new java.util.Date(cursor.getLong(offset + 31)), // updateTime
cursor.isNull(offset + 32) ? null : cursor.getLong(offset + 32), // periodId cursor.getLong(offset + 32), // periodId
cursor.isNull(offset + 33) ? null : cursor.getLong(offset + 33), // ableDiscount cursor.getLong(offset + 33), // ableDiscount
cursor.isNull(offset + 34) ? null : cursor.getLong(offset + 34), // takeaway cursor.getLong(offset + 34), // takeaway
cursor.isNull(offset + 35) ? null : cursor.getLong(offset + 35), // blueEdit cursor.getLong(offset + 35), // blueEdit
cursor.isNull(offset + 36) ? null : cursor.getLong(offset + 36), // cartEdit cursor.getLong(offset + 36), // cartEdit
cursor.isNull(offset + 37) ? null : cursor.getLong(offset + 37), // autoMerge cursor.getLong(offset + 37), // autoMerge
cursor.isNull(offset + 38) ? null : cursor.getString(offset + 38), // printSeting cursor.isNull(offset + 38) ? null : cursor.getString(offset + 38), // printSeting
cursor.isNull(offset + 39) ? null : cursor.getLong(offset + 39), // isPrintQueueCode cursor.getLong(offset + 39), // isPrintQueueCode
cursor.isNull(offset + 40) ? null : cursor.getLong(offset + 40), // queueHeadId cursor.getLong(offset + 40), // queueHeadId
cursor.isNull(offset + 41) ? null : cursor.getLong(offset + 41), // approve cursor.getLong(offset + 41), // approve
cursor.isNull(offset + 42) ? null : cursor.getLong(offset + 42), // printFont cursor.getLong(offset + 42), // printFont
cursor.isNull(offset + 43) ? null : cursor.getLong(offset + 43), // advPrice cursor.getLong(offset + 43), // advPrice
cursor.isNull(offset + 44) ? null : cursor.getLong(offset + 44), // printToBill cursor.getLong(offset + 44), // printToBill
cursor.isNull(offset + 45) ? null : cursor.getDouble(offset + 45), // pointsAdd cursor.getDouble(offset + 45), // pointsAdd
cursor.isNull(offset + 46) ? null : cursor.getLong(offset + 46), // pointsRatio cursor.getLong(offset + 46), // pointsRatio
cursor.isNull(offset + 47) ? null : cursor.getDouble(offset + 47), // pointsRedeem cursor.getDouble(offset + 47), // pointsRedeem
cursor.isNull(offset + 48) ? null : cursor.getLong(offset + 48), // ktPrintMainItem cursor.getLong(offset + 48), // ktPrintMainItem
cursor.isNull(offset + 49) ? null : cursor.getLong(offset + 49), // ktShowPrice cursor.getLong(offset + 49), // ktShowPrice
cursor.isNull(offset + 50) ? null : cursor.getLong(offset + 50), // printTo cursor.getLong(offset + 50), // printTo
cursor.isNull(offset + 51) ? null : cursor.getLong(offset + 51), // toPax cursor.getLong(offset + 51), // toPax
cursor.isNull(offset + 52) ? null : cursor.getLong(offset + 52), // foodType cursor.getLong(offset + 52), // foodType
cursor.isNull(offset + 53) ? null : cursor.getLong(offset + 53), // majorMainId cursor.getLong(offset + 53), // majorMainId
cursor.isNull(offset + 54) ? null : cursor.getLong(offset + 54), // deptId cursor.getLong(offset + 54), // deptId
cursor.isNull(offset + 55) ? null : (byte) cursor.getShort(offset + 55), // serviceCharge (byte) cursor.getShort(offset + 55), // serviceCharge
cursor.isNull(offset + 56) ? null : cursor.getLong(offset + 56), // colorId cursor.getLong(offset + 56), // colorId
cursor.isNull(offset + 57) ? null : cursor.getLong(offset + 57), // conditions cursor.getLong(offset + 57), // conditions
cursor.isNull(offset + 58) ? null : cursor.getLong(offset + 58), // isRt cursor.getLong(offset + 58), // isRt
cursor.isNull(offset + 59) ? null : cursor.getLong(offset + 59), // deletes cursor.getLong(offset + 59), // deletes
cursor.isNull(offset + 60) ? null : cursor.getLong(offset + 60), // isTimingFood cursor.getLong(offset + 60), // isTimingFood
cursor.isNull(offset + 61) ? null : cursor.getLong(offset + 61), // minLongTime cursor.getLong(offset + 61), // minLongTime
cursor.isNull(offset + 62) ? null : cursor.getLong(offset + 62), // unitTime cursor.getLong(offset + 62), // unitTime
cursor.isNull(offset + 63) ? null : cursor.getDouble(offset + 63), // unitPrice cursor.getDouble(offset + 63), // unitPrice
cursor.isNull(offset + 64) ? null : cursor.getLong(offset + 64), // freeLongTime cursor.getLong(offset + 64), // freeLongTime
cursor.isNull(offset + 65) ? null : new java.util.Date(cursor.getLong(offset + 65)), // freePeriodBegin cursor.isNull(offset + 65) ? null : new java.util.Date(cursor.getLong(offset + 65)), // freePeriodBegin
cursor.isNull(offset + 66) ? null : cursor.getLong(offset + 66) // isStatistic cursor.getLong(offset + 66) // isStatistic
); );
return entity; return entity;
} }
...@@ -943,72 +543,72 @@ public class FoodDao extends AbstractDao<Food, Long> { ...@@ -943,72 +543,72 @@ public class FoodDao extends AbstractDao<Food, Long> {
@Override @Override
public void readEntity(Cursor cursor, Food entity, int offset) { public void readEntity(Cursor cursor, Food 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.setParentId(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1)); entity.setParentId(cursor.getLong(offset + 1));
entity.setRestaurantId(cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2)); entity.setRestaurantId(cursor.getLong(offset + 2));
entity.setIsParent(cursor.isNull(offset + 3) ? null : (byte) cursor.getShort(offset + 3)); entity.setIsParent((byte) cursor.getShort(offset + 3));
entity.setSeqNo(cursor.isNull(offset + 4) ? null : cursor.getLong(offset + 4)); entity.setSeqNo(cursor.getLong(offset + 4));
entity.setFoodName(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5)); entity.setFoodName(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
entity.setFoodName1(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6)); entity.setFoodName1(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
entity.setFoodName2(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7)); entity.setFoodName2(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
entity.setPlu(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8)); entity.setPlu(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));
entity.setPosFid(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setPosFid(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9));
entity.setFoodDesc(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setFoodDesc(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10));
entity.setLimitAmount(cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11)); entity.setLimitAmount(cursor.getLong(offset + 11));
entity.setLimitType(cursor.isNull(offset + 12) ? null : cursor.getLong(offset + 12)); entity.setLimitType(cursor.getLong(offset + 12));
entity.setFoodSummary(cursor.isNull(offset + 13) ? null : cursor.getLong(offset + 13)); entity.setFoodSummary(cursor.getLong(offset + 13));
entity.setInvisible(cursor.isNull(offset + 14) ? null : cursor.getLong(offset + 14)); entity.setInvisible(cursor.getLong(offset + 14));
entity.setAutoMod(cursor.isNull(offset + 15) ? null : (byte) cursor.getShort(offset + 15)); entity.setAutoMod((byte) cursor.getShort(offset + 15));
entity.setPrice(cursor.isNull(offset + 16) ? null : cursor.getDouble(offset + 16)); entity.setPrice(cursor.getDouble(offset + 16));
entity.setMarketPrice(cursor.isNull(offset + 17) ? null : cursor.getDouble(offset + 17)); entity.setMarketPrice(cursor.getDouble(offset + 17));
entity.setLunchboxPrice(cursor.isNull(offset + 18) ? null : cursor.getDouble(offset + 18)); entity.setLunchboxPrice(cursor.getDouble(offset + 18));
entity.setImgUrlSmall(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19)); entity.setImgUrlSmall(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
entity.setImageurl(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20)); entity.setImageurl(cursor.isNull(offset + 20) ? null : cursor.getString(offset + 20));
entity.setRiceponInvisible(cursor.isNull(offset + 21) ? null : cursor.getLong(offset + 21)); entity.setRiceponInvisible(cursor.getLong(offset + 21));
entity.setCost(cursor.isNull(offset + 22) ? null : cursor.getDouble(offset + 22)); entity.setCost(cursor.getDouble(offset + 22));
entity.setStartDate(cursor.isNull(offset + 23) ? null : new java.util.Date(cursor.getLong(offset + 23))); entity.setStartDate(cursor.isNull(offset + 23) ? null : new java.util.Date(cursor.getLong(offset + 23)));
entity.setEndDate(cursor.isNull(offset + 24) ? null : new java.util.Date(cursor.getLong(offset + 24))); entity.setEndDate(cursor.isNull(offset + 24) ? null : new java.util.Date(cursor.getLong(offset + 24)));
entity.setLike(cursor.isNull(offset + 25) ? null : cursor.getLong(offset + 25)); entity.setLike(cursor.getLong(offset + 25));
entity.setTotalSold(cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26)); entity.setTotalSold(cursor.getLong(offset + 26));
entity.setIsSold(cursor.isNull(offset + 27) ? null : cursor.getLong(offset + 27)); entity.setIsSold(cursor.getLong(offset + 27));
entity.setCreateBy(cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28)); entity.setCreateBy(cursor.isNull(offset + 28) ? null : cursor.getString(offset + 28));
entity.setCreateTime(cursor.isNull(offset + 29) ? null : new java.util.Date(cursor.getLong(offset + 29))); entity.setCreateTime(cursor.isNull(offset + 29) ? null : new java.util.Date(cursor.getLong(offset + 29)));
entity.setUpdateBy(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30)); entity.setUpdateBy(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30));
entity.setUpdateTime(cursor.isNull(offset + 31) ? null : new java.util.Date(cursor.getLong(offset + 31))); entity.setUpdateTime(cursor.isNull(offset + 31) ? null : new java.util.Date(cursor.getLong(offset + 31)));
entity.setPeriodId(cursor.isNull(offset + 32) ? null : cursor.getLong(offset + 32)); entity.setPeriodId(cursor.getLong(offset + 32));
entity.setAbleDiscount(cursor.isNull(offset + 33) ? null : cursor.getLong(offset + 33)); entity.setAbleDiscount(cursor.getLong(offset + 33));
entity.setTakeaway(cursor.isNull(offset + 34) ? null : cursor.getLong(offset + 34)); entity.setTakeaway(cursor.getLong(offset + 34));
entity.setBlueEdit(cursor.isNull(offset + 35) ? null : cursor.getLong(offset + 35)); entity.setBlueEdit(cursor.getLong(offset + 35));
entity.setCartEdit(cursor.isNull(offset + 36) ? null : cursor.getLong(offset + 36)); entity.setCartEdit(cursor.getLong(offset + 36));
entity.setAutoMerge(cursor.isNull(offset + 37) ? null : cursor.getLong(offset + 37)); entity.setAutoMerge(cursor.getLong(offset + 37));
entity.setPrintSeting(cursor.isNull(offset + 38) ? null : cursor.getString(offset + 38)); entity.setPrintSeting(cursor.isNull(offset + 38) ? null : cursor.getString(offset + 38));
entity.setIsPrintQueueCode(cursor.isNull(offset + 39) ? null : cursor.getLong(offset + 39)); entity.setIsPrintQueueCode(cursor.getLong(offset + 39));
entity.setQueueHeadId(cursor.isNull(offset + 40) ? null : cursor.getLong(offset + 40)); entity.setQueueHeadId(cursor.getLong(offset + 40));
entity.setApprove(cursor.isNull(offset + 41) ? null : cursor.getLong(offset + 41)); entity.setApprove(cursor.getLong(offset + 41));
entity.setPrintFont(cursor.isNull(offset + 42) ? null : cursor.getLong(offset + 42)); entity.setPrintFont(cursor.getLong(offset + 42));
entity.setAdvPrice(cursor.isNull(offset + 43) ? null : cursor.getLong(offset + 43)); entity.setAdvPrice(cursor.getLong(offset + 43));
entity.setPrintToBill(cursor.isNull(offset + 44) ? null : cursor.getLong(offset + 44)); entity.setPrintToBill(cursor.getLong(offset + 44));
entity.setPointsAdd(cursor.isNull(offset + 45) ? null : cursor.getDouble(offset + 45)); entity.setPointsAdd(cursor.getDouble(offset + 45));
entity.setPointsRatio(cursor.isNull(offset + 46) ? null : cursor.getLong(offset + 46)); entity.setPointsRatio(cursor.getLong(offset + 46));
entity.setPointsRedeem(cursor.isNull(offset + 47) ? null : cursor.getDouble(offset + 47)); entity.setPointsRedeem(cursor.getDouble(offset + 47));
entity.setKtPrintMainItem(cursor.isNull(offset + 48) ? null : cursor.getLong(offset + 48)); entity.setKtPrintMainItem(cursor.getLong(offset + 48));
entity.setKtShowPrice(cursor.isNull(offset + 49) ? null : cursor.getLong(offset + 49)); entity.setKtShowPrice(cursor.getLong(offset + 49));
entity.setPrintTo(cursor.isNull(offset + 50) ? null : cursor.getLong(offset + 50)); entity.setPrintTo(cursor.getLong(offset + 50));
entity.setToPax(cursor.isNull(offset + 51) ? null : cursor.getLong(offset + 51)); entity.setToPax(cursor.getLong(offset + 51));
entity.setFoodType(cursor.isNull(offset + 52) ? null : cursor.getLong(offset + 52)); entity.setFoodType(cursor.getLong(offset + 52));
entity.setMajorMainId(cursor.isNull(offset + 53) ? null : cursor.getLong(offset + 53)); entity.setMajorMainId(cursor.getLong(offset + 53));
entity.setDeptId(cursor.isNull(offset + 54) ? null : cursor.getLong(offset + 54)); entity.setDeptId(cursor.getLong(offset + 54));
entity.setServiceCharge(cursor.isNull(offset + 55) ? null : (byte) cursor.getShort(offset + 55)); entity.setServiceCharge((byte) cursor.getShort(offset + 55));
entity.setColorId(cursor.isNull(offset + 56) ? null : cursor.getLong(offset + 56)); entity.setColorId(cursor.getLong(offset + 56));
entity.setConditions(cursor.isNull(offset + 57) ? null : cursor.getLong(offset + 57)); entity.setConditions(cursor.getLong(offset + 57));
entity.setIsRt(cursor.isNull(offset + 58) ? null : cursor.getLong(offset + 58)); entity.setIsRt(cursor.getLong(offset + 58));
entity.setDeletes(cursor.isNull(offset + 59) ? null : cursor.getLong(offset + 59)); entity.setDeletes(cursor.getLong(offset + 59));
entity.setIsTimingFood(cursor.isNull(offset + 60) ? null : cursor.getLong(offset + 60)); entity.setIsTimingFood(cursor.getLong(offset + 60));
entity.setMinLongTime(cursor.isNull(offset + 61) ? null : cursor.getLong(offset + 61)); entity.setMinLongTime(cursor.getLong(offset + 61));
entity.setUnitTime(cursor.isNull(offset + 62) ? null : cursor.getLong(offset + 62)); entity.setUnitTime(cursor.getLong(offset + 62));
entity.setUnitPrice(cursor.isNull(offset + 63) ? null : cursor.getDouble(offset + 63)); entity.setUnitPrice(cursor.getDouble(offset + 63));
entity.setFreeLongTime(cursor.isNull(offset + 64) ? null : cursor.getLong(offset + 64)); entity.setFreeLongTime(cursor.getLong(offset + 64));
entity.setFreePeriodBegin(cursor.isNull(offset + 65) ? null : new java.util.Date(cursor.getLong(offset + 65))); entity.setFreePeriodBegin(cursor.isNull(offset + 65) ? null : new java.util.Date(cursor.getLong(offset + 65)));
entity.setIsStatistic(cursor.isNull(offset + 66) ? null : cursor.getLong(offset + 66)); entity.setIsStatistic(cursor.getLong(offset + 66));
} }
@Override @Override
......
public-base/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ModifierDao.java
...@@ -25,54 +25,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -25,54 +25,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
*/ */
public static class Properties { public static class Properties {
public final static Property Dbid = new Property(0, Long.class, "dbid", true, "_id"); public final static Property Dbid = new Property(0, Long.class, "dbid", true, "_id");
public final static Property Mid = new Property(1, Long.class, "mid", false, "MID"); public final static Property Mid = new Property(1, long.class, "mid", false, "MID");
public final static Property TopId = new Property(2, Long.class, "topId", false, "TOP_ID"); public final static Property TopId = new Property(2, long.class, "topId", false, "TOP_ID");
public final static Property RestaurantId = new Property(3, Long.class, "restaurantId", false, "RESTAURANT_ID"); public final static Property RestaurantId = new Property(3, long.class, "restaurantId", false, "RESTAURANT_ID");
public final static Property ModifierName = new Property(4, String.class, "modifierName", false, "MODIFIER_NAME"); public final static Property ModifierName = new Property(4, String.class, "modifierName", false, "MODIFIER_NAME");
public final static Property SeqNo = new Property(5, Long.class, "seqNo", false, "SEQ_NO"); public final static Property SeqNo = new Property(5, long.class, "seqNo", false, "SEQ_NO");
public final static Property MarketPrice = new Property(6, Double.class, "marketPrice", false, "MARKET_PRICE"); public final static Property MarketPrice = new Property(6, double.class, "marketPrice", false, "MARKET_PRICE");
public final static Property Price = new Property(7, Double.class, "price", false, "PRICE"); public final static Property Price = new Property(7, double.class, "price", false, "PRICE");
public final static Property LunchboxPrice = new Property(8, Double.class, "lunchboxPrice", false, "LUNCHBOX_PRICE"); public final static Property LunchboxPrice = new Property(8, double.class, "lunchboxPrice", false, "LUNCHBOX_PRICE");
public final static Property ColorId = new Property(9, Long.class, "colorId", false, "COLOR_ID"); public final static Property ColorId = new Property(9, long.class, "colorId", false, "COLOR_ID");
public final static Property ImageUrl = new Property(10, String.class, "imageUrl", false, "IMAGE_URL"); public final static Property ImageUrl = new Property(10, String.class, "imageUrl", false, "IMAGE_URL");
public final static Property Invisible = new Property(11, Long.class, "invisible", false, "INVISIBLE"); public final static Property Invisible = new Property(11, long.class, "invisible", false, "INVISIBLE");
public final static Property Cost = new Property(12, Double.class, "cost", false, "COST"); public final static Property Cost = new Property(12, double.class, "cost", false, "COST");
public final static Property StartDate = new Property(13, java.util.Date.class, "startDate", false, "START_DATE"); public final static Property StartDate = new Property(13, java.util.Date.class, "startDate", false, "START_DATE");
public final static Property EndDate = new Property(14, java.util.Date.class, "endDate", false, "END_DATE"); public final static Property EndDate = new Property(14, java.util.Date.class, "endDate", false, "END_DATE");
public final static Property Like = new Property(15, Long.class, "like", false, "LIKE"); public final static Property Like = new Property(15, long.class, "like", false, "LIKE");
public final static Property TotalSold = new Property(16, Long.class, "totalSold", false, "TOTAL_SOLD"); public final static Property TotalSold = new Property(16, long.class, "totalSold", false, "TOTAL_SOLD");
public final static Property MajorMainId = new Property(17, Long.class, "majorMainId", false, "MAJOR_MAIN_ID"); public final static Property MajorMainId = new Property(17, long.class, "majorMainId", false, "MAJOR_MAIN_ID");
public final static Property DeptId = new Property(18, Long.class, "deptId", false, "DEPT_ID"); public final static Property DeptId = new Property(18, long.class, "deptId", false, "DEPT_ID");
public final static Property CreateBy = new Property(19, String.class, "createBy", false, "CREATE_BY"); public final static Property CreateBy = new Property(19, String.class, "createBy", false, "CREATE_BY");
public final static Property CreateTime = new Property(20, java.util.Date.class, "createTime", false, "CREATE_TIME"); public final static Property CreateTime = new Property(20, java.util.Date.class, "createTime", false, "CREATE_TIME");
public final static Property UpdateBy = new Property(21, String.class, "updateBy", false, "UPDATE_BY"); public final static Property UpdateBy = new Property(21, String.class, "updateBy", false, "UPDATE_BY");
public final static Property UpdateTime = new Property(22, java.util.Date.class, "updateTime", false, "UPDATE_TIME"); public final static Property UpdateTime = new Property(22, java.util.Date.class, "updateTime", false, "UPDATE_TIME");
public final static Property PosFid = new Property(23, String.class, "posFid", false, "POS_FID"); public final static Property PosFid = new Property(23, String.class, "posFid", false, "POS_FID");
public final static Property PId = new Property(24, String.class, "pId", false, "P_ID"); public final static Property PId = new Property(24, String.class, "pId", false, "P_ID");
public final static Property AutoMod = new Property(25, Long.class, "autoMod", false, "AUTO_MOD"); public final static Property AutoMod = new Property(25, long.class, "autoMod", false, "AUTO_MOD");
public final static Property BlueEdit = new Property(26, Long.class, "blueEdit", false, "BLUE_EDIT"); public final static Property BlueEdit = new Property(26, long.class, "blueEdit", false, "BLUE_EDIT");
public final static Property AutoMerge = new Property(27, Long.class, "autoMerge", false, "AUTO_MERGE"); public final static Property AutoMerge = new Property(27, long.class, "autoMerge", false, "AUTO_MERGE");
public final static Property CustomMsg = new Property(28, Long.class, "customMsg", false, "CUSTOM_MSG"); public final static Property CustomMsg = new Property(28, long.class, "customMsg", false, "CUSTOM_MSG");
public final static Property IsParent = new Property(29, Long.class, "isParent", false, "IS_PARENT"); public final static Property IsParent = new Property(29, long.class, "isParent", false, "IS_PARENT");
public final static Property ModifierName1 = new Property(30, String.class, "modifierName1", false, "MODIFIER_NAME1"); public final static Property ModifierName1 = new Property(30, String.class, "modifierName1", false, "MODIFIER_NAME1");
public final static Property ModifierName2 = new Property(31, String.class, "modifierName2", false, "MODIFIER_NAME2"); public final static Property ModifierName2 = new Property(31, String.class, "modifierName2", false, "MODIFIER_NAME2");
public final static Property Multiple = new Property(32, Double.class, "multiple", false, "MULTIPLE"); public final static Property Multiple = new Property(32, double.class, "multiple", false, "MULTIPLE");
public final static Property PrintSet = new Property(33, String.class, "printSet", false, "PRINT_SET"); public final static Property PrintSet = new Property(33, String.class, "printSet", false, "PRINT_SET");
public final static Property KtSetting = new Property(34, String.class, "ktSetting", false, "KT_SETTING"); public final static Property KtSetting = new Property(34, String.class, "ktSetting", false, "KT_SETTING");
public final static Property ModComm = new Property(35, Long.class, "modComm", false, "MOD_COMM"); public final static Property ModComm = new Property(35, long.class, "modComm", false, "MOD_COMM");
public final static Property ModTaste = new Property(36, Long.class, "modTaste", false, "MOD_TASTE"); public final static Property ModTaste = new Property(36, long.class, "modTaste", false, "MOD_TASTE");
public final static Property ModMsg = new Property(37, Long.class, "modMsg", false, "MOD_MSG"); public final static Property ModMsg = new Property(37, long.class, "modMsg", false, "MOD_MSG");
public final static Property KtFireCourse = new Property(38, Long.class, "ktFireCourse", false, "KT_FIRE_COURSE"); public final static Property KtFireCourse = new Property(38, long.class, "ktFireCourse", false, "KT_FIRE_COURSE");
public final static Property AbleDisCount = new Property(39, Long.class, "ableDisCount", false, "ABLE_DIS_COUNT"); public final static Property AbleDisCount = new Property(39, long.class, "ableDisCount", false, "ABLE_DIS_COUNT");
public final static Property PrintToBill = new Property(40, Long.class, "printToBill", false, "PRINT_TO_BILL"); public final static Property PrintToBill = new Property(40, long.class, "printToBill", false, "PRINT_TO_BILL");
public final static Property KtPrintMainItem = new Property(41, Long.class, "ktPrintMainItem", false, "KT_PRINT_MAIN_ITEM"); public final static Property KtPrintMainItem = new Property(41, long.class, "ktPrintMainItem", false, "KT_PRINT_MAIN_ITEM");
public final static Property KtShowPrice = new Property(42, Long.class, "ktShowPrice", false, "KT_SHOW_PRICE"); public final static Property KtShowPrice = new Property(42, long.class, "ktShowPrice", false, "KT_SHOW_PRICE");
public final static Property KtFont = new Property(43, Long.class, "ktFont", false, "KT_FONT"); public final static Property KtFont = new Property(43, long.class, "ktFont", false, "KT_FONT");
public final static Property Conditions = new Property(44, Long.class, "conditions", false, "CONDITIONS"); public final static Property Conditions = new Property(44, long.class, "conditions", false, "CONDITIONS");
public final static Property IsRt = new Property(45, Long.class, "isRt", false, "IS_RT"); public final static Property IsRt = new Property(45, long.class, "isRt", false, "IS_RT");
public final static Property Visible = new Property(46, Byte.class, "visible", false, "VISIBLE"); public final static Property Visible = new Property(46, byte.class, "visible", false, "VISIBLE");
public final static Property Deletes = new Property(47, Long.class, "deletes", false, "DELETES"); public final static Property Deletes = new Property(47, long.class, "deletes", false, "DELETES");
public final static Property IsStatistic = new Property(48, Long.class, "isStatistic", false, "IS_STATISTIC"); public final static Property IsStatistic = new Property(48, long.class, "isStatistic", false, "IS_STATISTIC");
} }
...@@ -89,54 +89,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -89,54 +89,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
String constraint = ifNotExists? "IF NOT EXISTS ": ""; String constraint = ifNotExists? "IF NOT EXISTS ": "";
db.execSQL("CREATE TABLE " + constraint + "\"MODIFIER\" (" + // db.execSQL("CREATE TABLE " + constraint + "\"MODIFIER\" (" + //
"\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: dbid "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: dbid
"\"MID\" INTEGER," + // 1: mid "\"MID\" INTEGER NOT NULL ," + // 1: mid
"\"TOP_ID\" INTEGER," + // 2: topId "\"TOP_ID\" INTEGER NOT NULL ," + // 2: topId
"\"RESTAURANT_ID\" INTEGER," + // 3: restaurantId "\"RESTAURANT_ID\" INTEGER NOT NULL ," + // 3: restaurantId
"\"MODIFIER_NAME\" TEXT," + // 4: modifierName "\"MODIFIER_NAME\" TEXT," + // 4: modifierName
"\"SEQ_NO\" INTEGER," + // 5: seqNo "\"SEQ_NO\" INTEGER NOT NULL ," + // 5: seqNo
"\"MARKET_PRICE\" REAL," + // 6: marketPrice "\"MARKET_PRICE\" REAL NOT NULL ," + // 6: marketPrice
"\"PRICE\" REAL," + // 7: price "\"PRICE\" REAL NOT NULL ," + // 7: price
"\"LUNCHBOX_PRICE\" REAL," + // 8: lunchboxPrice "\"LUNCHBOX_PRICE\" REAL NOT NULL ," + // 8: lunchboxPrice
"\"COLOR_ID\" INTEGER," + // 9: colorId "\"COLOR_ID\" INTEGER NOT NULL ," + // 9: colorId
"\"IMAGE_URL\" TEXT," + // 10: imageUrl "\"IMAGE_URL\" TEXT," + // 10: imageUrl
"\"INVISIBLE\" INTEGER," + // 11: invisible "\"INVISIBLE\" INTEGER NOT NULL ," + // 11: invisible
"\"COST\" REAL," + // 12: cost "\"COST\" REAL NOT NULL ," + // 12: cost
"\"START_DATE\" INTEGER," + // 13: startDate "\"START_DATE\" INTEGER," + // 13: startDate
"\"END_DATE\" INTEGER," + // 14: endDate "\"END_DATE\" INTEGER," + // 14: endDate
"\"LIKE\" INTEGER," + // 15: like "\"LIKE\" INTEGER NOT NULL ," + // 15: like
"\"TOTAL_SOLD\" INTEGER," + // 16: totalSold "\"TOTAL_SOLD\" INTEGER NOT NULL ," + // 16: totalSold
"\"MAJOR_MAIN_ID\" INTEGER," + // 17: majorMainId "\"MAJOR_MAIN_ID\" INTEGER NOT NULL ," + // 17: majorMainId
"\"DEPT_ID\" INTEGER," + // 18: deptId "\"DEPT_ID\" INTEGER NOT NULL ," + // 18: deptId
"\"CREATE_BY\" TEXT," + // 19: createBy "\"CREATE_BY\" TEXT," + // 19: createBy
"\"CREATE_TIME\" INTEGER," + // 20: createTime "\"CREATE_TIME\" INTEGER," + // 20: createTime
"\"UPDATE_BY\" TEXT," + // 21: updateBy "\"UPDATE_BY\" TEXT," + // 21: updateBy
"\"UPDATE_TIME\" INTEGER," + // 22: updateTime "\"UPDATE_TIME\" INTEGER," + // 22: updateTime
"\"POS_FID\" TEXT," + // 23: posFid "\"POS_FID\" TEXT," + // 23: posFid
"\"P_ID\" TEXT," + // 24: pId "\"P_ID\" TEXT," + // 24: pId
"\"AUTO_MOD\" INTEGER," + // 25: autoMod "\"AUTO_MOD\" INTEGER NOT NULL ," + // 25: autoMod
"\"BLUE_EDIT\" INTEGER," + // 26: blueEdit "\"BLUE_EDIT\" INTEGER NOT NULL ," + // 26: blueEdit
"\"AUTO_MERGE\" INTEGER," + // 27: autoMerge "\"AUTO_MERGE\" INTEGER NOT NULL ," + // 27: autoMerge
"\"CUSTOM_MSG\" INTEGER," + // 28: customMsg "\"CUSTOM_MSG\" INTEGER NOT NULL ," + // 28: customMsg
"\"IS_PARENT\" INTEGER," + // 29: isParent "\"IS_PARENT\" INTEGER NOT NULL ," + // 29: isParent
"\"MODIFIER_NAME1\" TEXT," + // 30: modifierName1 "\"MODIFIER_NAME1\" TEXT," + // 30: modifierName1
"\"MODIFIER_NAME2\" TEXT," + // 31: modifierName2 "\"MODIFIER_NAME2\" TEXT," + // 31: modifierName2
"\"MULTIPLE\" REAL," + // 32: multiple "\"MULTIPLE\" REAL NOT NULL ," + // 32: multiple
"\"PRINT_SET\" TEXT," + // 33: printSet "\"PRINT_SET\" TEXT," + // 33: printSet
"\"KT_SETTING\" TEXT," + // 34: ktSetting "\"KT_SETTING\" TEXT," + // 34: ktSetting
"\"MOD_COMM\" INTEGER," + // 35: modComm "\"MOD_COMM\" INTEGER NOT NULL ," + // 35: modComm
"\"MOD_TASTE\" INTEGER," + // 36: modTaste "\"MOD_TASTE\" INTEGER NOT NULL ," + // 36: modTaste
"\"MOD_MSG\" INTEGER," + // 37: modMsg "\"MOD_MSG\" INTEGER NOT NULL ," + // 37: modMsg
"\"KT_FIRE_COURSE\" INTEGER," + // 38: ktFireCourse "\"KT_FIRE_COURSE\" INTEGER NOT NULL ," + // 38: ktFireCourse
"\"ABLE_DIS_COUNT\" INTEGER," + // 39: ableDisCount "\"ABLE_DIS_COUNT\" INTEGER NOT NULL ," + // 39: ableDisCount
"\"PRINT_TO_BILL\" INTEGER," + // 40: printToBill "\"PRINT_TO_BILL\" INTEGER NOT NULL ," + // 40: printToBill
"\"KT_PRINT_MAIN_ITEM\" INTEGER," + // 41: ktPrintMainItem "\"KT_PRINT_MAIN_ITEM\" INTEGER NOT NULL ," + // 41: ktPrintMainItem
"\"KT_SHOW_PRICE\" INTEGER," + // 42: ktShowPrice "\"KT_SHOW_PRICE\" INTEGER NOT NULL ," + // 42: ktShowPrice
"\"KT_FONT\" INTEGER," + // 43: ktFont "\"KT_FONT\" INTEGER NOT NULL ," + // 43: ktFont
"\"CONDITIONS\" INTEGER," + // 44: conditions "\"CONDITIONS\" INTEGER NOT NULL ," + // 44: conditions
"\"IS_RT\" INTEGER," + // 45: isRt "\"IS_RT\" INTEGER NOT NULL ," + // 45: isRt
"\"VISIBLE\" INTEGER," + // 46: visible "\"VISIBLE\" INTEGER NOT NULL ," + // 46: visible
"\"DELETES\" INTEGER," + // 47: deletes "\"DELETES\" INTEGER NOT NULL ," + // 47: deletes
"\"IS_STATISTIC\" INTEGER);"); // 48: isStatistic "\"IS_STATISTIC\" INTEGER NOT NULL );"); // 48: isStatistic
} }
/** Drops the underlying database table. */ /** Drops the underlying database table. */
...@@ -153,66 +153,26 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -153,66 +153,26 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (dbid != null) { if (dbid != null) {
stmt.bindLong(1, dbid); stmt.bindLong(1, dbid);
} }
stmt.bindLong(2, entity.getMid());
Long mid = entity.getMid(); stmt.bindLong(3, entity.getTopId());
if (mid != null) { stmt.bindLong(4, entity.getRestaurantId());
stmt.bindLong(2, mid);
}
Long topId = entity.getTopId();
if (topId != null) {
stmt.bindLong(3, topId);
}
Long restaurantId = entity.getRestaurantId();
if (restaurantId != null) {
stmt.bindLong(4, restaurantId);
}
String modifierName = entity.getModifierName(); String modifierName = entity.getModifierName();
if (modifierName != null) { if (modifierName != null) {
stmt.bindString(5, modifierName); stmt.bindString(5, modifierName);
} }
stmt.bindLong(6, entity.getSeqNo());
Long seqNo = entity.getSeqNo(); stmt.bindDouble(7, entity.getMarketPrice());
if (seqNo != null) { stmt.bindDouble(8, entity.getPrice());
stmt.bindLong(6, seqNo); stmt.bindDouble(9, entity.getLunchboxPrice());
} stmt.bindLong(10, entity.getColorId());
Double marketPrice = entity.getMarketPrice();
if (marketPrice != null) {
stmt.bindDouble(7, marketPrice);
}
Double price = entity.getPrice();
if (price != null) {
stmt.bindDouble(8, price);
}
Double lunchboxPrice = entity.getLunchboxPrice();
if (lunchboxPrice != null) {
stmt.bindDouble(9, lunchboxPrice);
}
Long colorId = entity.getColorId();
if (colorId != null) {
stmt.bindLong(10, colorId);
}
String imageUrl = entity.getImageUrl(); String imageUrl = entity.getImageUrl();
if (imageUrl != null) { if (imageUrl != null) {
stmt.bindString(11, imageUrl); stmt.bindString(11, imageUrl);
} }
stmt.bindLong(12, entity.getInvisible());
Long invisible = entity.getInvisible(); stmt.bindDouble(13, entity.getCost());
if (invisible != null) {
stmt.bindLong(12, invisible);
}
Double cost = entity.getCost();
if (cost != null) {
stmt.bindDouble(13, cost);
}
java.util.Date startDate = entity.getStartDate(); java.util.Date startDate = entity.getStartDate();
if (startDate != null) { if (startDate != null) {
...@@ -223,26 +183,10 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -223,26 +183,10 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (endDate != null) { if (endDate != null) {
stmt.bindLong(15, endDate.getTime()); stmt.bindLong(15, endDate.getTime());
} }
stmt.bindLong(16, entity.getLike());
Long like = entity.getLike(); stmt.bindLong(17, entity.getTotalSold());
if (like != null) { stmt.bindLong(18, entity.getMajorMainId());
stmt.bindLong(16, like); stmt.bindLong(19, entity.getDeptId());
}
Long totalSold = entity.getTotalSold();
if (totalSold != null) {
stmt.bindLong(17, totalSold);
}
Long majorMainId = entity.getMajorMainId();
if (majorMainId != null) {
stmt.bindLong(18, majorMainId);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(19, deptId);
}
String createBy = entity.getCreateBy(); String createBy = entity.getCreateBy();
if (createBy != null) { if (createBy != null) {
...@@ -273,31 +217,11 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -273,31 +217,11 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (pId != null) { if (pId != null) {
stmt.bindString(25, pId); stmt.bindString(25, pId);
} }
stmt.bindLong(26, entity.getAutoMod());
Long autoMod = entity.getAutoMod(); stmt.bindLong(27, entity.getBlueEdit());
if (autoMod != null) { stmt.bindLong(28, entity.getAutoMerge());
stmt.bindLong(26, autoMod); stmt.bindLong(29, entity.getCustomMsg());
} stmt.bindLong(30, entity.getIsParent());
Long blueEdit = entity.getBlueEdit();
if (blueEdit != null) {
stmt.bindLong(27, blueEdit);
}
Long autoMerge = entity.getAutoMerge();
if (autoMerge != null) {
stmt.bindLong(28, autoMerge);
}
Long customMsg = entity.getCustomMsg();
if (customMsg != null) {
stmt.bindLong(29, customMsg);
}
Long isParent = entity.getIsParent();
if (isParent != null) {
stmt.bindLong(30, isParent);
}
String modifierName1 = entity.getModifierName1(); String modifierName1 = entity.getModifierName1();
if (modifierName1 != null) { if (modifierName1 != null) {
...@@ -308,11 +232,7 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -308,11 +232,7 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (modifierName2 != null) { if (modifierName2 != null) {
stmt.bindString(32, modifierName2); stmt.bindString(32, modifierName2);
} }
stmt.bindDouble(33, entity.getMultiple());
Double multiple = entity.getMultiple();
if (multiple != null) {
stmt.bindDouble(33, multiple);
}
String printSet = entity.getPrintSet(); String printSet = entity.getPrintSet();
if (printSet != null) { if (printSet != null) {
...@@ -323,76 +243,20 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -323,76 +243,20 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (ktSetting != null) { if (ktSetting != null) {
stmt.bindString(35, ktSetting); stmt.bindString(35, ktSetting);
} }
stmt.bindLong(36, entity.getModComm());
Long modComm = entity.getModComm(); stmt.bindLong(37, entity.getModTaste());
if (modComm != null) { stmt.bindLong(38, entity.getModMsg());
stmt.bindLong(36, modComm); stmt.bindLong(39, entity.getKtFireCourse());
} stmt.bindLong(40, entity.getAbleDisCount());
stmt.bindLong(41, entity.getPrintToBill());
Long modTaste = entity.getModTaste(); stmt.bindLong(42, entity.getKtPrintMainItem());
if (modTaste != null) { stmt.bindLong(43, entity.getKtShowPrice());
stmt.bindLong(37, modTaste); stmt.bindLong(44, entity.getKtFont());
} stmt.bindLong(45, entity.getConditions());
stmt.bindLong(46, entity.getIsRt());
Long modMsg = entity.getModMsg(); stmt.bindLong(47, entity.getVisible());
if (modMsg != null) { stmt.bindLong(48, entity.getDeletes());
stmt.bindLong(38, modMsg); stmt.bindLong(49, entity.getIsStatistic());
}
Long ktFireCourse = entity.getKtFireCourse();
if (ktFireCourse != null) {
stmt.bindLong(39, ktFireCourse);
}
Long ableDisCount = entity.getAbleDisCount();
if (ableDisCount != null) {
stmt.bindLong(40, ableDisCount);
}
Long printToBill = entity.getPrintToBill();
if (printToBill != null) {
stmt.bindLong(41, printToBill);
}
Long ktPrintMainItem = entity.getKtPrintMainItem();
if (ktPrintMainItem != null) {
stmt.bindLong(42, ktPrintMainItem);
}
Long ktShowPrice = entity.getKtShowPrice();
if (ktShowPrice != null) {
stmt.bindLong(43, ktShowPrice);
}
Long ktFont = entity.getKtFont();
if (ktFont != null) {
stmt.bindLong(44, ktFont);
}
Long conditions = entity.getConditions();
if (conditions != null) {
stmt.bindLong(45, conditions);
}
Long isRt = entity.getIsRt();
if (isRt != null) {
stmt.bindLong(46, isRt);
}
Byte visible = entity.getVisible();
if (visible != null) {
stmt.bindLong(47, visible);
}
Long deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(48, deletes);
}
Long isStatistic = entity.getIsStatistic();
if (isStatistic != null) {
stmt.bindLong(49, isStatistic);
}
} }
@Override @Override
...@@ -403,66 +267,26 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -403,66 +267,26 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (dbid != null) { if (dbid != null) {
stmt.bindLong(1, dbid); stmt.bindLong(1, dbid);
} }
stmt.bindLong(2, entity.getMid());
Long mid = entity.getMid(); stmt.bindLong(3, entity.getTopId());
if (mid != null) { stmt.bindLong(4, entity.getRestaurantId());
stmt.bindLong(2, mid);
}
Long topId = entity.getTopId();
if (topId != null) {
stmt.bindLong(3, topId);
}
Long restaurantId = entity.getRestaurantId();
if (restaurantId != null) {
stmt.bindLong(4, restaurantId);
}
String modifierName = entity.getModifierName(); String modifierName = entity.getModifierName();
if (modifierName != null) { if (modifierName != null) {
stmt.bindString(5, modifierName); stmt.bindString(5, modifierName);
} }
stmt.bindLong(6, entity.getSeqNo());
Long seqNo = entity.getSeqNo(); stmt.bindDouble(7, entity.getMarketPrice());
if (seqNo != null) { stmt.bindDouble(8, entity.getPrice());
stmt.bindLong(6, seqNo); stmt.bindDouble(9, entity.getLunchboxPrice());
} stmt.bindLong(10, entity.getColorId());
Double marketPrice = entity.getMarketPrice();
if (marketPrice != null) {
stmt.bindDouble(7, marketPrice);
}
Double price = entity.getPrice();
if (price != null) {
stmt.bindDouble(8, price);
}
Double lunchboxPrice = entity.getLunchboxPrice();
if (lunchboxPrice != null) {
stmt.bindDouble(9, lunchboxPrice);
}
Long colorId = entity.getColorId();
if (colorId != null) {
stmt.bindLong(10, colorId);
}
String imageUrl = entity.getImageUrl(); String imageUrl = entity.getImageUrl();
if (imageUrl != null) { if (imageUrl != null) {
stmt.bindString(11, imageUrl); stmt.bindString(11, imageUrl);
} }
stmt.bindLong(12, entity.getInvisible());
Long invisible = entity.getInvisible(); stmt.bindDouble(13, entity.getCost());
if (invisible != null) {
stmt.bindLong(12, invisible);
}
Double cost = entity.getCost();
if (cost != null) {
stmt.bindDouble(13, cost);
}
java.util.Date startDate = entity.getStartDate(); java.util.Date startDate = entity.getStartDate();
if (startDate != null) { if (startDate != null) {
...@@ -473,26 +297,10 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -473,26 +297,10 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (endDate != null) { if (endDate != null) {
stmt.bindLong(15, endDate.getTime()); stmt.bindLong(15, endDate.getTime());
} }
stmt.bindLong(16, entity.getLike());
Long like = entity.getLike(); stmt.bindLong(17, entity.getTotalSold());
if (like != null) { stmt.bindLong(18, entity.getMajorMainId());
stmt.bindLong(16, like); stmt.bindLong(19, entity.getDeptId());
}
Long totalSold = entity.getTotalSold();
if (totalSold != null) {
stmt.bindLong(17, totalSold);
}
Long majorMainId = entity.getMajorMainId();
if (majorMainId != null) {
stmt.bindLong(18, majorMainId);
}
Long deptId = entity.getDeptId();
if (deptId != null) {
stmt.bindLong(19, deptId);
}
String createBy = entity.getCreateBy(); String createBy = entity.getCreateBy();
if (createBy != null) { if (createBy != null) {
...@@ -523,31 +331,11 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -523,31 +331,11 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (pId != null) { if (pId != null) {
stmt.bindString(25, pId); stmt.bindString(25, pId);
} }
stmt.bindLong(26, entity.getAutoMod());
Long autoMod = entity.getAutoMod(); stmt.bindLong(27, entity.getBlueEdit());
if (autoMod != null) { stmt.bindLong(28, entity.getAutoMerge());
stmt.bindLong(26, autoMod); stmt.bindLong(29, entity.getCustomMsg());
} stmt.bindLong(30, entity.getIsParent());
Long blueEdit = entity.getBlueEdit();
if (blueEdit != null) {
stmt.bindLong(27, blueEdit);
}
Long autoMerge = entity.getAutoMerge();
if (autoMerge != null) {
stmt.bindLong(28, autoMerge);
}
Long customMsg = entity.getCustomMsg();
if (customMsg != null) {
stmt.bindLong(29, customMsg);
}
Long isParent = entity.getIsParent();
if (isParent != null) {
stmt.bindLong(30, isParent);
}
String modifierName1 = entity.getModifierName1(); String modifierName1 = entity.getModifierName1();
if (modifierName1 != null) { if (modifierName1 != null) {
...@@ -558,11 +346,7 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -558,11 +346,7 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (modifierName2 != null) { if (modifierName2 != null) {
stmt.bindString(32, modifierName2); stmt.bindString(32, modifierName2);
} }
stmt.bindDouble(33, entity.getMultiple());
Double multiple = entity.getMultiple();
if (multiple != null) {
stmt.bindDouble(33, multiple);
}
String printSet = entity.getPrintSet(); String printSet = entity.getPrintSet();
if (printSet != null) { if (printSet != null) {
...@@ -573,76 +357,20 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -573,76 +357,20 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
if (ktSetting != null) { if (ktSetting != null) {
stmt.bindString(35, ktSetting); stmt.bindString(35, ktSetting);
} }
stmt.bindLong(36, entity.getModComm());
Long modComm = entity.getModComm(); stmt.bindLong(37, entity.getModTaste());
if (modComm != null) { stmt.bindLong(38, entity.getModMsg());
stmt.bindLong(36, modComm); stmt.bindLong(39, entity.getKtFireCourse());
} stmt.bindLong(40, entity.getAbleDisCount());
stmt.bindLong(41, entity.getPrintToBill());
Long modTaste = entity.getModTaste(); stmt.bindLong(42, entity.getKtPrintMainItem());
if (modTaste != null) { stmt.bindLong(43, entity.getKtShowPrice());
stmt.bindLong(37, modTaste); stmt.bindLong(44, entity.getKtFont());
} stmt.bindLong(45, entity.getConditions());
stmt.bindLong(46, entity.getIsRt());
Long modMsg = entity.getModMsg(); stmt.bindLong(47, entity.getVisible());
if (modMsg != null) { stmt.bindLong(48, entity.getDeletes());
stmt.bindLong(38, modMsg); stmt.bindLong(49, entity.getIsStatistic());
}
Long ktFireCourse = entity.getKtFireCourse();
if (ktFireCourse != null) {
stmt.bindLong(39, ktFireCourse);
}
Long ableDisCount = entity.getAbleDisCount();
if (ableDisCount != null) {
stmt.bindLong(40, ableDisCount);
}
Long printToBill = entity.getPrintToBill();
if (printToBill != null) {
stmt.bindLong(41, printToBill);
}
Long ktPrintMainItem = entity.getKtPrintMainItem();
if (ktPrintMainItem != null) {
stmt.bindLong(42, ktPrintMainItem);
}
Long ktShowPrice = entity.getKtShowPrice();
if (ktShowPrice != null) {
stmt.bindLong(43, ktShowPrice);
}
Long ktFont = entity.getKtFont();
if (ktFont != null) {
stmt.bindLong(44, ktFont);
}
Long conditions = entity.getConditions();
if (conditions != null) {
stmt.bindLong(45, conditions);
}
Long isRt = entity.getIsRt();
if (isRt != null) {
stmt.bindLong(46, isRt);
}
Byte visible = entity.getVisible();
if (visible != null) {
stmt.bindLong(47, visible);
}
Long deletes = entity.getDeletes();
if (deletes != null) {
stmt.bindLong(48, deletes);
}
Long isStatistic = entity.getIsStatistic();
if (isStatistic != null) {
stmt.bindLong(49, isStatistic);
}
} }
@Override @Override
...@@ -654,54 +382,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -654,54 +382,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
public Modifier readEntity(Cursor cursor, int offset) { public Modifier readEntity(Cursor cursor, int offset) {
Modifier entity = new Modifier( // Modifier entity = new Modifier( //
cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // dbid cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // dbid
cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1), // mid cursor.getLong(offset + 1), // mid
cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2), // topId cursor.getLong(offset + 2), // topId
cursor.isNull(offset + 3) ? null : cursor.getLong(offset + 3), // restaurantId cursor.getLong(offset + 3), // restaurantId
cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // modifierName cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // modifierName
cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5), // seqNo cursor.getLong(offset + 5), // seqNo
cursor.isNull(offset + 6) ? null : cursor.getDouble(offset + 6), // marketPrice cursor.getDouble(offset + 6), // marketPrice
cursor.isNull(offset + 7) ? null : cursor.getDouble(offset + 7), // price cursor.getDouble(offset + 7), // price
cursor.isNull(offset + 8) ? null : cursor.getDouble(offset + 8), // lunchboxPrice cursor.getDouble(offset + 8), // lunchboxPrice
cursor.isNull(offset + 9) ? null : cursor.getLong(offset + 9), // colorId cursor.getLong(offset + 9), // colorId
cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // imageUrl cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // imageUrl
cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11), // invisible cursor.getLong(offset + 11), // invisible
cursor.isNull(offset + 12) ? null : cursor.getDouble(offset + 12), // cost cursor.getDouble(offset + 12), // cost
cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)), // startDate cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)), // startDate
cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14)), // endDate cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14)), // endDate
cursor.isNull(offset + 15) ? null : cursor.getLong(offset + 15), // like cursor.getLong(offset + 15), // like
cursor.isNull(offset + 16) ? null : cursor.getLong(offset + 16), // totalSold cursor.getLong(offset + 16), // totalSold
cursor.isNull(offset + 17) ? null : cursor.getLong(offset + 17), // majorMainId cursor.getLong(offset + 17), // majorMainId
cursor.isNull(offset + 18) ? null : cursor.getLong(offset + 18), // deptId cursor.getLong(offset + 18), // deptId
cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // createBy cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // createBy
cursor.isNull(offset + 20) ? null : new java.util.Date(cursor.getLong(offset + 20)), // createTime cursor.isNull(offset + 20) ? null : new java.util.Date(cursor.getLong(offset + 20)), // createTime
cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // updateBy cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // updateBy
cursor.isNull(offset + 22) ? null : new java.util.Date(cursor.getLong(offset + 22)), // updateTime cursor.isNull(offset + 22) ? null : new java.util.Date(cursor.getLong(offset + 22)), // updateTime
cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // posFid cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23), // posFid
cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // pId cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // pId
cursor.isNull(offset + 25) ? null : cursor.getLong(offset + 25), // autoMod cursor.getLong(offset + 25), // autoMod
cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26), // blueEdit cursor.getLong(offset + 26), // blueEdit
cursor.isNull(offset + 27) ? null : cursor.getLong(offset + 27), // autoMerge cursor.getLong(offset + 27), // autoMerge
cursor.isNull(offset + 28) ? null : cursor.getLong(offset + 28), // customMsg cursor.getLong(offset + 28), // customMsg
cursor.isNull(offset + 29) ? null : cursor.getLong(offset + 29), // isParent cursor.getLong(offset + 29), // isParent
cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // modifierName1 cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30), // modifierName1
cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31), // modifierName2 cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31), // modifierName2
cursor.isNull(offset + 32) ? null : cursor.getDouble(offset + 32), // multiple cursor.getDouble(offset + 32), // multiple
cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33), // printSet cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33), // printSet
cursor.isNull(offset + 34) ? null : cursor.getString(offset + 34), // ktSetting cursor.isNull(offset + 34) ? null : cursor.getString(offset + 34), // ktSetting
cursor.isNull(offset + 35) ? null : cursor.getLong(offset + 35), // modComm cursor.getLong(offset + 35), // modComm
cursor.isNull(offset + 36) ? null : cursor.getLong(offset + 36), // modTaste cursor.getLong(offset + 36), // modTaste
cursor.isNull(offset + 37) ? null : cursor.getLong(offset + 37), // modMsg cursor.getLong(offset + 37), // modMsg
cursor.isNull(offset + 38) ? null : cursor.getLong(offset + 38), // ktFireCourse cursor.getLong(offset + 38), // ktFireCourse
cursor.isNull(offset + 39) ? null : cursor.getLong(offset + 39), // ableDisCount cursor.getLong(offset + 39), // ableDisCount
cursor.isNull(offset + 40) ? null : cursor.getLong(offset + 40), // printToBill cursor.getLong(offset + 40), // printToBill
cursor.isNull(offset + 41) ? null : cursor.getLong(offset + 41), // ktPrintMainItem cursor.getLong(offset + 41), // ktPrintMainItem
cursor.isNull(offset + 42) ? null : cursor.getLong(offset + 42), // ktShowPrice cursor.getLong(offset + 42), // ktShowPrice
cursor.isNull(offset + 43) ? null : cursor.getLong(offset + 43), // ktFont cursor.getLong(offset + 43), // ktFont
cursor.isNull(offset + 44) ? null : cursor.getLong(offset + 44), // conditions cursor.getLong(offset + 44), // conditions
cursor.isNull(offset + 45) ? null : cursor.getLong(offset + 45), // isRt cursor.getLong(offset + 45), // isRt
cursor.isNull(offset + 46) ? null : (byte) cursor.getShort(offset + 46), // visible (byte) cursor.getShort(offset + 46), // visible
cursor.isNull(offset + 47) ? null : cursor.getLong(offset + 47), // deletes cursor.getLong(offset + 47), // deletes
cursor.isNull(offset + 48) ? null : cursor.getLong(offset + 48) // isStatistic cursor.getLong(offset + 48) // isStatistic
); );
return entity; return entity;
} }
...@@ -709,54 +437,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> { ...@@ -709,54 +437,54 @@ public class ModifierDao extends AbstractDao<Modifier, Long> {
@Override @Override
public void readEntity(Cursor cursor, Modifier entity, int offset) { public void readEntity(Cursor cursor, Modifier entity, int offset) {
entity.setDbid(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); entity.setDbid(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0));
entity.setMid(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1)); entity.setMid(cursor.getLong(offset + 1));
entity.setTopId(cursor.isNull(offset + 2) ? null : cursor.getLong(offset + 2)); entity.setTopId(cursor.getLong(offset + 2));
entity.setRestaurantId(cursor.isNull(offset + 3) ? null : cursor.getLong(offset + 3)); entity.setRestaurantId(cursor.getLong(offset + 3));
entity.setModifierName(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4)); entity.setModifierName(cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4));
entity.setSeqNo(cursor.isNull(offset + 5) ? null : cursor.getLong(offset + 5)); entity.setSeqNo(cursor.getLong(offset + 5));
entity.setMarketPrice(cursor.isNull(offset + 6) ? null : cursor.getDouble(offset + 6)); entity.setMarketPrice(cursor.getDouble(offset + 6));
entity.setPrice(cursor.isNull(offset + 7) ? null : cursor.getDouble(offset + 7)); entity.setPrice(cursor.getDouble(offset + 7));
entity.setLunchboxPrice(cursor.isNull(offset + 8) ? null : cursor.getDouble(offset + 8)); entity.setLunchboxPrice(cursor.getDouble(offset + 8));
entity.setColorId(cursor.isNull(offset + 9) ? null : cursor.getLong(offset + 9)); entity.setColorId(cursor.getLong(offset + 9));
entity.setImageUrl(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setImageUrl(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10));
entity.setInvisible(cursor.isNull(offset + 11) ? null : cursor.getLong(offset + 11)); entity.setInvisible(cursor.getLong(offset + 11));
entity.setCost(cursor.isNull(offset + 12) ? null : cursor.getDouble(offset + 12)); entity.setCost(cursor.getDouble(offset + 12));
entity.setStartDate(cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13))); entity.setStartDate(cursor.isNull(offset + 13) ? null : new java.util.Date(cursor.getLong(offset + 13)));
entity.setEndDate(cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14))); entity.setEndDate(cursor.isNull(offset + 14) ? null : new java.util.Date(cursor.getLong(offset + 14)));
entity.setLike(cursor.isNull(offset + 15) ? null : cursor.getLong(offset + 15)); entity.setLike(cursor.getLong(offset + 15));
entity.setTotalSold(cursor.isNull(offset + 16) ? null : cursor.getLong(offset + 16)); entity.setTotalSold(cursor.getLong(offset + 16));
entity.setMajorMainId(cursor.isNull(offset + 17) ? null : cursor.getLong(offset + 17)); entity.setMajorMainId(cursor.getLong(offset + 17));
entity.setDeptId(cursor.isNull(offset + 18) ? null : cursor.getLong(offset + 18)); entity.setDeptId(cursor.getLong(offset + 18));
entity.setCreateBy(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19)); entity.setCreateBy(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
entity.setCreateTime(cursor.isNull(offset + 20) ? null : new java.util.Date(cursor.getLong(offset + 20))); entity.setCreateTime(cursor.isNull(offset + 20) ? null : new java.util.Date(cursor.getLong(offset + 20)));
entity.setUpdateBy(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21)); entity.setUpdateBy(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
entity.setUpdateTime(cursor.isNull(offset + 22) ? null : new java.util.Date(cursor.getLong(offset + 22))); entity.setUpdateTime(cursor.isNull(offset + 22) ? null : new java.util.Date(cursor.getLong(offset + 22)));
entity.setPosFid(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23)); entity.setPosFid(cursor.isNull(offset + 23) ? null : cursor.getString(offset + 23));
entity.setPId(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24)); entity.setPId(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24));
entity.setAutoMod(cursor.isNull(offset + 25) ? null : cursor.getLong(offset + 25)); entity.setAutoMod(cursor.getLong(offset + 25));
entity.setBlueEdit(cursor.isNull(offset + 26) ? null : cursor.getLong(offset + 26)); entity.setBlueEdit(cursor.getLong(offset + 26));
entity.setAutoMerge(cursor.isNull(offset + 27) ? null : cursor.getLong(offset + 27)); entity.setAutoMerge(cursor.getLong(offset + 27));
entity.setCustomMsg(cursor.isNull(offset + 28) ? null : cursor.getLong(offset + 28)); entity.setCustomMsg(cursor.getLong(offset + 28));
entity.setIsParent(cursor.isNull(offset + 29) ? null : cursor.getLong(offset + 29)); entity.setIsParent(cursor.getLong(offset + 29));
entity.setModifierName1(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30)); entity.setModifierName1(cursor.isNull(offset + 30) ? null : cursor.getString(offset + 30));
entity.setModifierName2(cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31)); entity.setModifierName2(cursor.isNull(offset + 31) ? null : cursor.getString(offset + 31));
entity.setMultiple(cursor.isNull(offset + 32) ? null : cursor.getDouble(offset + 32)); entity.setMultiple(cursor.getDouble(offset + 32));
entity.setPrintSet(cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33)); entity.setPrintSet(cursor.isNull(offset + 33) ? null : cursor.getString(offset + 33));
entity.setKtSetting(cursor.isNull(offset + 34) ? null : cursor.getString(offset + 34)); entity.setKtSetting(cursor.isNull(offset + 34) ? null : cursor.getString(offset + 34));
entity.setModComm(cursor.isNull(offset + 35) ? null : cursor.getLong(offset + 35)); entity.setModComm(cursor.getLong(offset + 35));
entity.setModTaste(cursor.isNull(offset + 36) ? null : cursor.getLong(offset + 36)); entity.setModTaste(cursor.getLong(offset + 36));
entity.setModMsg(cursor.isNull(offset + 37) ? null : cursor.getLong(offset + 37)); entity.setModMsg(cursor.getLong(offset + 37));
entity.setKtFireCourse(cursor.isNull(offset + 38) ? null : cursor.getLong(offset + 38)); entity.setKtFireCourse(cursor.getLong(offset + 38));
entity.setAbleDisCount(cursor.isNull(offset + 39) ? null : cursor.getLong(offset + 39)); entity.setAbleDisCount(cursor.getLong(offset + 39));
entity.setPrintToBill(cursor.isNull(offset + 40) ? null : cursor.getLong(offset + 40)); entity.setPrintToBill(cursor.getLong(offset + 40));
entity.setKtPrintMainItem(cursor.isNull(offset + 41) ? null : cursor.getLong(offset + 41)); entity.setKtPrintMainItem(cursor.getLong(offset + 41));
entity.setKtShowPrice(cursor.isNull(offset + 42) ? null : cursor.getLong(offset + 42)); entity.setKtShowPrice(cursor.getLong(offset + 42));
entity.setKtFont(cursor.isNull(offset + 43) ? null : cursor.getLong(offset + 43)); entity.setKtFont(cursor.getLong(offset + 43));
entity.setConditions(cursor.isNull(offset + 44) ? null : cursor.getLong(offset + 44)); entity.setConditions(cursor.getLong(offset + 44));
entity.setIsRt(cursor.isNull(offset + 45) ? null : cursor.getLong(offset + 45)); entity.setIsRt(cursor.getLong(offset + 45));
entity.setVisible(cursor.isNull(offset + 46) ? null : (byte) cursor.getShort(offset + 46)); entity.setVisible((byte) cursor.getShort(offset + 46));
entity.setDeletes(cursor.isNull(offset + 47) ? null : cursor.getLong(offset + 47)); entity.setDeletes(cursor.getLong(offset + 47));
entity.setIsStatistic(cursor.isNull(offset + 48) ? null : cursor.getLong(offset + 48)); entity.setIsStatistic(cursor.getLong(offset + 48));
} }
@Override @Override
......
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,11 +390,14 @@ public class ModifierDaoUtils { ...@@ -368,11 +390,14 @@ 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")));
order.setMaxNumber(c.getInt(c.getColumnIndex("MAX_QTY"))); if (fid != 0) {
order.setMinNumber(c.getInt(c.getColumnIndex("MIN_QTY"))); //非公共細項
String defmodifier = c.getString(c.getColumnIndex("DEFMODIFIER")); order.setMaxNumber(c.getInt(c.getColumnIndex("MAX_QTY")));
if (!TextUtils.isEmpty(defmodifier) && !", ".equals(defmodifier)) { order.setMinNumber(c.getInt(c.getColumnIndex("MIN_QTY")));
order.setDefmodifier(defmodifier); String defmodifier = c.getString(c.getColumnIndex("DEFMODIFIER"));
if (!TextUtils.isEmpty(defmodifier) && !", ".equals(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<>();
...@@ -60,10 +89,10 @@ public class SectionTextItem3 { ...@@ -60,10 +89,10 @@ public class SectionTextItem3 {
String foodName; String foodName;
switch (orderDetail.getItemType()) { switch (orderDetail.getItemType()) {
case 2: case 2:
foodName = " " + orderDetail.getProductName(); foodName = " " + orderDetail.getProductName();
break; break;
case 3: case 3:
foodName = " " + orderDetail.getProductName(); foodName = " " + orderDetail.getProductName();
break; break;
default: default:
foodName = orderDetail.getProductName(); foodName = orderDetail.getProductName();
...@@ -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()));
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice() * orderDetail.getNumber())); if (orderDetail.getType() == OrderDetail.DISCOUNT_TYPE) {
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice()));
} else {
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/view/WaveView.java 0 → 100644
/*
* Copyright (C) 2015, gelitenight(gelitenight@gmail.com).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.gingersoft.gsa.cloud.ui.view;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.BitmapShader;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Paint.Style;
import android.graphics.Shader;
import android.util.AttributeSet;
import android.view.View;
import com.gingersoft.gsa.cloud.base.R;
public class WaveView extends View {
/**
* +------------------------+
* |<--wave length-> |______
* | /\ | /\ | |
* | / \ | / \ | amplitude
* | / \ | / \ | |
* |/ \ |/ \|__|____
* | \ / | |
* | \ / | |
* | \ / | |
* | \/ | water level
* | | |
* | | |
* +------------------------+__|____
*/
private static final float DEFAULT_AMPLITUDE_RATIO = 0.05f;
private static final float DEFAULT_WATER_LEVEL_RATIO = 0.5f;
private static final float DEFAULT_WAVE_LENGTH_RATIO = 1.0f;
private static final float DEFAULT_WAVE_SHIFT_RATIO = 0.0f;
public static final int DEFAULT_BEHIND_WAVE_COLOR = Color.parseColor("#28FFFFFF");
public static final int DEFAULT_FRONT_WAVE_COLOR = Color.parseColor("#3CFFFFFF");
public static final ShapeType DEFAULT_WAVE_SHAPE = ShapeType.CIRCLE;
public enum ShapeType {
CIRCLE,
SQUARE
}
// if true, the shader will display the wave
private boolean mShowWave;
// shader containing repeated waves
private BitmapShader mWaveShader;
// shader matrix
private Matrix mShaderMatrix;
// paint to draw wave
private Paint mViewPaint;
// paint to draw border
private Paint mBorderPaint;
private float mDefaultAmplitude;
private float mDefaultWaterLevel;
private float mDefaultWaveLength;
private double mDefaultAngularFrequency;
private float mAmplitudeRatio = DEFAULT_AMPLITUDE_RATIO;
private float mWaveLengthRatio = DEFAULT_WAVE_LENGTH_RATIO;
private float mWaterLevelRatio = DEFAULT_WATER_LEVEL_RATIO;
private float mWaveShiftRatio = DEFAULT_WAVE_SHIFT_RATIO;
private int mBehindWaveColor = DEFAULT_BEHIND_WAVE_COLOR;
private int mFrontWaveColor = DEFAULT_FRONT_WAVE_COLOR;
private ShapeType mShapeType = DEFAULT_WAVE_SHAPE;
public WaveView(Context context) {
super(context);
init();
}
public WaveView(Context context, AttributeSet attrs) {
super(context, attrs);
init(attrs);
}
public WaveView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
init(attrs);
}
private void init() {
mShaderMatrix = new Matrix();
mViewPaint = new Paint();
mViewPaint.setAntiAlias(true);
}
private void init(AttributeSet attrs) {
init();
TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs,
R.styleable.WaveView, 0, 0);
mAmplitudeRatio = typedArray.getFloat(R.styleable.WaveView_amplitudeRatio, DEFAULT_AMPLITUDE_RATIO);
mWaterLevelRatio = typedArray.getFloat(R.styleable.WaveView_waveWaterLevel, DEFAULT_WATER_LEVEL_RATIO);
mWaveLengthRatio = typedArray.getFloat(R.styleable.WaveView_waveLengthRatio, DEFAULT_WAVE_LENGTH_RATIO);
mWaveShiftRatio = typedArray.getFloat(R.styleable.WaveView_waveShiftRatio, DEFAULT_WAVE_SHIFT_RATIO);
mFrontWaveColor = typedArray.getColor(R.styleable.WaveView_frontWaveColor, DEFAULT_FRONT_WAVE_COLOR);
mBehindWaveColor = typedArray.getColor(R.styleable.WaveView_behindWaveColor, DEFAULT_BEHIND_WAVE_COLOR);
mShapeType = typedArray.getInt(R.styleable.WaveView_waveShape, 0) == 0 ? ShapeType.CIRCLE : ShapeType.SQUARE;
mShowWave = typedArray.getBoolean(R.styleable.WaveView_showWave, true);
typedArray.recycle();
}
public float getWaveShiftRatio() {
return mWaveShiftRatio;
}
/**
* Shift the wave horizontally according to <code>waveShiftRatio</code>.
*
* @param waveShiftRatio Should be 0 ~ 1. Default to be 0.
* Result of waveShiftRatio multiples width of WaveView is the length to shift.
*/
public void setWaveShiftRatio(float waveShiftRatio) {
if (mWaveShiftRatio != waveShiftRatio) {
mWaveShiftRatio = waveShiftRatio;
invalidate();
}
}
public float getWaterLevelRatio() {
return mWaterLevelRatio;
}
/**
* Set water level according to <code>waterLevelRatio</code>.
*
* @param waterLevelRatio Should be 0 ~ 1. Default to be 0.5.
* Ratio of water level to WaveView height.
*/
public void setWaterLevelRatio(float waterLevelRatio) {
if (mWaterLevelRatio != waterLevelRatio) {
mWaterLevelRatio = waterLevelRatio;
invalidate();
}
}
public float getAmplitudeRatio() {
return mAmplitudeRatio;
}
/**
* Set vertical size of wave according to <code>amplitudeRatio</code>
*
* @param amplitudeRatio Default to be 0.05. Result of amplitudeRatio + waterLevelRatio should be less than 1.
* Ratio of amplitude to height of WaveView.
*/
public void setAmplitudeRatio(float amplitudeRatio) {
if (mAmplitudeRatio != amplitudeRatio) {
mAmplitudeRatio = amplitudeRatio;
invalidate();
}
}
public float getWaveLengthRatio() {
return mWaveLengthRatio;
}
/**
* Set horizontal size of wave according to <code>waveLengthRatio</code>
*
* @param waveLengthRatio Default to be 1.
* Ratio of wave length to width of WaveView.
*/
public void setWaveLengthRatio(float waveLengthRatio) {
mWaveLengthRatio = waveLengthRatio;
}
public boolean isShowWave() {
return mShowWave;
}
public void setShowWave(boolean showWave) {
mShowWave = showWave;
}
public void setBorder(int width, int color) {
if (mBorderPaint == null) {
mBorderPaint = new Paint();
mBorderPaint.setAntiAlias(true);
mBorderPaint.setStyle(Style.STROKE);
}
mBorderPaint.setColor(color);
mBorderPaint.setStrokeWidth(width);
invalidate();
}
public void setWaveColor(int behindWaveColor, int frontWaveColor) {
mBehindWaveColor = behindWaveColor;
mFrontWaveColor = frontWaveColor;
if (getWidth() > 0 && getHeight() > 0) {
// need to recreate shader when color changed
mWaveShader = null;
createShader();
invalidate();
}
}
public void setShapeType(ShapeType shapeType) {
mShapeType = shapeType;
invalidate();
}
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
super.onSizeChanged(w, h, oldw, oldh);
createShader();
}
/**
* Create the shader with default waves which repeat horizontally, and clamp vertically
*/
private void createShader() {
mDefaultAngularFrequency = 2.0f * Math.PI / DEFAULT_WAVE_LENGTH_RATIO / getWidth();
mDefaultAmplitude = getHeight() * DEFAULT_AMPLITUDE_RATIO;
mDefaultWaterLevel = getHeight() * DEFAULT_WATER_LEVEL_RATIO;
mDefaultWaveLength = getWidth();
Bitmap bitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
Paint wavePaint = new Paint();
wavePaint.setStrokeWidth(2);
wavePaint.setAntiAlias(true);
// Draw default waves into the bitmap
// y=Asin(ωx+φ)+h
final int endX = getWidth() + 1;
final int endY = getHeight() + 1;
float[] waveY = new float[endX];
wavePaint.setColor(mBehindWaveColor);
for (int beginX = 0; beginX < endX; beginX++) {
double wx = beginX * mDefaultAngularFrequency;
float beginY = (float) (mDefaultWaterLevel + mDefaultAmplitude * Math.sin(wx));
canvas.drawLine(beginX, beginY, beginX, endY, wavePaint);
waveY[beginX] = beginY;
}
wavePaint.setColor(mFrontWaveColor);
final int wave2Shift = (int) (mDefaultWaveLength / 4);
for (int beginX = 0; beginX < endX; beginX++) {
canvas.drawLine(beginX, waveY[(beginX + wave2Shift) % endX], beginX, endY, wavePaint);
}
// use the bitamp to create the shader
mWaveShader = new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.CLAMP);
mViewPaint.setShader(mWaveShader);
}
@Override
protected void onDraw(Canvas canvas) {
// modify paint shader according to mShowWave state
if (mShowWave && mWaveShader != null) {
// first call after mShowWave, assign it to our paint
if (mViewPaint.getShader() == null) {
mViewPaint.setShader(mWaveShader);
}
// sacle shader according to mWaveLengthRatio and mAmplitudeRatio
// this decides the size(mWaveLengthRatio for width, mAmplitudeRatio for height) of waves
mShaderMatrix.setScale(
mWaveLengthRatio / DEFAULT_WAVE_LENGTH_RATIO,
mAmplitudeRatio / DEFAULT_AMPLITUDE_RATIO,
0,
mDefaultWaterLevel);
// translate shader according to mWaveShiftRatio and mWaterLevelRatio
// this decides the start position(mWaveShiftRatio for x, mWaterLevelRatio for y) of waves
mShaderMatrix.postTranslate(
mWaveShiftRatio * getWidth(),
(DEFAULT_WATER_LEVEL_RATIO - mWaterLevelRatio) * getHeight());
// assign matrix to invalidate the shader
mWaveShader.setLocalMatrix(mShaderMatrix);
float borderWidth = mBorderPaint == null ? 0f : mBorderPaint.getStrokeWidth();
switch (mShapeType) {
case CIRCLE:
if (borderWidth > 0) {
canvas.drawCircle(getWidth() / 2f, getHeight() / 2f,
(getWidth() - borderWidth) / 2f - 1f, mBorderPaint);
}
float radius = getWidth() / 2f - borderWidth;
canvas.drawCircle(getWidth() / 2f, getHeight() / 2f, radius, mViewPaint);
break;
case SQUARE:
if (borderWidth > 0) {
canvas.drawRect(
borderWidth / 2f,
borderWidth / 2f,
getWidth() - borderWidth / 2f - 0.5f,
getHeight() - borderWidth / 2f - 0.5f,
mBorderPaint);
}
canvas.drawRect(borderWidth, borderWidth, getWidth() - borderWidth,
getHeight() - borderWidth, mViewPaint);
break;
}
} else {
mViewPaint.setShader(null);
}
}
}
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);
dialogBuilder.addAction("取消", (dialog, index) -> dialog.dismiss()); if(!TextUtils.isEmpty(methodName)) {
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/BaseOrderPresenter.java
...@@ -46,6 +46,9 @@ import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber; ...@@ -46,6 +46,9 @@ import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import okhttp3.FormBody; import okhttp3.FormBody;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import static com.gingersoft.gsa.cloud.base.common.bean.OrderDetail.DISCOUNT_PROP;
import static com.gingersoft.gsa.cloud.base.common.bean.OrderDetail.DISCOUNT_TYPE;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -86,6 +89,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -86,6 +89,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
protected OrderMoneyAdapter mOrderMoneyAdapter; protected OrderMoneyAdapter mOrderMoneyAdapter;
protected List<BillOrderMoney> mOrderMoneyList; protected List<BillOrderMoney> mOrderMoneyList;
protected OrderDetail mCurrentOrderDetailBean;
//選中操作的食品下標 //選中操作的食品下標
protected int orderSelectPosition = -1; protected int orderSelectPosition = -1;
...@@ -209,6 +213,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -209,6 +213,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (mOrderContentActivity != null) { if (mOrderContentActivity != null) {
mOrderContentActivity.initOrderDetail(); mOrderContentActivity.initOrderDetail();
} }
//更新折扣
updateDiscountItem();
} }
@Override @Override
...@@ -218,6 +224,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -218,6 +224,8 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (mOrderContentActivity != null) { if (mOrderContentActivity != null) {
mOrderContentActivity.initOrderDetail(); mOrderContentActivity.initOrderDetail();
} }
//更新折扣
updateDiscountItem();
} }
@Override @Override
...@@ -234,6 +242,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -234,6 +242,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (mMealStandPresenter != null) { if (mMealStandPresenter != null) {
mMealStandPresenter.updateOrderFoodNumber(); mMealStandPresenter.updateOrderFoodNumber();
} }
updateDiscountItem();
mSelectMealAdapter.notifyDataSetChanged(); mSelectMealAdapter.notifyDataSetChanged();
} }
...@@ -267,7 +276,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -267,7 +276,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (getFoodSize() == 0) { if (getFoodSize() == 0) {
Class[] parameterTypes = {boolean.class}; Class[] parameterTypes = {boolean.class};
Object[] parameters = {isPrint}; Object[] parameters = {isPrint};
CommonTipDialog.showTipAndExecuteMethodDialog(IActivity, noFoodDeliveryTip, BaseOrderPresenter.class, this, CommonTipDialog.showDoubtDialog(IActivity, noFoodDeliveryTip, BaseOrderPresenter.class, this,
"executeCreateOrder", parameterTypes, parameters); "executeCreateOrder", parameterTypes, parameters);
} else { } else {
executeCreateOrder(isPrint); executeCreateOrder(isPrint);
...@@ -306,18 +315,17 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -306,18 +315,17 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
//折扣 //折扣
Discount discount = new Discount(); Discount discount = new Discount();
discount.setType(orderBean.getType()); discount.setType(orderBean.getType());
discount.setRemark(orderBean.getRemark());
if (orderBean.getDiscountValue() != 0) { if (orderBean.getDiscountValue() != 0) {
//百分比折扣 //百分比折扣
discount.setDiscount_value(orderBean.getDiscountValue()); discount.setDiscount_value(orderBean.getDiscountValue());
addOrderDiscount(discount, 1,true); addOrderDiscount(discount, 1, true);
} }
if (orderBean.getDiscountAmount() != 0) { if (orderBean.getDiscountAmount() != 0) {
//金額折扣 //金額折扣
discount.setAmount(orderBean.getDiscountAmount()); discount.setAmount(orderBean.getDiscountAmount());
addOrderDiscount(discount, 1,true); addOrderDiscount(discount, 1, true);
} }
//TODO 服務費
} }
} }
...@@ -326,13 +334,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -326,13 +334,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
* *
* @param discount * @param discount
*/ */
protected void addOrderDiscount(Discount discount, int status,boolean sentOrder) { protected void addOrderDiscount(Discount discount, int status, boolean sentOrder) {
double totalMoney = getFoodTotal(); double totalMoney = getFoodTotal();
double discountPrice = Discount.calculationDiscount(discount, totalMoney); double discountPrice = Discount.calculationDiscount(discount, totalMoney);
BillOrderMoney orderMoney = new BillOrderMoney(); BillOrderMoney orderMoney = new BillOrderMoney();
orderMoney.setMoney(discountPrice); orderMoney.setMoney(discountPrice);
// orderMoney.setTitle(discount.getRemark()); orderMoney.setTitle(discount.getRemark());
orderMoney.setTitle("8折");
orderMoney.setType(BillOrderMoney.DISCOUNT_TYPE); orderMoney.setType(BillOrderMoney.DISCOUNT_TYPE);
if (status == 0) { if (status == 0) {
orderMoney.setTextColor(ArmsUtils.getColor(IActivity, R.color.theme_hint_color)); orderMoney.setTextColor(ArmsUtils.getColor(IActivity, R.color.theme_hint_color));
...@@ -341,7 +348,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -341,7 +348,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
orderMoney.setStatus(status); orderMoney.setStatus(status);
orderMoney.setDiscount(discount); orderMoney.setDiscount(discount);
if(sentOrder){ if (sentOrder) {
mOrderMoneyList.clear(); mOrderMoneyList.clear();
} }
mOrderMoneyList.add(orderMoney); mOrderMoneyList.add(orderMoney);
...@@ -353,6 +360,50 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -353,6 +360,50 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
/** /**
* 更新折扣金額
*/
protected void updateDiscountItem() {
boolean updateData = false;
double totalMoney = 0;
List<OrderDetail> orderDetailList = getOrderFoodLists();
int start_position = mSelectMealAdapter.getSelect_full_start_position();
int end_position = mSelectMealAdapter.getSelect_full_end_position();
boolean hasFoodDiscount = OrderDetail.hasFoodDiscount(orderDetailList, start_position, end_position);
if (hasFoodDiscount) {
for (int i = 0; i < orderDetailList.size(); i++) {
if (start_position <= i && i <= end_position) {
OrderDetail orderDetailsBean = orderDetailList.get(i);
if (orderDetailsBean.getDiscount() != null && orderDetailsBean.getType() == DISCOUNT_TYPE) {
updateData = true;
double discountPrice = Discount.calculationDiscount(orderDetailsBean.getDiscount(), totalMoney);
//更新折扣金額
orderDetailsBean.setPrice(-discountPrice);
break;
} else {
//保存每個食品套餐折扣總額
totalMoney = MoneyUtil.sum(totalMoney, orderDetailsBean.getPrice());
//往下找
int nextIndex = i + 1;
if (orderDetailList.size() == nextIndex || orderDetailList.get(nextIndex).getParentId() == 0) {
//已到結尾或者下一個食品是主食品
//找到下一個主食品 重置折扣價格
totalMoney = 0;
}
//參與折扣
orderDetailsBean.setAblediscount(1);
}
}
}
}
if (updateData) {
mSelectMealAdapter.notifyDataSetChanged();
}
}
/**
* 創建訂單后保存OrderId * 創建訂單后保存OrderId
* *
* @param orderId * @param orderId
...@@ -369,6 +420,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -369,6 +420,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
OrderDetail datasBean = mOrderFoodList.get(i); OrderDetail datasBean = mOrderFoodList.get(i);
datasBean.setSelected(0); datasBean.setSelected(0);
} }
if(mSelectMealAdapter != null) {
mSelectMealAdapter.notifyDataSetChanged();
}
} }
/** /**
...@@ -379,7 +433,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -379,7 +433,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
public double getFoodTotal() { public double getFoodTotal() {
double total = 0.0; double total = 0.0;
for (OrderDetail food : myOrderManage.getOrderFoodList()) { for (OrderDetail food : myOrderManage.getOrderFoodList()) {
total += food.getPrice(); total = MoneyUtil.sum(total, food.getPrice());
} }
return MoneyUtil.get_ItemDecimals_money(total); return MoneyUtil.get_ItemDecimals_money(total);
} }
...@@ -392,7 +446,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -392,7 +446,7 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
public double getTotalAmount() { public double getTotalAmount() {
double foodTotal = getFoodTotal(); double foodTotal = getFoodTotal();
for (BillOrderMoney item : mOrderMoneyList) { for (BillOrderMoney item : mOrderMoneyList) {
foodTotal += item.getMoney(); foodTotal = MoneyUtil.sum(foodTotal, item.getMoney());
if (0 > foodTotal) { if (0 > foodTotal) {
//折扣金額不能超出總額 //折扣金額不能超出總額
foodTotal = 0; foodTotal = 0;
...@@ -423,17 +477,23 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -423,17 +477,23 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
return getOrderFoodLists().size(); return getOrderFoodLists().size();
} }
protected String getSelectFoodIds() { /**
* 返回選中已送單食品ID
*
* @return
*/
protected String getSelectOldFoodIds() {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
List<OrderDetail> orderDetails = getOldOrderFoodLists(); List<OrderDetail> orderDetails = getOldOrderFoodLists();
int start_position = mSelectMealAdapter.getSelect_full_start_position() + 1; int start_position = mSelectMealAdapter.getSelect_full_start_position();
int end_position = mSelectMealAdapter.getSelect_full_end_position() + 1; int end_position = mSelectMealAdapter.getSelect_full_end_position();
for (int i = orderDetails.size() - 1; i >= 0; i--) { for (int i = orderDetails.size() - 1; i >= 0; i--) {
int my_index = orderDetails.get(i).getMyIndex(); if (start_position <= i && i <= end_position) {
if (start_position <= my_index && my_index <= end_position) {
OrderDetail orderDetail1 = orderDetails.get(i); OrderDetail orderDetail1 = orderDetails.get(i);
builder.append(orderDetail1.getId()); if(orderDetail1.getType() != DISCOUNT_TYPE){
builder.append(","); builder.append(orderDetail1.getId());
builder.append(",");
}
} }
} }
String str = builder.toString(); String str = builder.toString();
...@@ -443,6 +503,28 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -443,6 +503,28 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
return str; return str;
} }
/**
* 獲取當前套餐子食品數量
*
* @return
*/
protected int getSelectComboNumber() {
int comboNumber = 0;
List<OrderDetail> orderDetails = getOrderFoodLists();
int start_position = mSelectMealAdapter.getSelect_full_start_position();
int end_position = mSelectMealAdapter.getSelect_full_end_position();
for (int i = orderDetails.size() - 1; i >= 0; i--) {
if (start_position <= i && i <= end_position) {
OrderDetail orderDetail1 = orderDetails.get(i);
if (orderDetail1.getProp() == OrderDetail.COMBO_PROP) {
comboNumber++;
}
}
}
return comboNumber;
}
protected CreateOrderRequest getCreateOrderRequest(List<OrderDetail> foodList) { protected CreateOrderRequest getCreateOrderRequest(List<OrderDetail> foodList) {
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication); int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
CreateOrderRequest request = new CreateOrderRequest(); CreateOrderRequest request = new CreateOrderRequest();
...@@ -451,9 +533,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -451,9 +533,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
request.setTableId(OpenTableManage.getDefault().getTableBean().getId()); request.setTableId(OpenTableManage.getDefault().getTableBean().getId());
request.setTableName(OpenTableManage.getDefault().getTableBean().getTableName()); request.setTableName(OpenTableManage.getDefault().getTableBean().getTableName());
request.setRestaurantId(restaurantId); request.setRestaurantId(restaurantId);
Discount orderDiscount = getOrderDiscount(); Discount orderDiscount = getNesOrderDiscount();
if (orderDiscount != null) { if (orderDiscount != null) {
request.setDetailsId(orderDiscount.getId()); request.setDiscountId(orderDiscount.getId());
} }
return request; return request;
} }
...@@ -462,9 +544,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -462,9 +544,9 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
AddOrderRequest request = new AddOrderRequest(); AddOrderRequest request = new AddOrderRequest();
request.setMaps(orderDetailBeanToAddFoodRequest(foodList)); request.setMaps(orderDetailBeanToAddFoodRequest(foodList));
request.setOrderId(MyOrderManage.getInstance().getOrderId()); request.setOrderId(MyOrderManage.getInstance().getOrderId());
Discount orderDiscount = getOrderDiscount(); Discount orderDiscount = getNesOrderDiscount();
if (orderDiscount != null) { if (orderDiscount != null) {
request.setDetailsId(orderDiscount.getId()); request.setDiscountId(orderDiscount.getId());
} }
return request; return request;
} }
...@@ -474,36 +556,49 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -474,36 +556,49 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (foodList != null) { if (foodList != null) {
//套餐明細ID //套餐明細ID
long mapIndex = 0; long mapIndex = 0;
//主食品ID
long mainProductId = 0;
//打印用到，清理掉之前保存的食品 //打印用到，清理掉之前保存的食品
MyOrderManage.getInstance().getNewFoodList().clear(); MyOrderManage.getInstance().getNewFoodList().clear();
List<OrderBean.OrderDetailsBean> orderItems = null; List<OrderBean.OrderDetailsBean> orderItems = null;
for (int i = 0; i < foodList.size(); i++) { for (int i = 0; i < foodList.size(); i++) {
OrderDetail food = foodList.get(i); OrderDetail item = foodList.get(i);
if (food.getItemType() == 1) { if (item.getType() == OrderDetail.DISCOUNT_TYPE) {
//折扣直接跳過
continue;
}
if (item.getItemType() == 1) {
orderItems = new ArrayList<>(); orderItems = new ArrayList<>();
mapIndex += 1; mapIndex += 1;
//主食品ID
mainProductId = item.getProductId();
} }
OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean(); OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean();
request.setMemberId(GsaCloudApplication.getMemberId(mApplication)); request.setMemberId(GsaCloudApplication.getMemberId(mApplication));
request.setProductName(food.getProductName()); request.setProductName(item.getProductName());
request.setProductId(food.getProductId()); request.setProductId(item.getProductId());
request.setParentId(food.getParentId()); request.setParentId(item.getParentId());
request.setTopId(food.getTopId()); request.setTopId(item.getTopId());
request.setNumber(food.getNumber()); request.setNumber(item.getNumber());
request.setPrice(food.getUnit_price()); request.setPrice(item.getUnit_price());
request.setType(food.getType()); request.setType(item.getType());
request.setAblediscount(food.getAblediscount()); request.setAblediscount(item.getAblediscount());
request.setDiscountId(getDiscountIdByParentId(foodList, mainProductId));
request.setLunchboxPrice(0); request.setLunchboxPrice(0);
if (food.isNew()) { if (item.isNew()) {
//這裡只添加新食品 //這裡只添加新食品
orderItems.add(request); orderItems.add(request);
//保存新食品，打印用到 //保存新食品，打印用到
MyOrderManage.getInstance().getNewFoodList().add(food); MyOrderManage.getInstance().getNewFoodList().add(item);
} }
int nextIndex = i + 1; int nextIndex = i + 1;
if (foodList.size() > nextIndex && foodList.get(nextIndex).getType() == DISCOUNT_TYPE) {
//下一個是折扣，跳過往下找
nextIndex++;
}
if (foodList.size() > nextIndex) { if (foodList.size() > nextIndex) {
if (foodList.get(nextIndex).getItemType() == 1 && orderItems != null && orderItems.size() > 0) { if (orderItems != null && orderItems.size() > 0 && foodList.get(nextIndex).getItemType() == 1) {
//下一個食品是不是主食品 //下一個食品是不是主食品
orderDetails.put(mapIndex, orderItems); orderDetails.put(mapIndex, orderItems);
} }
...@@ -533,42 +628,60 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -533,42 +628,60 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
//套餐明細ID //套餐明細ID
String mapIndex = "1-1"; String mapIndex = "1-1";
int indexCount = 0; int indexCount = 0;
//主食品ID
long mainParentId = 0;
List<OrderBean.OrderDetailsBean> orderItems = null; List<OrderBean.OrderDetailsBean> orderItems = null;
for (int i = 0; i < foodList.size(); i++) { for (int i = 0; i < foodList.size(); i++) {
OrderDetail food = foodList.get(i); OrderDetail item = foodList.get(i);
if (food.getItemType() == 1) { if (item.getType() == OrderDetail.DISCOUNT_TYPE) {
//折扣直接跳過
continue;
}
if (item.getItemType() == 1) {
orderItems = new ArrayList<>(); orderItems = new ArrayList<>();
indexCount += 1; indexCount += 1;
if (food.isNew()) { if (item.isNew()) {
//完全新點的一個食品 //完全新點的一個食品
mapIndex = indexCount + "-" + type1; mapIndex = indexCount + "-" + type1;
//主食品ID
mainParentId = item.getProductId();
} else { } else {
//基礎上新加 //基礎上新加
mapIndex = indexCount + "-" + type2; mapIndex = indexCount + "-" + type2;
//主食品明細ID
mainParentId = item.getId();
} }
} }
OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean(); OrderBean.OrderDetailsBean request = new OrderBean.OrderDetailsBean();
request.setMemberId(GsaCloudApplication.getMemberId(mApplication)); request.setMemberId(GsaCloudApplication.getMemberId(mApplication));
request.setOrderId(MyOrderManage.getInstance().getOrderId()); request.setOrderId(MyOrderManage.getInstance().getOrderId());
request.setProductName(food.getProductName()); if (item.getId() != 0) {
request.setProductId(food.getProductId()); request.setId(item.getId());
request.setParentId(food.getParentId()); }
request.setTopId(food.getTopId()); request.setProductName(item.getProductName());
request.setNumber(food.getNumber()); request.setProductId(item.getProductId());
request.setPrice(food.getUnit_price()); request.setParentId(item.getParentId());
request.setType(food.getType()); request.setTopId(item.getTopId());
request.setAblediscount(food.getAblediscount()); request.setNumber(item.getNumber());
request.setPrice(item.getUnit_price());
request.setType(item.getType());
request.setAblediscount(item.getAblediscount());
request.setDiscountId(getDiscountIdByParentId(foodList, mainParentId));
request.setLunchboxPrice(0); request.setLunchboxPrice(0);
if (food.isNew()) { if (item.isNew() || item.getAblediscount() == 1) {
//這裡只添加新食品 //這裡只添加新食品或有折扣食品每次都更新
orderItems.add(request); orderItems.add(request);
//保存新食品，打印用到 //保存新食品，打印用到
MyOrderManage.getInstance().getNewFoodList().add(food); MyOrderManage.getInstance().getNewFoodList().add(item);
} }
int nextIndex = i + 1; int nextIndex = i + 1;
if (foodList.size() > nextIndex && foodList.get(nextIndex).getType() == DISCOUNT_TYPE) {
//下一個是折扣，跳過往下找
nextIndex++;
}
if (foodList.size() > nextIndex) { if (foodList.size() > nextIndex) {
if (foodList.get(nextIndex).getItemType() == 1 && orderItems != null && orderItems.size() > 0) { if (orderItems != null && orderItems.size() > 0 && foodList.get(nextIndex).getItemType() == 1) {
//下一個食品是不是主食品 //下一個食品是不是主食品
orderDetails.put(mapIndex, orderItems); orderDetails.put(mapIndex, orderItems);
} }
...@@ -584,6 +697,39 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -584,6 +697,39 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
} }
/** /**
* 根據主食品ID獲取對應折扣ID
*
* @param orderItems
* @param mainParentId
* @return
*/
private Long getDiscountIdByParentId(List<OrderDetail> orderItems, long mainParentId) {
Long discountId = null;
for (OrderDetail item : orderItems) {
if (item.getType() == DISCOUNT_TYPE && item.getParentId() == mainParentId) {
discountId = item.getProductId();
break;
}
}
return discountId;
}
/**
* 返回未送單整單折扣
*
* @return
*/
protected Discount getNesOrderDiscount() {
for (BillOrderMoney item : mOrderMoneyList) {
if (item.getStatus() == 0 && item.getType() == BillOrderMoney.DISCOUNT_TYPE) {
return item.getDiscount();
}
}
return null;
}
/**
* 返回未送單食品列表 * 返回未送單食品列表
* *
* @return * @return
...@@ -615,19 +761,6 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -615,19 +761,6 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
return orderDetails; return orderDetails;
} }
/**
* 返回整單折扣
*
* @return
*/
private Discount getOrderDiscount() {
for (BillOrderMoney item : mOrderMoneyList) {
if (item.getStatus() == 0 && item.getType() == BillOrderMoney.DISCOUNT_TYPE) {
return item.getDiscount();
}
}
return null;
}
protected boolean hasNesOrderFoods() { protected boolean hasNesOrderFoods() {
if (getNewOrderFoodLists().size() > 0) { if (getNewOrderFoodLists().size() > 0) {
......
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/MealStandPresenter.java
...@@ -4,7 +4,6 @@ import android.app.Application; ...@@ -4,7 +4,6 @@ import android.app.Application;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.View; import android.view.View;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.aspectj.XClickUtil; import com.gingersoft.gsa.cloud.aspectj.XClickUtil;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
...@@ -13,7 +12,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderBean; ...@@ -13,7 +12,7 @@ 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;
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.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
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;
...@@ -50,27 +49,19 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction; ...@@ -50,27 +49,19 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import org.simple.eventbus.EventBus; import org.simple.eventbus.EventBus;
import org.simple.eventbus.Subscriber; import org.simple.eventbus.Subscriber;
import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import androidx.appcompat.widget.ViewUtils;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull; import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import me.jessyan.rxerrorhandler.core.RxErrorHandler; import me.jessyan.rxerrorhandler.core.RxErrorHandler;
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber; import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
import okhttp3.FormBody;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.RequestBody; import okhttp3.RequestBody;
...@@ -127,8 +118,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -127,8 +118,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
//折扣数据 //折扣数据
private List<Discount> mDiscountList = new ArrayList<>(); private List<Discount> mDiscountList = new ArrayList<>();
private OrderDetail mCurrentOrderDetailBean;
private boolean RvMealClicked; private boolean RvMealClicked;
@Inject @Inject
...@@ -195,14 +184,17 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -195,14 +184,17 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
@Override @Override
public void onItemClick(OrderDetail datasBean, int position) { public void onItemClick(OrderDetail datasBean, int position) {
mRootView.recordOperat(true); mRootView.recordOperat(true);
RvMealClicked = true; RvMealClicked = true;
//设置当前操作的食品
mCurrentOrderDetailBean = datasBean;
mSelectMealAdapter.setMyOrderManageSelectPosition(); if (IActivity.getShowFinePage() != 2) {
loadComboData(datasBean, true); //设置当前操作的食品
mCurrentOrderDetailBean = datasBean;
mSelectMealAdapter.setMyOrderManageSelectPosition();
loadComboData(datasBean, true);
}
} }
@Override @Override
...@@ -251,9 +243,12 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -251,9 +243,12 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
return; return;
} }
//设置当前操作的套餐细项 //设置当前操作的套餐细项
mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(datasBean, mCurrentOrderDetailBean.getId(), 1, OrderDetail.COMBO_PROP, RvMealClicked); long id = mCurrentOrderDetailBean.isNew() ? mCurrentOrderDetailBean.getProductId() : mCurrentOrderDetailBean.getId();
mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(datasBean, id, 1, OrderDetail.COMBO_PROP, RvMealClicked);
//添加子项 //添加子项
addComboItem(mCurrentOrderDetailBean); addComboItem(mCurrentOrderDetailBean);
//更新折扣
updateDiscountItem();
} }
}); });
mModifierAdapter.setOnItemClickListener(new ModifierAdapter.OnItemClickListener() { mModifierAdapter.setOnItemClickListener(new ModifierAdapter.OnItemClickListener() {
...@@ -280,6 +275,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -280,6 +275,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
// loadModifierData(mCurrentOrderDetailBean.getProductId()); // loadModifierData(mCurrentOrderDetailBean.getProductId());
// } else { // } else {
addModifierItem(datasBean); addModifierItem(datasBean);
//更新折扣
updateDiscountItem();
// } // }
} }
}); });
...@@ -312,13 +309,14 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -312,13 +309,14 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private int addFoodItem(OrderDetail orderDetail) { private int addFoodItem(OrderDetail orderDetail) {
int addPosition = mSelectMealAdapter.addFoodItem(orderDetail); int addPosition = mSelectMealAdapter.addFoodItem(orderDetail);
if (orderDetail.getComboLevel() > 0) { if (orderDetail.getComboLevel() > 0) {
//自动添加组合子食品
if (mFoodComboList != null && mFoodComboList.size() > 0) { if (mFoodComboList != null && mFoodComboList.size() > 0) {
for (int i = 0; i < mFoodComboList.size(); i++) { for (int i = 0; i < mFoodComboList.size(); i++) {
ComboItem foodComboItem = mFoodComboList.get(i); //自动添加组合子食品
int defNumber = Integer.parseInt(foodComboItem.getDefmodifier()); ComboItem comboItem = mFoodComboList.get(i);
int defNumber = Integer.parseInt(comboItem.getDefmodifier());
if (defNumber != 0) { if (defNumber != 0) {
mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(foodComboItem, mCurrentOrderDetailBean.getId(), defNumber, OrderDetail.COMBO_PROP, RvMealClicked); long id = mCurrentOrderDetailBean.isNew() ? mCurrentOrderDetailBean.getProductId() : mCurrentOrderDetailBean.getId();
mCurrentOrderDetailBean = OrderDetail.comboTransOrderDetail(comboItem, id, defNumber, OrderDetail.COMBO_PROP, RvMealClicked);
addPosition = addComboItem(mCurrentOrderDetailBean); addPosition = addComboItem(mCurrentOrderDetailBean);
} }
} }
...@@ -329,7 +327,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -329,7 +327,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
Modifier modfier = mModifierList.get(i); Modifier modfier = mModifierList.get(i);
int defNumber = Integer.parseInt(modfier.getDefmodifier()); int defNumber = Integer.parseInt(modfier.getDefmodifier());
if (defNumber != 0) { if (defNumber != 0) {
addPosition = mSelectMealAdapter.addFoodItem(OrderDetail.modifierTransOrderDetail(modfier, mCurrentOrderDetailBean.getId(), defNumber)); long id = mCurrentOrderDetailBean.isNew() ? mCurrentOrderDetailBean.getProductId() : mCurrentOrderDetailBean.getId();
addPosition = mSelectMealAdapter.addFoodItem(OrderDetail.modifierTransOrderDetail(modfier, id, defNumber));
} }
} }
return addPosition; return addPosition;
...@@ -343,13 +342,23 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -343,13 +342,23 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
@Subscriber(tag = MealConstant.ADD_FOOD_MODIFIER) @Subscriber(tag = MealConstant.ADD_FOOD_MODIFIER)
private void addModifierItem(Modifier datasBean) { private void addModifierItem(Modifier datasBean) {
mCurrentOrderDetailBean = OrderDetail.modifierTransOrderDetail(datasBean, mCurrentOrderDetailBean.getId(), 1); long id = mCurrentOrderDetailBean.isNew() ? mCurrentOrderDetailBean.getProductId() : mCurrentOrderDetailBean.getId();
mCurrentOrderDetailBean = OrderDetail.modifierTransOrderDetail(datasBean, id, 1);
int addPosition = mSelectMealAdapter.addFoodItem(mCurrentOrderDetailBean); int addPosition = mSelectMealAdapter.addFoodItem(mCurrentOrderDetailBean);
mRootView.setMealRvScrollToPosition(addPosition); mRootView.setMealRvScrollToPosition(addPosition);
} }
private void addDiscountItem(Discount datasBean) { private void addDiscountItem(Discount datasBean) {
mCurrentOrderDetailBean = OrderDetail.discountTransOrderDetail(datasBean, getDisountPrice()); //主食品ID
long id = 0;
if (mSelectMealAdapter.getCurrentMainOrderDetail() != null) {
if (mCurrentOrderDetailBean.isNew()) {
id = mSelectMealAdapter.getCurrentMainOrderDetail().getProductId();
} else {
id = mSelectMealAdapter.getCurrentMainOrderDetail().getId();
}
}
mCurrentOrderDetailBean = OrderDetail.discountTransOrderDetail(datasBean, true,id, getDisountPrice());
int addPosition = mSelectMealAdapter.addFoodItem(mCurrentOrderDetailBean); int addPosition = mSelectMealAdapter.addFoodItem(mCurrentOrderDetailBean);
mRootView.setMealRvScrollToPosition(addPosition); mRootView.setMealRvScrollToPosition(addPosition);
} }
...@@ -425,11 +434,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -425,11 +434,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
SparseArray<String> numberAndCutPositionMap = new SparseArray<>(); SparseArray<String> numberAndCutPositionMap = new SparseArray<>();
OrderDetail currentMainOrderDetail = mSelectMealAdapter.getCurrentMainOrderDetail(); OrderDetail currentMainOrderDetail = mSelectMealAdapter.getCurrentMainOrderDetail();
if (currentMainOrderDetail != null) { if (currentMainOrderDetail != null) {
int start_position = mSelectMealAdapter.getSelect_full_start_position() + 1; int start_position = mSelectMealAdapter.getSelect_full_start_position();
int end_position = mSelectMealAdapter.getSelect_full_end_position() + 1; int end_position = mSelectMealAdapter.getSelect_full_end_position();
for (int i = mOrderFoodList.size() - 1; i >= 0; i--) { for (int i = mOrderFoodList.size() - 1; i >= 0; i--) {
int my_index = currentMainOrderDetail.getMyIndex(); if (start_position <= i && i <= end_position) {
if (start_position <= my_index && my_index <= end_position) {
OrderDetail item = mOrderFoodList.get(i); OrderDetail item = mOrderFoodList.get(i);
if (item.getItemType() == 3 && item.getTopId() == modifier.getTopId()) { if (item.getItemType() == 3 && item.getTopId() == modifier.getTopId()) {
//同一食品下的細項 //同一食品下的細項
...@@ -486,11 +494,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -486,11 +494,10 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
SparseArray<String> numberAndCutPositionMap = new SparseArray<>(); SparseArray<String> numberAndCutPositionMap = new SparseArray<>();
OrderDetail currentMainOrderDetail = mSelectMealAdapter.getCurrentMainOrderDetail(); OrderDetail currentMainOrderDetail = mSelectMealAdapter.getCurrentMainOrderDetail();
if (currentMainOrderDetail != null) { if (currentMainOrderDetail != null) {
int start_position = mSelectMealAdapter.getSelect_full_start_position() + 1; int start_position = mSelectMealAdapter.getSelect_full_start_position();
int end_position = mSelectMealAdapter.getSelect_full_end_position() + 1; int end_position = mSelectMealAdapter.getSelect_full_end_position();
for (int i = mOrderFoodList.size() - 1; i >= 0; i--) { for (int i = mOrderFoodList.size() - 1; i >= 0; i--) {
int my_index = currentMainOrderDetail.getMyIndex(); if (start_position <= i && i <= end_position) {
if (start_position <= my_index && my_index <= end_position) {
OrderDetail item = mOrderFoodList.get(i); OrderDetail item = mOrderFoodList.get(i);
if (item.getItemType() == 2 && item.getTopId() == comboItem.getComId()) { if (item.getItemType() == 2 && item.getTopId() == comboItem.getComId()) {
//同一套餐下的子食品 //同一套餐下的子食品
...@@ -542,7 +549,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -542,7 +549,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
return -1; return -1;
} }
public void createOrder() { public void createOrder() {
CreateOrderRequest request = getCreateOrderRequest(getOrderFoodLists()); CreateOrderRequest request = getCreateOrderRequest(getOrderFoodLists());
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
...@@ -654,7 +660,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -654,7 +660,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
public void deleteFood(int maxNumber, int deleteNumber, long reasonId) { public void deleteFood(int maxNumber, int deleteNumber, long reasonId) {
String ids = getSelectFoodIds(); String ids = getSelectOldFoodIds();
if (TextUtils.isEmpty(ids)) { if (TextUtils.isEmpty(ids)) {
return; return;
} }
...@@ -757,7 +763,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -757,7 +763,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private void showDeleteFoodDialog(int maxNumber, int deleteNumber, int reasonId, String reason) { private void showDeleteFoodDialog(int maxNumber, int deleteNumber, int reasonId, String reason) {
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.setTitleIcon(R.drawable.qmui_icon_dialog_doubt);
dialogBuilder.setMessage("是否確認取消該食品?" + "\n取消原因 [" + reason + "]"); dialogBuilder.setMessage("是否確認取消該食品?" + "\n取消原因 [" + reason + "]");
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) -> {
...@@ -828,7 +834,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -828,7 +834,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
mRootView.showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode); mRootView.showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
return; return;
} }
if (IActivity.getCurrentViewMode() == MealConstant.discount_ViewMode && getOrderFoodLists().get(mSelectMealAdapter.getSelect_position()).getProp() != OrderDetail.DISCOUNT_PROP) { if (IActivity.getCurrentViewMode() == MealConstant.discount_ViewMode && getOrderFoodLists().get(mSelectMealAdapter.getSelect_position()).getProp() == OrderDetail.DISCOUNT_PROP) {
//當點選折扣操作 不可删除食品 //當點選折扣操作 不可删除食品
return; return;
} }
...@@ -838,6 +844,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -838,6 +844,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
} }
if (getOrderFoodLists().get(mSelectMealAdapter.getSelect_position()) != null) { if (getOrderFoodLists().get(mSelectMealAdapter.getSelect_position()) != null) {
mSelectMealAdapter.removeChildItem(); mSelectMealAdapter.removeChildItem();
//更新折扣
updateDiscountItem();
updateOrderFoodNumber(); updateOrderFoodNumber();
} }
} }
...@@ -1174,7 +1183,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -1174,7 +1183,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
} }
} }
/** /**
* 更新食品數據 * 更新食品數據
* *
...@@ -1256,9 +1264,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -1256,9 +1264,9 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
OrderDetail orderDetail1 = mOrderFoodList.get(i); OrderDetail orderDetail1 = mOrderFoodList.get(i);
if (orderDetail1.getProp() == OrderDetail.DISCOUNT_PROP) { if (orderDetail1.getProp() == OrderDetail.DISCOUNT_PROP) {
//折上折減去以折扣金額 //折上折減去以折扣金額
discount -= orderDetail1.getPrice(); discount = MoneyUtil.sub(discount, orderDetail1.getPrice());
} else { } else {
discount += orderDetail1.getPrice(); discount = MoneyUtil.sum(discount, orderDetail1.getPrice());
} }
//參與折扣 //參與折扣
orderDetail1.setAblediscount(1); orderDetail1.setAblediscount(1);
......
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,7 +413,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -410,7 +413,8 @@ 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,7 +128,9 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -128,7 +128,9 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
noMoreData = false; noMoreData = false;
} }
} else { } else {
mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null); if(!noMoreData){
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/MealStandActivity.java
...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.activity; ...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.activity;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock; import android.os.SystemClock;
...@@ -48,7 +49,7 @@ import com.gingersoft.gsa.cloud.database.utils.FoodModifierDaoUtils; ...@@ -48,7 +49,7 @@ import com.gingersoft.gsa.cloud.database.utils.FoodModifierDaoUtils;
import com.gingersoft.gsa.cloud.print.PrinterUtils; import com.gingersoft.gsa.cloud.print.PrinterUtils;
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.constans.GoldConstants;
import com.gingersoft.gsa.cloud.table.di.component.DaggerMealStandComponent; import com.gingersoft.gsa.cloud.table.di.component.DaggerMealStandComponent;
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.constant.MealConstant; import com.gingersoft.gsa.cloud.table.mvp.model.constant.MealConstant;
...@@ -71,6 +72,7 @@ import com.jess.arms.base.DefaultAdapter; ...@@ -71,6 +72,7 @@ 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.util.QMUIDisplayHelper; import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.util.QMUIDrawableHelper;
import com.qmuiteam.qmui.widget.dialog.QMUITipDialog; import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
import org.simple.eventbus.EventBus; import org.simple.eventbus.EventBus;
...@@ -110,8 +112,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -110,8 +112,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
@BindView(R2.id.ll_food_group) @BindView(R2.id.ll_food_group)
LinearLayout ll_food_group; LinearLayout ll_food_group;
@BindView(R2.id.ll_food_group_point) @BindView(R2.id.ll_food_group_point)
LinearLayout ll_food_group_point; LinearLayout ll_food_group_point;
@BindView(R2.id.rv_food_group) @BindView(R2.id.rv_food_group)
...@@ -127,8 +127,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -127,8 +127,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
@BindView(R2.id.rl_fine_tabs) @BindView(R2.id.rl_fine_tabs)
RelativeLayout rl_fine_tabs; RelativeLayout rl_fine_tabs;
@BindView(R2.id.iv_fine_back)
ImageView iv_fine_back;
@BindView(R2.id.tabs_fine) @BindView(R2.id.tabs_fine)
PagerSlidingTabStrip tabs_fine; PagerSlidingTabStrip tabs_fine;
@BindView(R2.id.pager_fine) @BindView(R2.id.pager_fine)
...@@ -209,22 +207,24 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -209,22 +207,24 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
@BindView(R2.id.ll_modify) @BindView(R2.id.ll_modify)
LinearLayout ll_modify; LinearLayout ll_modify;
@BindView(R2.id.btn_add_delete) @BindView(R2.id.btn_taste)
Button btn_add_delete; Button btn_taste;
@BindView(R2.id.btn_msg) @BindView(R2.id.btn_msg)
Button btn_msg; Button btn_msg;
// @BindView(R2.id.btn_multiple_selection)
// Button btn_multiple_selection;
@BindView(R2.id.btn_delete) @BindView(R2.id.btn_delete)
Button btn_delete; Button btn_delete;
@BindView(R2.id.btn_end) @BindView(R2.id.btn_end)
Button btn_end; Button btn_end;
private FragmentManager fm; private FragmentManager fm;
private FineItemAllFragment fineItemAllFragment; private FineItemAllFragment modMsgFineItemFragment, modSasteFineItemFragment, modCommFineItemFragment;
private FineItemKindFragment fineItemKindFragment; // private FineItemKindFragment fineItemKindFragment;
//是否初始化细项布局 //是否初始化细项布局
private boolean initFineItemLayout = false; private boolean initFineItemLayout = false;
private int showFinePage = 1; private int showFinePage = 0;
private ChooseNumberDialog chooseNumberDialog; private ChooseNumberDialog chooseNumberDialog;
...@@ -282,6 +282,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -282,6 +282,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
mPresenter.initItemClickListener(); mPresenter.initItemClickListener();
//初始化默认食品组 //初始化默认食品组
mPresenter.initMealData(); mPresenter.initMealData();
setViewDrawableColor();
//搜索 //搜索
keyView.setOnConfirmCallBack(inputText -> { keyView.setOnConfirmCallBack(inputText -> {
if (TextUtils.isEmpty(inputText)) if (TextUtils.isEmpty(inputText))
...@@ -306,7 +307,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -306,7 +307,6 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
super.onResume(); super.onResume();
//更新點餐信息 //更新點餐信息
mPresenter.resetSelected(); mPresenter.resetSelected();
mPresenter.getSelectMealAdapter().notifyDataSetChanged();
mPresenter.updateOrderFoodNumber(); mPresenter.updateOrderFoodNumber();
initOrderDetail(); initOrderDetail();
} }
...@@ -434,14 +434,17 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -434,14 +434,17 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
fm = getSupportFragmentManager(); fm = getSupportFragmentManager();
List<Fragment> fragmentList = new ArrayList<>(); List<Fragment> fragmentList = new ArrayList<>();
// Fragment标签 // Fragment标签
fineItemKindFragment = FineItemKindFragment.newInstance(); modSasteFineItemFragment = FineItemAllFragment.newInstance();
fineItemAllFragment = FineItemAllFragment.newInstance(); modMsgFineItemFragment = FineItemAllFragment.newInstance();
fragmentList.add(fineItemKindFragment); modCommFineItemFragment = FineItemAllFragment.newInstance();
fragmentList.add(fineItemAllFragment); fragmentList.add(modSasteFineItemFragment);
fragmentList.add(modMsgFineItemFragment);
// fragmentList.add(modCommFineItemFragment);
// tab title // tab title
String[] tabTitles = new String[2]; String[] tabTitles = new String[3];
tabTitles[0] = "口味"; tabTitles[0] = "口味";
tabTitles[1] = "特別信息"; tabTitles[1] = "特別信息";
// tabTitles[2] = "多選";
BaseFragmentAdapter adapter = new BaseFragmentAdapter(this, fm, fragmentList, Arrays.asList(tabTitles)); BaseFragmentAdapter adapter = new BaseFragmentAdapter(this, fm, fragmentList, Arrays.asList(tabTitles));
pager_fine.setAdapter(adapter); pager_fine.setAdapter(adapter);
...@@ -474,7 +477,28 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -474,7 +477,28 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
tabs_fine.setIndicatorinFollower(false); tabs_fine.setIndicatorinFollower(false);
//与ViewPager关联，这样指示器就可以和ViewPager联动 //与ViewPager关联，这样指示器就可以和ViewPager联动
tabs_fine.setViewPager(pager_fine); tabs_fine.setViewPager(pager_fine);
pager_fine.setOffscreenPageLimit(1); pager_fine.setOffscreenPageLimit(2);
pager_fine.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
}
@Override
public void onPageSelected(int position) {
if (showFinePage == 2 && position != 2) {
//從多選頁離開 重置選中
mPresenter.resetSelected();
}
showFinePage = position;
}
@Override
public void onPageScrollStateChanged(int state) {
}
});
initFineItemLayout = true; initFineItemLayout = true;
...@@ -485,11 +509,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -485,11 +509,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
@Override @Override
public void showFinePage() { public void showFinePage() {
if (showFinePage == 1) { pager_fine.setCurrentItem(showFinePage);
pager_fine.setCurrentItem(0);
} else {
pager_fine.setCurrentItem(1);
}
} }
@Override @Override
...@@ -535,7 +555,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -535,7 +555,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
@OnClick({R2.id.btn_key1, R2.id.btn_key2, R2.id.btn_key3, R2.id.btn_key4, R2.id.btn_key5, R2.id.btn_keys, @OnClick({R2.id.btn_key1, R2.id.btn_key2, R2.id.btn_key3, R2.id.btn_key4, R2.id.btn_key5, R2.id.btn_keys,
R2.id.btn_numberman, R2.id.btn_fid, R2.id.btn_meal_delete, R2.id.btn_send_order, R2.id.tv_no_save_return, R2.id.fl_order_content, R2.id.btn_numberman, R2.id.btn_fid, R2.id.btn_meal_delete, R2.id.btn_send_order, R2.id.tv_no_save_return, R2.id.fl_order_content,
R2.id.btn_add_delete, R2.id.btn_msg, R2.id.btn_delete, R2.id.btn_end, R2.id.iv_fine_back}) R2.id.btn_taste, R2.id.btn_msg, R2.id.btn_delete, R2.id.btn_end})
public void onClick(View v) { public void onClick(View v) {
recordOperat(true); recordOperat(true);
...@@ -560,18 +580,24 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -560,18 +580,24 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
startActivityForResult(intent, ORDER_CONTENT_CODE);//如果打印成功會回調 startActivityForResult(intent, ORDER_CONTENT_CODE);//如果打印成功會回調
} else if (id == R.id.tv_no_save_return) { } else if (id == R.id.tv_no_save_return) {
returnBeforeActivity(true); returnBeforeActivity(true);
} else if (id == R.id.btn_add_delete) { } else if (id == R.id.btn_taste) {
showFinePage = 1; showFinePage = 0;
showRemarkInfo(); showRemarkInfo();
} else if (id == R.id.btn_msg) { } else if (id == R.id.btn_msg) {
showFinePage = 2; showFinePage = 1;
showRemarkInfo(); showRemarkInfo();
} else if (id == R.id.btn_delete) { }
// else if (id == R.id.btn_multiple_selection) {
// showFinePage = 2;
// showRemarkInfo();
// }
else if (id == R.id.btn_delete) {
mPresenter.deleteChildItem(); mPresenter.deleteChildItem();
} else if (id == R.id.btn_end) { } else if (id == R.id.btn_end) {
showFinePage = 0;
//從多選頁離開 重置選中
// mPresenter.resetSelected();
showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode); showViewModeVisibility(MealConstant.food_group_ViewMode, MealConstant.food_ViewMode);
} else if (id == R.id.iv_fine_back) {
showViewModeVisibility(MealConstant.combo_ViewMode, MealConstant.modifier_ViewMode);
} else if (id == R.id.btn_key1 || id == R.id.btn_key2 || id == R.id.btn_key3 || id == R.id.btn_key4 || id == R.id.btn_key5 || id == R.id.btn_keys) { } else if (id == R.id.btn_key1 || id == R.id.btn_key2 || id == R.id.btn_key3 || id == R.id.btn_key4 || id == R.id.btn_key5 || id == R.id.btn_keys) {
int i = Integer.parseInt(v.getTag().toString()); int i = Integer.parseInt(v.getTag().toString());
...@@ -754,7 +780,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -754,7 +780,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
rv_discount.setAdapter(adapter); rv_discount.setAdapter(adapter);
} }
private GridLayoutManager foodRecycleLayoutManager,comboRecycleLayoutManager,modifierRecycleLayoutManager,discountRecycleLayoutManager; private GridLayoutManager foodRecycleLayoutManager, comboRecycleLayoutManager, modifierRecycleLayoutManager, discountRecycleLayoutManager;
@Override @Override
public void setSelectFoodRecycleLayoutManager() { public void setSelectFoodRecycleLayoutManager() {
...@@ -985,19 +1011,23 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -985,19 +1011,23 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
initFineItemTabBarViewPage(); initFineItemTabBarViewPage();
fineItemAllFragment.onMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId()); modMsgFineItemFragment.onModMsgMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
// EventBus.getDefault().post(mSoldoutList_full, "FineItemAllFragment_onCurrentSlodoutFoodList_FullEvent"); // EventBus.getDefault().post(mSoldoutList_full, "FineItemAllFragment_onCurrentSlodoutFoodList_FullEvent");
// EventBus.getDefault().post(mPresenter.getCurrentOrderDetailBean().getFid(), "FineItemAllFragment_onMidEvent"); // EventBus.getDefault().post(mPresenter.getCurrentOrderDetailBean().getFid(), "FineItemAllFragment_onMidEvent");
fineItemKindFragment.onMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId()); modSasteFineItemFragment.onModSasteEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
// EventBus.getDefault().post(mSoldoutList_full, "FineItemKindFragment_onCurrentSlodoutFoodList_FullEvent"); // EventBus.getDefault().post(mSoldoutList_full, "FineItemKindFragment_onCurrentSlodoutFoodList_FullEvent");
// EventBus.getDefault().post(mPresenter.getCurrentOrderDetailBean().getFid(), "FineItemKindFragment_onMidEvent"); // EventBus.getDefault().post(mPresenter.getCurrentOrderDetailBean().getFid(), "FineItemKindFragment_onMidEvent");
// modCommFineItemFragment.onModCommEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
} else { } else {
fineItemAllFragment.onMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId()); modMsgFineItemFragment.onModMsgMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
modSasteFineItemFragment.onModSasteEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
fineItemKindFragment.onMidEvent(mPresenter.getCurrentOrderDetailBean().getProductId()); // modCommFineItemFragment.onModCommEvent(mPresenter.getCurrentOrderDetailBean().getProductId());
showFinePage(); showFinePage();
...@@ -1068,4 +1098,45 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen ...@@ -1068,4 +1098,45 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
layoutParam.addRule(RelativeLayout.BELOW, R.id.rv_combo); layoutParam.addRule(RelativeLayout.BELOW, R.id.rv_combo);
rv_modifier.setLayoutParams(layoutParam); rv_modifier.setLayoutParams(layoutParam);
} }
private void setViewDrawableColor() {
Drawable tasteDrawable = ArmsUtils.getDrawablebyResource(this, R.mipmap.meal_fine_taste);
QMUIDrawableHelper.setDrawableTintColor(tasteDrawable, ArmsUtils.getColor(mContext, R.color.theme_white_color));
tasteDrawable.invalidateSelf();
Drawable msgDrawable = ArmsUtils.getDrawablebyResource(this, R.mipmap.meal_fine_info);
QMUIDrawableHelper.setDrawableTintColor(msgDrawable, ArmsUtils.getColor(mContext, R.color.theme_white_color));
msgDrawable.invalidateSelf();
Drawable commDrawable = ArmsUtils.getDrawablebyResource(this, R.mipmap.meal_fine_info);
QMUIDrawableHelper.setDrawableTintColor(commDrawable, ArmsUtils.getColor(mContext, R.color.theme_white_color));
commDrawable.invalidateSelf();
Drawable deleteDrawable = ArmsUtils.getDrawablebyResource(this, R.mipmap.meal_fine_delete);
QMUIDrawableHelper.setDrawableTintColor(deleteDrawable, ArmsUtils.getColor(mContext, R.color.theme_white_color));
deleteDrawable.invalidateSelf();
Drawable endDrawable = ArmsUtils.getDrawablebyResource(this, R.mipmap.meal_fine_end);
QMUIDrawableHelper.setDrawableTintColor(endDrawable, ArmsUtils.getColor(mContext, R.color.theme_white_color));
endDrawable.invalidateSelf();
tasteDrawable.setBounds(0, 0, tasteDrawable.getMinimumWidth(), tasteDrawable.getMinimumHeight());
msgDrawable.setBounds(0, 0, msgDrawable.getMinimumWidth(), msgDrawable.getMinimumHeight());
commDrawable.setBounds(0, 0, commDrawable.getMinimumWidth(), commDrawable.getMinimumHeight());
deleteDrawable.setBounds(0, 0, deleteDrawable.getMinimumWidth(), deleteDrawable.getMinimumHeight());
endDrawable.setBounds(0, 0, endDrawable.getMinimumWidth(), endDrawable.getMinimumHeight());
btn_taste.setPadding(0, 0, 0, 0);
btn_taste.setCompoundDrawables(tasteDrawable, null, null, null);
btn_msg.setCompoundDrawables(msgDrawable, null, null, null);
// btn_multiple_selection.setCompoundDrawables(commDrawable, null, null, null);
btn_delete.setCompoundDrawables(deleteDrawable, null, null, null);
btn_end.setCompoundDrawables(endDrawable, null, null, null);
}
public int getShowFinePage() {
return showFinePage;
}
} }
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()) {
tableno = OpenTableManage.getDefault().getTableBean().getTableName(); if (OpenTableManage.getDefault().getTableBean() != null) {
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();
} }
...@@ -222,7 +224,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements ...@@ -222,7 +224,7 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
btn_order_count.setVisibility(View.INVISIBLE); btn_order_count.setVisibility(View.INVISIBLE);
} }
tv_whole.setText("合計 $" + mPresenter.getFoodTotal()); tv_whole.setText("合計 $" + mPresenter.getFoodTotal());
tv_total.setText("$" + mPresenter.getTotalAmount()); tv_total.setText("$" + mPresenter.getTotalAmount());
setDifferenceText(); setDifferenceText();
} }
......
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;
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
...@@ -23,7 +23,9 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean; ...@@ -23,7 +23,9 @@ 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.LanguageUtils; import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderDetailComponent; import com.gingersoft.gsa.cloud.table.di.component.DaggerOrderDetailComponent;
...@@ -32,8 +34,8 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem; ...@@ -32,8 +34,8 @@ import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
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.presenter.orderManager.OrderDetailPresenter; import com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager.OrderDetailPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderDetailItemAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterDetailFoodAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderDetailPayMethodAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterMoneyAdapter;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3; import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3;
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;
...@@ -88,22 +90,18 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -88,22 +90,18 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
TextView tv_food_detail_text; TextView tv_food_detail_text;
@BindView(R2.id.recycler_food) @BindView(R2.id.recycler_food)
RecyclerView recycler_food; RecyclerView recycler_food;
@BindView(R2.id.recycler_discount) @BindView(R2.id.recycler_order_moeny)
RecyclerView recycler_discount; RecyclerView recycler_order_moeny;
@BindView(R2.id.recycler_pay_method) @BindView(R2.id.recycler_pay_method)
RecyclerView recycler_pay_method; RecyclerView recycler_pay_method;
@BindView(R2.id.tv_total_text) @BindView(R2.id.tv_total_text)
TextView tv_total_text; TextView tv_total_text;
@BindView(R2.id.tv_server_money_text)
TextView tv_server_money_text;
@BindView(R2.id.tv_total_money_text) @BindView(R2.id.tv_total_money_text)
TextView tv_total_money_text; TextView tv_total_money_text;
@BindView(R2.id.tv_total) @BindView(R2.id.tv_total)
TextView tv_total; TextView tv_total;
@BindView(R2.id.tv_server_money)
TextView tv_server_money;
@BindView(R2.id.tv_total_money) @BindView(R2.id.tv_total_money)
TextView tv_total_money; TextView tv_total_money;
...@@ -124,13 +122,16 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -124,13 +122,16 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
TextView tv_order_status; TextView tv_order_status;
private OrderDetailItem mOrderDetailItem; private OrderDetailItem mOrderDetailItem;
private OrderDetailItemAdapter mOrderDetailFoodAdapter;
private List<SectionTextItem3> mSectionTextItem3FoodList = new ArrayList<>();
private List<OrderDetail> mOrderDetailList; private List<OrderDetail> mOrderDetailList;
private OrderDetailPayMethodAdapter mOrderDetailPayMethodAdapter; private OrderCenterDetailFoodAdapter mOrderCenterDetailFoodAdapter;
private List<SectionTextItem3> mSectionTextItem3PayMethodList = new ArrayList<>(); private List<SectionTextItem3> mOrderCenterDetailFoodList = new ArrayList<>();
private OrderCenterMoneyAdapter mOrderCenterMoneyAdapter;
private List<SectionTextItem3> mOrderCenterMoneyList = new ArrayList<>();
private OrderCenterMoneyAdapter mOrderDetailPayMethodAdapter;
private List<SectionTextItem3> mOrderCenterPayMethodList = new ArrayList<>();
@Override @Override
public void setupActivityComponent(@NonNull AppComponent appComponent) { public void setupActivityComponent(@NonNull AppComponent appComponent) {
...@@ -167,50 +168,51 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -167,50 +168,51 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
if (!TextUtils.isEmpty(orderDetailItem.getEndTime())) { if (!TextUtils.isEmpty(orderDetailItem.getEndTime())) {
tv_pay_time.setText(payBill + TimeUtil.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtil.dateFormatYMDHM)); tv_pay_time.setText(payBill + TimeUtil.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtil.dateFormatYMDHM));
} }
tv_total.setText("$" + orderDetailItem.getTotalAmount()); tv_total_money.setText("$" + orderDetailItem.getAmount());
tv_total_money.setText("$" + orderDetailItem.getTotalAmount());
tv_server_money.setVisibility(View.GONE);
tv_server_money_text.setVisibility(View.GONE);
setOrderStatus(orderDetailItem); setOrderStatus(orderDetailItem);
mOrderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetailItem.orderTransOrderDetails(orderDetailItem.getOrderDetails())); mOrderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetail.orderTransOrderDetails(orderDetailItem.getOrderDetails()));
setOrderDetailFoodAdapter(mOrderDetailList); setOrderDetailAdapter(mOrderDetailList);
double totalMoney = getTotalMoney();
tv_total.setText("$" + totalMoney);
setOrderMoneyAdpater(orderDetailItem, totalMoney);
setOrderPayMethodAdapter(orderDetailItem); setOrderPayMethodAdapter(orderDetailItem);
} }
} }
/**
* 設置訂單狀態 private void setOrderMoneyAdpater(OrderDetailItem orderDetailItem, double totalMoney) {
* if (mOrderCenterMoneyList.size() > 0) {
* @param item mOrderCenterMoneyList.clear();
*/ }
private void setOrderStatus(OrderDetailItem item) { Discount discount = getOrderDiscount(orderDetailItem, totalMoney);
if (item.getStatus() == 6) { if (discount != null) {
btn_print_order.setVisibility(View.GONE); mOrderCenterMoneyList.addAll(SectionTextItem3.discountTransSectionTextItem3(discount));
btn_modify_order.setVisibility(View.GONE); }
btn_cancel_order.setVisibility(View.GONE); if (mOrderCenterMoneyAdapter == null) {
tv_order_status.setVisibility(View.VISIBLE); mOrderCenterMoneyAdapter = new OrderCenterMoneyAdapter(mOrderCenterMoneyList);
recycler_order_moeny.setAdapter(mOrderCenterMoneyAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
recycler_order_moeny.setLayoutManager(linearLayoutManager);
} else { } else {
btn_print_order.setVisibility(View.VISIBLE); mOrderCenterMoneyAdapter.notifyDataSetChanged();
btn_modify_order.setVisibility(View.VISIBLE);
btn_cancel_order.setVisibility(View.VISIBLE);
tv_order_status.setVisibility(View.GONE);
} }
} }
private void setOrderDetailFoodAdapter(List<OrderDetail> orderDetailList) { private void setOrderDetailAdapter(List<OrderDetail> orderDetailList) {
if (mOrderDetailFoodAdapter == null) { if (mOrderCenterDetailFoodAdapter == null) {
mSectionTextItem3FoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList)); mOrderCenterDetailFoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList));
mOrderDetailFoodAdapter = new OrderDetailItemAdapter(mSectionTextItem3FoodList); mOrderCenterDetailFoodAdapter = new OrderCenterDetailFoodAdapter(mOrderCenterDetailFoodList);
recycler_food.setAdapter(mOrderDetailFoodAdapter); recycler_food.setAdapter(mOrderCenterDetailFoodAdapter);
LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false); LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
recycler_food.setLayoutManager(allOrderRecycleLayoutManager); recycler_food.setLayoutManager(allOrderRecycleLayoutManager);
} else { } else {
mSectionTextItem3FoodList.clear(); mOrderCenterDetailFoodList.clear();
mSectionTextItem3FoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList)); mOrderCenterDetailFoodList.addAll(SectionTextItem3.orderDetailTransSectionTextItem3(orderDetailList));
mOrderDetailFoodAdapter.notifyDataSetChanged(); mOrderCenterDetailFoodAdapter.notifyDataSetChanged();
} }
} }
...@@ -218,14 +220,14 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -218,14 +220,14 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem); List<PayMethod> payMethodList = getPayMethodList(orderDetailItem);
List<SectionTextItem3> sectionTextItem3List = SectionTextItem3.orderPayMethodTransSectionTextItem3(payMethodList); List<SectionTextItem3> sectionTextItem3List = SectionTextItem3.orderPayMethodTransSectionTextItem3(payMethodList);
if (mOrderDetailPayMethodAdapter == null) { if (mOrderDetailPayMethodAdapter == null) {
mSectionTextItem3PayMethodList.addAll(sectionTextItem3List); mOrderCenterPayMethodList.addAll(sectionTextItem3List);
mOrderDetailPayMethodAdapter = new OrderDetailPayMethodAdapter(mSectionTextItem3PayMethodList); mOrderDetailPayMethodAdapter = new OrderCenterMoneyAdapter(mOrderCenterPayMethodList);
recycler_pay_method.setAdapter(mOrderDetailPayMethodAdapter); recycler_pay_method.setAdapter(mOrderDetailPayMethodAdapter);
LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false); LinearLayoutManager allOrderRecycleLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
recycler_pay_method.setLayoutManager(allOrderRecycleLayoutManager); recycler_pay_method.setLayoutManager(allOrderRecycleLayoutManager);
} else { } else {
mSectionTextItem3PayMethodList.clear(); mOrderCenterPayMethodList.clear();
mSectionTextItem3PayMethodList.addAll(sectionTextItem3List); mOrderCenterPayMethodList.addAll(sectionTextItem3List);
mOrderDetailPayMethodAdapter.notifyDataSetChanged(); mOrderDetailPayMethodAdapter.notifyDataSetChanged();
} }
//設置打印所需支付方式 //設置打印所需支付方式
...@@ -256,6 +258,52 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -256,6 +258,52 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
return payMethodList; return payMethodList;
} }
private Discount getOrderDiscount(OrderDetailItem orderDetailItem, double totalMoney) {
if (orderDetailItem.getRemark() != null) {
//折扣
Discount discount = new Discount();
discount.setType(orderDetailItem.getType());
discount.setRemark(orderDetailItem.getRemark());
discount.setDiscount_value(orderDetailItem.getDiscountValue());
double discountPrice = Discount.calculationDiscount(discount, totalMoney);
discount.setAmount(discountPrice);
return discount;
}
return null;
}
/**
* 返回合計金額
*
* @return
*/
private double getTotalMoney() {
double otherMoney = 0.0;
for (SectionTextItem3 item : mOrderCenterDetailFoodList) {
otherMoney = MoneyUtil.sum(otherMoney, Double.parseDouble(item.getRightText()));
}
return otherMoney;
}
/**
* 設置訂單狀態
*
* @param item
*/
private void setOrderStatus(OrderDetailItem item) {
if (item.getStatus() == 6) {
btn_print_order.setVisibility(View.GONE);
btn_modify_order.setVisibility(View.GONE);
btn_cancel_order.setVisibility(View.GONE);
tv_order_status.setVisibility(View.VISIBLE);
} else {
btn_print_order.setVisibility(View.VISIBLE);
btn_modify_order.setVisibility(View.VISIBLE);
btn_cancel_order.setVisibility(View.VISIBLE);
tv_order_status.setVisibility(View.GONE);
}
}
@OnClick({R2.id.btn_print_order, R2.id.btn_cancel_order, R2.id.btn_modify_order}) @OnClick({R2.id.btn_print_order, R2.id.btn_cancel_order, R2.id.btn_modify_order})
public void onClick(View v) { public void onClick(View v) {
int id = v.getId(); int id = v.getId();
...@@ -290,7 +338,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -290,7 +338,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
OpenTableManage.getDefault().setPeopleNumber(datasBean.getPerson()); OpenTableManage.getDefault().setPeopleNumber(datasBean.getPerson());
List<OrderBean.OrderDetailsBean> orderDetailsBeans = datasBean.getOrderDetails(); List<OrderBean.OrderDetailsBean> orderDetailsBeans = datasBean.getOrderDetails();
List<OrderDetail> orderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetailItem.orderTransOrderDetails(orderDetailsBeans)); List<OrderDetail> orderDetailList = OrderAssemblyUtil.assemblyOrder(OrderDetail.orderTransOrderDetails(orderDetailsBeans));
MyOrderManage.getInstance().setOrderFoodList(orderDetailList); MyOrderManage.getInstance().setOrderFoodList(orderDetailList);
Intent intent = new Intent(this, MealStandActivity.class); Intent intent = new Intent(this, MealStandActivity.class);
...@@ -327,6 +375,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -327,6 +375,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
private void showCancelDialog() { private void showCancelDialog() {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(this); QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(this);
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) -> {
...@@ -360,7 +409,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -360,7 +409,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
tv_food_detail_text.setText(LanguageUtils.get_language_system(this, "food.detail.text", "食品詳情")); tv_food_detail_text.setText(LanguageUtils.get_language_system(this, "food.detail.text", "食品詳情"));
tv_total_text.setText(LanguageUtils.get_language_system(this, "total.text", "合計")); tv_total_text.setText(LanguageUtils.get_language_system(this, "total.text", "合計"));
tv_server_money_text.setText(LanguageUtils.get_language_system(this, "service.fee.text", "服務費")); // tv_server_money_text.setText(LanguageUtils.get_language_system(this, "service.fee.text", "服務費"));
tv_total_money_text.setText(LanguageUtils.get_language_system(this, "order.countall_all", "總金額")); tv_total_money_text.setText(LanguageUtils.get_language_system(this, "order.countall_all", "總金額"));
btn_print_order.setText(LanguageUtils.get_language_system(this, "print.order", "打印賬單")); btn_print_order.setText(LanguageUtils.get_language_system(this, "print.order", "打印賬單"));
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/FineItemOneAdapter.java
package com.gingersoft.gsa.cloud.table.mvp.ui.adapter; package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -20,7 +18,6 @@ import com.jess.arms.base.DefaultAdapter; ...@@ -20,7 +18,6 @@ import com.jess.arms.base.DefaultAdapter;
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 java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
...@@ -80,7 +77,7 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> { ...@@ -80,7 +77,7 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
@Override @Override
public int getLayoutId(int viewType) { public int getLayoutId(int viewType) {
return R.layout.meal_item_food; return R.layout.ui_item_food;
} }
class DateTimeItemHolder extends BaseHolder<Modifier> { class DateTimeItemHolder extends BaseHolder<Modifier> {
...@@ -116,15 +113,15 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> { ...@@ -116,15 +113,15 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
return ; return ;
} }
if (mOnItemClickListener != null) { if (mOnItemClickListener != null) {
//设置当前选中item颜色 // //设置当前选中item颜色
datasBean.setSelected(true); // datasBean.setSelected(true);
tv_food_name.setBackgroundColor(mContext.getResources().getColor(R.color.orange_500)); // tv_food_name.setBackgroundColor(mContext.getResources().getColor(R.color.orange_500));
//
if (currentSelectPosition < mInfos.size()) { // if (currentSelectPosition < mInfos.size()) {
//重置上次选中item的颜色 // //重置上次选中item的颜色
mInfos.get(currentSelectPosition).setSelected(false); // mInfos.get(currentSelectPosition).setSelected(false);
notifyItemChanged(currentSelectPosition, 1); // notifyItemChanged(currentSelectPosition, 1);
} // }
//记录当前操作的position //记录当前操作的position
currentSelectPosition = position; currentSelectPosition = position;
...@@ -193,13 +190,13 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> { ...@@ -193,13 +190,13 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
// } // }
// } else { // } else {
//后台没有设置颜色当前选中高亮色,没有选中默认使用绿色 //后台没有设置颜色当前选中高亮色,没有选中默认使用绿色
if (datasBean.isSelected()) { // if (datasBean.isSelected()) {
tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.orange_500)); // tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.orange_500));
tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color)); // tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color));
} else { // } else {
tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.Grass_green)); tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color)); tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color));
} // }
// } // }
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/FineItemTwoAdapter.java
package com.gingersoft.gsa.cloud.table.mvp.ui.adapter; package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.text.TextUtils;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -20,7 +18,6 @@ import com.jess.arms.base.DefaultAdapter; ...@@ -20,7 +18,6 @@ import com.jess.arms.base.DefaultAdapter;
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 java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
...@@ -80,7 +77,7 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> { ...@@ -80,7 +77,7 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> {
@Override @Override
public int getLayoutId(int viewType) { public int getLayoutId(int viewType) {
return R.layout.meal_item_food; return R.layout.ui_item_food;
} }
class FineItemHolder extends BaseHolder<Modifier> { class FineItemHolder extends BaseHolder<Modifier> {
...@@ -123,15 +120,15 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> { ...@@ -123,15 +120,15 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> {
mOnItemClickListener.onClickReturnFineItemOne(); mOnItemClickListener.onClickReturnFineItemOne();
} else { } else {
//设置当前选中item颜色 // //设置当前选中item颜色
datasBean.setSelected(true); // datasBean.setSelected(true);
tv_food_name.setBackgroundColor(mContext.getResources().getColor(R.color.colorAccent)); // tv_food_name.setBackgroundColor(mContext.getResources().getColor(R.color.colorAccent));
//
if (currentSelectPosition < mInfos.size()) { // if (currentSelectPosition < mInfos.size()) {
//重置上次选中item的颜色 // //重置上次选中item的颜色
mInfos.get(currentSelectPosition).setSelected(false); // mInfos.get(currentSelectPosition).setSelected(false);
notifyItemChanged(currentSelectPosition, 1); // notifyItemChanged(currentSelectPosition, 1);
} // }
//记录当前操作的position //记录当前操作的position
currentSelectPosition = position; currentSelectPosition = position;
...@@ -223,13 +220,13 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> { ...@@ -223,13 +220,13 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> {
// } // }
// } else { // } else {
//后台没有设置颜色当前选中高亮色,没有选中默认使用绿色 //后台没有设置颜色当前选中高亮色,没有选中默认使用绿色
if (datasBean.isSelected()) { // if (datasBean.isSelected()) {
tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.orange_500)); // tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.orange_500));
tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color)); // tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color));
} else { // } else {
tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.Grass_green)); tv_food_name.setBackgroundColor(ArmsUtils.getColor(mContext, R.color.Grass_green));
tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color)); tv_food_name.setTextColor(ArmsUtils.getColor(mContext, R.color.theme_white_color));
} // }
// } // }
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
...@@ -106,7 +106,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderDetailItem> { ...@@ -106,7 +106,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderDetailItem> {
if (!TextUtils.isEmpty(item.getEndTime())) { if (!TextUtils.isEmpty(item.getEndTime())) {
tv_pay_time.setText(payTable + TimeUtil.getStringByFormat(new Date(item.getEndTime()), TimeUtil.dateFormatYMDHM)); tv_pay_time.setText(payTable + TimeUtil.getStringByFormat(new Date(item.getEndTime()), TimeUtil.dateFormatYMDHM));
} }
tv_pay_money.setText(amount + item.getTotalAmount()); tv_pay_money.setText(amount + item.getAmount());
setOrderStatus(item,position); setOrderStatus(item,position);
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderDetailItemAdapter.java → table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterDetailFoodAdapter.java
...@@ -18,9 +18,9 @@ import java.util.List; ...@@ -18,9 +18,9 @@ import java.util.List;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
public class OrderDetailItemAdapter extends BaseQuickAdapter<SectionTextItem3, BaseViewHolder> { public class OrderCenterDetailFoodAdapter extends BaseQuickAdapter<SectionTextItem3, BaseViewHolder> {
public OrderDetailItemAdapter(@Nullable List<SectionTextItem3> data) { public OrderCenterDetailFoodAdapter(@Nullable List<SectionTextItem3> data) {
super(R.layout.item_order_detail_food, data); super(R.layout.item_order_detail_food, data);
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderDetailPayMethodAdapter.java → table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterMoneyAdapter.java
package com.gingersoft.gsa.cloud.table.mvp.ui.adapter; package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
import android.os.Build;
import android.view.Gravity; import android.view.Gravity;
import android.widget.TextView; import android.widget.TextView;
...@@ -13,16 +14,26 @@ import java.util.List; ...@@ -13,16 +14,26 @@ import java.util.List;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
public class OrderDetailPayMethodAdapter extends BaseQuickAdapter<SectionTextItem3, BaseViewHolder> { public class OrderCenterMoneyAdapter extends BaseQuickAdapter<SectionTextItem3, BaseViewHolder> {
public OrderDetailPayMethodAdapter(@Nullable List<SectionTextItem3> data) { public OrderCenterMoneyAdapter(@Nullable List<SectionTextItem3> data) {
super(R.layout.item_order_detail_pay_method, data); super(R.layout.item_order_detail_pay_method, data);
} }
@Override @Override
protected void convert(BaseViewHolder helper, SectionTextItem3 item) { protected void convert(BaseViewHolder helper, SectionTextItem3 item) {
if (Double.parseDouble(item.getRightText()) < 0) {
//折扣
helper.setText(R.id.tv_money, "-$" + Math.abs(Double.parseDouble(item.getRightText())));
} else {
helper.setText(R.id.tv_money, "$" + item.getRightText());
}
helper.setText(R.id.tv_name, String.valueOf(item.getLeftText())); helper.setText(R.id.tv_name, String.valueOf(item.getLeftText()));
helper.setText(R.id.tv_money, "$" + item.getRightText());
TextView tv_name = helper.getView(R.id.tv_name);
TextView tv_money = helper.getView(R.id.tv_money);
tv_name.setTextAppearance(mContext, item.getLeftTextStyle());
tv_money.setTextAppearance(mContext, item.getRightTextStyle());
} }
} }
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
...@@ -3,13 +3,11 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal; ...@@ -3,13 +3,11 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.GradientDrawable;
import android.view.Gravity; import android.view.Gravity;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.aspectj.XClickUtil;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.database.bean.ComboItem; import com.gingersoft.gsa.cloud.database.bean.ComboItem;
import com.gingersoft.gsa.cloud.database.bean.Modifier; import com.gingersoft.gsa.cloud.database.bean.Modifier;
...@@ -69,7 +67,7 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> { ...@@ -69,7 +67,7 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
@Override @Override
public int getLayoutId(int viewType) { public int getLayoutId(int viewType) {
return R.layout.table_item_combo; return R.layout.ui_item_combo;
} }
class ComboItemHolder extends BaseHolder<ComboItem> { class ComboItemHolder extends BaseHolder<ComboItem> {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/FoodAdapter.java
...@@ -72,7 +72,7 @@ public class FoodAdapter extends DefaultAdapter<Food> { ...@@ -72,7 +72,7 @@ public class FoodAdapter extends DefaultAdapter<Food> {
@Override @Override
public int getLayoutId(int viewType) { public int getLayoutId(int viewType) {
return R.layout.meal_item_food; return R.layout.ui_item_food;
} }
class FoodItemHolder extends BaseHolder<Food> { class FoodItemHolder extends BaseHolder<Food> {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
...@@ -69,7 +69,7 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> { ...@@ -69,7 +69,7 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
@Override @Override
public int getLayoutId(int viewType) { public int getLayoutId(int viewType) {
return R.layout.table_item_combo; return R.layout.ui_item_combo;
} }
class ComboItemHolder extends BaseHolder<Modifier> { class ComboItemHolder extends BaseHolder<Modifier> {
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
...@@ -139,7 +139,11 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -139,7 +139,11 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
if (mOnItemClickListener != null) { if (mOnItemClickListener != null) {
int position = this.getPosition(); int position = this.getPosition();
if (position < mInfos.size()) { if (position < mInfos.size()) {
setSelectPosition(position); // if (mMealStandActivity != null) {
//
// } else {
setSelectPosition(position);
// }
//设置当前选中的食品或食品组 //设置当前选中的食品或食品组
mOnItemClickListener.onItemClick(mInfos.get(position), position); mOnItemClickListener.onItemClick(mInfos.get(position), position);
} }
...@@ -258,7 +262,12 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -258,7 +262,12 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
private void setMoney(OrderDetail datasBean) { private void setMoney(OrderDetail datasBean) {
double price = datasBean.getPrice(); double price = datasBean.getPrice();
if (price != 0) { if (price != 0) {
tv_money.setText(carshStr + MoneyUtil.get_ItemDecimals_money(price)); if (datasBean.getType() == OrderDetail.DISCOUNT_TYPE) {
tv_money.setText("-" + carshStr + MoneyUtil.get_ItemDecimals_money(Math.abs(price)));
} else {
tv_money.setText(carshStr + MoneyUtil.get_ItemDecimals_money(price));
}
} else { } else {
tv_money.setText(""); tv_money.setText("");
} }
...@@ -316,6 +325,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -316,6 +325,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
private int addPositionItem(OrderDetail addFoodBean) { private int addPositionItem(OrderDetail addFoodBean) {
int addPosition = select_position; int addPosition = select_position;
boolean upAdd = true;
switch (addFoodBean.getItemType()) { switch (addFoodBean.getItemType()) {
case 1: case 1:
...@@ -335,6 +345,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -335,6 +345,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
addPosition = select_end_position + 1; addPosition = select_end_position + 1;
} else { } else {
addPosition = select_position + 1; addPosition = select_position + 1;
upAdd = false;
} }
break; break;
case 2: case 2:
...@@ -342,6 +353,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -342,6 +353,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
addPosition = select_end_position + 1; addPosition = select_end_position + 1;
} else { } else {
addPosition = select_position + 1; addPosition = select_position + 1;
upAdd = false;
} }
break; break;
case 3: case 3:
...@@ -353,9 +365,20 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -353,9 +365,20 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
} }
break; break;
} }
boolean hasFoodDiscount = OrderDetail.hasFoodDiscount(mInfos, select_full_start_position, select_full_end_position);
if (addPosition >= mInfos.size()) { if (addPosition >= mInfos.size()) {
mInfos.add(addFoodBean); if (addFoodBean.getType() != OrderDetail.DISCOUNT_TYPE && hasFoodDiscount && addFoodBean.getItemType() != 1 && upAdd) {
//子食品添加到折扣上面
addPosition = mInfos.size() - 1;
mInfos.add(addPosition, addFoodBean);
} else {
mInfos.add(addFoodBean);
}
} else { } else {
if (addFoodBean.getType() != OrderDetail.DISCOUNT_TYPE && hasFoodDiscount && addFoodBean.getItemType() != 1 && upAdd) {
//子食品添加到折扣上面
addPosition -= 1;
}
mInfos.add(addPosition, addFoodBean); mInfos.add(addPosition, addFoodBean);
} }
return addPosition; return addPosition;
...@@ -392,6 +415,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -392,6 +415,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
/** /**
* 根據下標刪除對應食品 * 根據下標刪除對應食品
*
* @param position * @param position
*/ */
public void removeFoodItemByPosition(int position) { public void removeFoodItemByPosition(int position) {
...@@ -593,7 +617,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -593,7 +617,7 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
} }
/** /**
* 是否包含第三層備註 * 是否包含第三層細項
* *
* @param orderDetail * @param orderDetail
* @return * @return
...@@ -822,14 +846,18 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -822,14 +846,18 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
break; break;
} }
} }
for (int v = 0; v < mainStartPos; v++) {
if (v < mInfos.size()) { if(mMealStandActivity == null || mMealStandActivity.getShowFinePage() != 2){
for (int v = 0; v < mainStartPos; v++) {
if (v < mInfos.size()) {
mInfos.get(v).setSelected(0);
}
}
for (int v = mainEndPos + 1; v < mInfos.size(); v++) {
mInfos.get(v).setSelected(0); mInfos.get(v).setSelected(0);
} }
} }
for (int v = mainEndPos + 1; v < mInfos.size(); v++) {
mInfos.get(v).setSelected(0);
}
if (mainStartPos >= mInfos.size()) { if (mainStartPos >= mInfos.size()) {
mainStartPos = mInfos.size() - 1; mainStartPos = mInfos.size() - 1;
} }
...@@ -870,7 +898,6 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> { ...@@ -870,7 +898,6 @@ public class SelectMealAdapter extends DefaultAdapter<OrderDetail> {
} }
if (mInfos.get(v).getItemType() == 3) { if (mInfos.get(v).getItemType() == 3) {
mInfos.get(v).setSelected(2); mInfos.get(v).setSelected(2);
;
} }
} }
} }
......
table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/FineItemAllFragment.java
...@@ -92,12 +92,25 @@ public class FineItemAllFragment extends BaseFragment<FineItemAllPresenter> impl ...@@ -92,12 +92,25 @@ public class FineItemAllFragment extends BaseFragment<FineItemAllPresenter> impl
} }
@Subscriber(tag = "FineItemAllFragment_onMidEvent") public void onModSasteEvent(long mid) {
public void onMidEvent(long mid) {
if (mid == 0) { if (mid == 0) {
return; return;
} }
mPresenter.initAllFineItemData(mid); mPresenter.initModSasteFineItemKindData(mid);
}
public void onModMsgMidEvent(long mid) {
if (mid == 0) {
return;
}
mPresenter.initModMsgFineItemData(mid);
}
public void onModCommEvent(long mid) {
if (mid == 0) {
return;
}
mPresenter.initModCommFineItemKindData(mid);
} }
@Override @Override
......
table-mode/src/main/res/layout/activity_order_detail.xml
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:textStyle="bold"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
...@@ -210,37 +211,27 @@ ...@@ -210,37 +211,27 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:textStyle="bold"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
<TextView <com.gingersoft.gsa.cloud.base.widget.NoScrollRecyclerView
android:id="@+id/tv_server_money_text" android:id="@+id/recycler_order_moeny"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_total_text"
android:layout_marginTop="@dimen/dp_10"
android:text=""
android:textColor="@color/black"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/tv_server_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/tv_total_text" android:layout_below="@+id/tv_total_text"
android:layout_marginTop="@dimen/dp_10" android:divider="@null"
android:text="" android:focusable="false"
android:textColor="@color/black" android:scrollbars="none" />
android:textSize="@dimen/sp_16" />
<TextView <TextView
android:id="@+id/tv_total_money_text" android:id="@+id/tv_total_money_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/recycler_discount" android:layout_below="@+id/recycler_order_moeny"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:textStyle="bold"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
...@@ -250,22 +241,13 @@ ...@@ -250,22 +241,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/recycler_discount" android:layout_below="@+id/recycler_order_moeny"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:textStyle="bold"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
<com.gingersoft.gsa.cloud.base.widget.NoScrollRecyclerView
android:id="@+id/recycler_discount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_server_money_text"
android:divider="@null"
android:focusable="false"
android:visibility="gone"
android:scrollbars="none" />
</RelativeLayout> </RelativeLayout>
<View <View
......
table-mode/src/main/res/layout/table_activity_meal_stand.xml
...@@ -256,26 +256,28 @@ ...@@ -256,26 +256,28 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_modify" android:id="@+id/ll_modify"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="40dp" android:layout_height="@dimen/dp_45"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:visibility="invisible"> android:visibility="invisible">
<Button <com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_add_delete" android:id="@+id/btn_taste"
style="@style/ButtonBorderless" style="@style/ButtonBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="#00B9F7" android:background="#00B9F7"
android:text="@string/Addordelete" android:gravity="center"
android:visibility="gone" android:drawablePadding="0dp"
android:drawableLeft="@mipmap/meal_fine_taste"
android:text="@string/taste"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="20sp" /> android:textSize="@dimen/sp_14" />
<Button <com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_msg" android:id="@+id/btn_msg"
style="@style/ButtonBorderless" style="@style/ButtonBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -284,12 +286,25 @@ ...@@ -284,12 +286,25 @@
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="#7D8888" android:background="#7D8888"
android:drawableLeft="@mipmap/meal_fine_info"
android:text="@string/msg" android:text="@string/msg"
android:visibility="gone"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="20sp" /> android:textSize="@dimen/sp_14"/>
<Button <!-- <com.qmuiteam.qmui.alpha.QMUIAlphaButton-->
<!-- android:id="@+id/btn_multiple_selection"-->
<!-- style="@style/ButtonBorderless"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_marginRight="1dp"-->
<!-- android:layout_weight="0.1"-->
<!-- android:background="#00B9F7"-->
<!-- android:drawableLeft="@mipmap/meal_fine_taste"-->
<!-- android:text="@string/multiple_selection"-->
<!-- android:textColor="@color/theme_white_color"-->
<!-- android:textSize="@dimen/sp_14"/>-->
<com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_delete" android:id="@+id/btn_delete"
style="@style/ButtonBorderless" style="@style/ButtonBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -297,11 +312,12 @@ ...@@ -297,11 +312,12 @@
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="#FF5024" android:background="#FF5024"
android:drawableLeft="@mipmap/meal_fine_delete"
android:text="@string/remove" android:text="@string/remove"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="20sp" /> android:textSize="@dimen/sp_14" />
<Button <com.qmuiteam.qmui.alpha.QMUIAlphaButton
android:id="@+id/btn_end" android:id="@+id/btn_end"
style="@style/ButtonBorderless" style="@style/ButtonBorderless"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -309,9 +325,10 @@ ...@@ -309,9 +325,10 @@
android:layout_marginRight="1dp" android:layout_marginRight="1dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="@color/Grass_green" android:background="@color/Grass_green"
android:drawableLeft="@mipmap/meal_fine_end"
android:text="@string/end" android:text="@string/end"
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:textSize="20sp" /> android:textSize="@dimen/sp_14" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -423,7 +440,6 @@ ...@@ -423,7 +440,6 @@
android:textColor="@color/theme_white_color" android:textColor="@color/theme_white_color"
android:visibility="gone" /> android:visibility="gone" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -433,12 +449,6 @@ ...@@ -433,12 +449,6 @@
android:layout_below="@+id/ll_meals" android:layout_below="@+id/ll_meals"
android:orientation="vertical"> android:orientation="vertical">
<!-- <androidx.viewpager.widget.ViewPager-->
<!-- android:id="@+id/vp_food_group"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_weight="1"/>-->
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_food_group" android:id="@+id/rv_food_group"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -461,16 +471,6 @@ ...@@ -461,16 +471,6 @@
android:background="@color/theme_white_color" android:background="@color/theme_white_color"
android:visibility="gone"> android:visibility="gone">
<ImageView
android:id="@+id/iv_fine_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/normal_space"
android:contentDescription="@string/app_name"
android:src="@drawable/ic_black_back"
android:visibility="visible" />
<com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip xmlns:app="http://schemas.android.com/apk/res-auto" <com.gingersoft.gsa.cloud.ui.view.PagerSlidingTabStrip xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tabs_fine" android:id="@+id/tabs_fine"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
table-mode/src/main/res/values/strings.xml
...@@ -95,7 +95,9 @@ ...@@ -95,7 +95,9 @@
<string name="nosaveexit">不保存即離開</string> <string name="nosaveexit">不保存即離開</string>
<string name="deletemeal">取消商品</string> <string name="deletemeal">取消商品</string>
<string name="Addordelete">加/減</string> <string name="Addordelete">加/減</string>
<string name="msg">特別訊息</string> <string name="taste">口味</string>
<string name="msg">訊息</string>
<string name="multiple_selection">多選</string>
<string name="remove">刪除</string> <string name="remove">刪除</string>
<string name="end">完成</string> <string name="end">完成</string>
<string name="Vertical">豎向</string> <string name="Vertical">豎向</string>
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/contract/LoginInterfaceImpl.java
...@@ -5,7 +5,7 @@ import android.content.Intent; ...@@ -5,7 +5,7 @@ import android.content.Intent;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
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;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean; import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem; import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem;
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/LoginActivity.java
...@@ -18,7 +18,7 @@ import android.widget.TextView; ...@@ -18,7 +18,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.gingersoft.gsa.cloud.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
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.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/SwitchServerActivity.java
...@@ -10,7 +10,7 @@ import androidx.annotation.NonNull; ...@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.user.login.R; import com.gingersoft.gsa.cloud.user.login.R;
import com.gingersoft.gsa.cloud.user.login.R2; import com.gingersoft.gsa.cloud.user.login.R2;
import com.gingersoft.gsa.cloud.user.login.di.component.DaggerSwitchServerComponent; import com.gingersoft.gsa.cloud.user.login.di.component.DaggerSwitchServerComponent;
...@@ -43,6 +43,8 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -43,6 +43,8 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
RadioButton rbSZ; RadioButton rbSZ;
@BindView(R2.id.rb_server_hk) @BindView(R2.id.rb_server_hk)
RadioButton rbHK; RadioButton rbHK;
@BindView(R2.id.rb_youchang_hk)
RadioButton rb_youchang_hk;
@BindView(R2.id.btn_switch_server) @BindView(R2.id.btn_switch_server)
Button switchServer; Button switchServer;
@BindView(R2.id.tv_now_server) @BindView(R2.id.tv_now_server)
...@@ -70,16 +72,21 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -70,16 +72,21 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
tvNowServer.setText("當前服務器：" + nowServer); tvNowServer.setText("當前服務器：" + nowServer);
rbHK.setText("香港服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK); rbHK.setText("香港服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK);
rbSZ.setText("深圳服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ); rbSZ.setText("深圳服務器：" + HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ);
rb_youchang_hk.setText("友常本地：" + HttpsConstans.ROOT_SERVER_YOU_CHANG_HK);
if (nowServer.equals(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ)) { if (nowServer.equals(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ)) {
rbSZ.setChecked(true); rbSZ.setChecked(true);
} else { } else if (nowServer.equals(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK)) {
rbHK.setChecked(true); rbHK.setChecked(true);
}else{
rb_youchang_hk.setChecked(true);
} }
switchServer.setOnClickListener(v -> { switchServer.setOnClickListener(v -> {
if (rbSZ.isChecked()) { if (rbSZ.isChecked()) {
HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ; HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_SZ;
} else { } else if (rbHK.isChecked()) {
HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK; HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL_HK;
}else {
HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL = HttpsConstans.ROOT_SERVER_YOU_CHANG_HK;
} }
GsaCloudApplication.setGlobalDomain(); GsaCloudApplication.setGlobalDomain();
finish(); finish();
......
user-login/src/main/java/com/gingersoft/gsa/cloud/user/login/mvp/ui/activity/WelcomeActivity.java
...@@ -10,13 +10,13 @@ import android.view.animation.AnimationUtils; ...@@ -10,13 +10,13 @@ import android.view.animation.AnimationUtils;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.ScaleAnimation; import android.view.animation.ScaleAnimation;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.viewpager2.widget.ViewPager2; import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.base.utils.constans.UserConstans; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.constans.UserConstans;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean; import com.gingersoft.gsa.cloud.ui.bean.mode.LoginBean;
...@@ -137,6 +137,15 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem ...@@ -137,6 +137,15 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
magicIndicator.attachToViewPager(mVpGuide); magicIndicator.attachToViewPager(mVpGuide);
} }
private void jumpDownloadActivity() {
CC.obtainBuilder("Component.Download")
.setActionName("showDownloadActivity")
.addParam("fromPage",1)
.build()
.call();
killMyself();
}
private void updateUI(int position) { private void updateUI(int position) {
mTvGuideTitle.setText(guideBeanList.get(position).getTitle()); mTvGuideTitle.setText(guideBeanList.get(position).getTitle());
mTvGuideDetails.setText(guideBeanList.get(position).getDetails()); mTvGuideDetails.setText(guideBeanList.get(position).getDetails());
...@@ -246,7 +255,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem ...@@ -246,7 +255,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
@Override @Override
public void showMessage(@NonNull String message) { public void showMessage(@NonNull String message) {
checkNotNull(message); checkNotNull(message);
ArmsUtils.snackbarText(message); ArmsUtils.makeText(this, message);
} }
@Override @Override
......
user-login/src/main/res/layout/activity_switch_server.xml
...@@ -26,6 +26,16 @@ ...@@ -26,6 +26,16 @@
android:text="香港環境" android:text="香港環境"
android:textColor="@color/theme_333_color" android:textColor="@color/theme_333_color"
android:textSize="@dimen/sp_16" /> android:textSize="@dimen/sp_16" />
<RadioButton
android:id="@+id/rb_youchang_hk"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/dp_10"
android:text="友常本地"
android:textColor="@color/theme_333_color"
android:textSize="@dimen/sp_16" />
</RadioGroup> </RadioGroup>
<TextView <TextView
......
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