Skip to content

S
supplier
Commit 93eb173b by 宁斌
Options

1、自動會有折扣的問題

parent 0218422a
Showing with 20 additions and 21 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
...@@ -162,7 +162,7 @@ public class ComboItemDaoUtils { ...@@ -162,7 +162,7 @@ public class ComboItemDaoUtils {
ArrayList<ComboItem> comboItems = new ArrayList<>(); ArrayList<ComboItem> comboItems = new ArrayList<>();
// String sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.AUTO_MOD FROM COMBO_ITEM c join FOOD f on c.FID=f.FID and f.INVISIBLE=0 join FOOD_COMBO r on r.COM_ID=c.COM_ID "; // String sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.AUTO_MOD FROM COMBO_ITEM c join FOOD f on c.FID=f.FID and f.INVISIBLE=0 join FOOD_COMBO r on r.COM_ID=c.COM_ID ";
String sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.AUTO_MOD,f.PRINT_SETING,f.ABLE_DISCOUNT,SELECT_QTY,DEF_MODIFIER,INVISIBLE,POINTS_ADD,POINTS_RATIO,POINTS_REDEEM,SERVICE_CHARGE FROM COMBO_ITEM c join FOOD f on c.FID=f.FID and f.INVISIBLE!=1 join FOOD_COMBO r on r.COM_ID=c.COM_ID and r.DELETES!=1"; String sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.AUTO_MOD,f.PRINT_SETING,f.ABLE_DISCOUNT,SELECT_QTY,DEF_MODIFIER,INVISIBLE,POINTS_ADD,POINTS_RATIO,POINTS_REDEEM,SERVICE_CHARGE,c.DIFF_AMT FROM COMBO_ITEM c join FOOD f on c.FID=f.FID and f.INVISIBLE!=1 join FOOD_COMBO r on r.COM_ID=c.COM_ID and r.DELETES!=1";
if (fid > 0) { if (fid > 0) {
sql = sql + " where r.FID='" + fid + "'"; sql = sql + " where r.FID='" + fid + "'";
...@@ -172,7 +172,8 @@ public class ComboItemDaoUtils { ...@@ -172,7 +172,8 @@ public class ComboItemDaoUtils {
ComboItem order = new ComboItem(); ComboItem order = new ComboItem();
order.setFid(c.getLong(c.getColumnIndex("FID"))); order.setFid(c.getLong(c.getColumnIndex("FID")));
order.setComId(c.getLong(c.getColumnIndex("COM_ID"))); order.setComId(c.getLong(c.getColumnIndex("COM_ID")));
order.setPrice(c.getDouble(c.getColumnIndex("PRICE"))); // order.setPrice(c.getDouble(c.getColumnIndex("PRICE")));
order.setPrice(c.getDouble(c.getColumnIndex("DIFF_AMT")));
order.setSeqNo(c.getLong(c.getColumnIndex("SEQ_NO"))); order.setSeqNo(c.getLong(c.getColumnIndex("SEQ_NO")));
order.setQty(c.getLong(c.getColumnIndex("QTY"))); order.setQty(c.getLong(c.getColumnIndex("QTY")));
order.setName(c.getString(c.getColumnIndex("FOOD_NAME"))); order.setName(c.getString(c.getColumnIndex("FOOD_NAME")));
......
base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyRetrofitConfiguration.java
package com.gingersoft.gsa.cloud.globalconfig.applyOptions; package com.gingersoft.gsa.cloud.globalconfig.applyOptions;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.globalconfig.applyOptions.intercept.LoggingInterceptor; import com.gingersoft.gsa.cloud.globalconfig.applyOptions.intercept.LoggingInterceptor;
import com.jess.arms.di.module.ClientModule; import com.jess.arms.di.module.ClientModule;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
...@@ -12,9 +14,9 @@ public class MyRetrofitConfiguration implements ClientModule.RetrofitConfigurati ...@@ -12,9 +14,9 @@ public class MyRetrofitConfiguration implements ClientModule.RetrofitConfigurati
public void configRetrofit(Context context, Retrofit.Builder builder) { public void configRetrofit(Context context, Retrofit.Builder builder) {
// 配置多BaseUrl支持 // 配置多BaseUrl支持
OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder(); OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
// if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
clientBuilder.addInterceptor(new LoggingInterceptor());//使用自定义的Log拦截器 clientBuilder.addInterceptor(new LoggingInterceptor());//使用自定义的Log拦截器
// } }
// clientBuilder.addInterceptor(new UserAgentInterceptor());//使用自定义User-Agent // clientBuilder.addInterceptor(new UserAgentInterceptor());//使用自定义User-Agent
// builder.client(RetrofitUrlManager.getInstance().with(clientBuilder).build()); // builder.client(RetrofitUrlManager.getInstance().with(clientBuilder).build());
} }
......
config.gradle
...@@ -7,8 +7,8 @@ ext { ...@@ -7,8 +7,8 @@ ext {
targetSdkVersion : 28, targetSdkVersion : 28,
//正式版: 1.0.3 3 //正式版: 1.0.3 3
//內部測試版:1.2.0 20 //內部測試版:1.2.0 20
versionCode : 8, versionCode : 9,
versionName : "1.0.8" versionName : "1.0.9"
] ]
version = [ version = [
......
gradle.properties
...@@ -26,4 +26,5 @@ QMUI_SKIN_MAKER_VERSION = 0.0.1 ...@@ -26,4 +26,5 @@ QMUI_SKIN_MAKER_VERSION = 0.0.1
POM_GIT_URL=https://github.com/Tencent/QMUI_Android/ POM_GIT_URL=https://github.com/Tencent/QMUI_Android/
POM_SITE_URL=https://qmuiteam.com/android POM_SITE_URL=https://qmuiteam.com/android
android.injected.testOnly=false android.injected.testOnly=false
BUILD_TYPE = release
main-module/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java
...@@ -33,7 +33,7 @@ public class ComponentMain implements IComponent { ...@@ -33,7 +33,7 @@ public class ComponentMain implements IComponent {
new FModule("main/manager/printer", R.drawable.ic_print_management, R.drawable.ic_print_management_close), new FModule("main/manager/printer", R.drawable.ic_print_management, R.drawable.ic_print_management_close),
new FModule("main/manager/pay", R.drawable.ic_pay_management, R.drawable.ic_pay_management_close), new FModule("main/manager/pay", R.drawable.ic_pay_management, R.drawable.ic_pay_management_close),
new FModule("main/manager/discout", R.drawable.ic_discount_management, R.drawable.ic_discount_management_close), new FModule("main/manager/discout", R.drawable.ic_discount_management, R.drawable.ic_discount_management_close),
new FModule("main/manager/soldoutCtr", R.drawable.ic_discount_management, R.drawable.ic_discount_management_close), new FModule("main/manager/soldoutCtr", R.drawable.ic_sell_off_manger, R.drawable.ic_sell_off_manger),
new FModule("main/manager/qrCode", R.drawable.ic_discount_management, R.drawable.ic_discount_management_close) new FModule("main/manager/qrCode", R.drawable.ic_discount_management, R.drawable.ic_discount_management_close)
}; };
/** /**
...@@ -45,7 +45,6 @@ public class ComponentMain implements IComponent { ...@@ -45,7 +45,6 @@ public class ComponentMain implements IComponent {
new FModule("main/employee/delivery", R.drawable.ic_authority_management, R.drawable.ic_authority_management_close), new FModule("main/employee/delivery", R.drawable.ic_authority_management, R.drawable.ic_authority_management_close),
new FModule("main/employee/operationRecord", R.drawable.ic_operation_record, R.drawable.ic_operation_record_close) new FModule("main/employee/operationRecord", R.drawable.ic_operation_record, R.drawable.ic_operation_record_close)
}; };
} }
@Override @Override
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/RestaurantQrCodeActivity.java
...@@ -167,6 +167,9 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl ...@@ -167,6 +167,9 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
tabs.add("凍鏈"); tabs.add("凍鏈");
views.add(getQrCodeView("凍鏈", dataBean.getFreezingServiceUrl())); views.add(getQrCodeView("凍鏈", dataBean.getFreezingServiceUrl()));
} }
if (tabs.size() == 0) {
return;
}
initTab(); initTab();
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/MealStandPresenter.java
...@@ -103,18 +103,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -103,18 +103,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
private MealStandActivity IActivity; private MealStandActivity IActivity;
private CancelFoodDialog.Builder mCancelFoodDialog; private CancelFoodDialog.Builder mCancelFoodDialog;
// private FoodReason[] mFoodReasons = {
// new FoodReason.DataBean(1, 1, "漏單"),
// new FoodReason.DataBean(2, 1, "沽清"),
// new FoodReason.DataBean(3, 1, "試機"),
// new FoodReason.DataBean(4, 1, "重單"),
// new FoodReason.DataBean(5, 1, "落錯單"),
// new FoodReason.DataBean(6, 1, "客人取消"),
// new FoodReason.DataBean(7, 1, "問題食品"),
// new FoodReason.DataBean(8, 1, "資料錯誤"),
// new FoodReason.DataBean(9, 1, "部分轉移"),
// new FoodReason.DataBean(10, 1, "其他"),
// };
private FoodAdapter mFoodAdapter; private FoodAdapter mFoodAdapter;
private ComboAdapter mComboAdapter; private ComboAdapter mComboAdapter;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/MealStandActivity.java
...@@ -23,6 +23,7 @@ import android.widget.LinearLayout; ...@@ -23,6 +23,7 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
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.base.common.bean.MemberInfo; import com.gingersoft.gsa.cloud.base.common.bean.MemberInfo;
import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney; import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
...@@ -574,7 +575,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -574,7 +575,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override @Override
public void onUseMember(UseMemberDialog dialog) { public void onUseMember(UseMemberDialog dialog) {
if (mMemberInfo != null) { if (mMemberInfo != null) {
mUseMemberDialog.dismiss(); dialog.dismiss();
MyOrderManage.getInstance().setMemberInfo(mMemberInfo); MyOrderManage.getInstance().setMemberInfo(mMemberInfo);
//添加会员折扣行 //添加会员折扣行
mPresenter.addMemberDiscount(mMemberInfo.getId(), mMemberInfo.getMemberDiscount(), mMemberInfo.getMemberName(), mMemberInfo.getLevelName1(), BillOrderMoney.BILL_ITEM_NO_ORDER_STATUS); mPresenter.addMemberDiscount(mMemberInfo.getId(), mMemberInfo.getMemberDiscount(), mMemberInfo.getMemberName(), mMemberInfo.getLevelName1(), BillOrderMoney.BILL_ITEM_NO_ORDER_STATUS);
...@@ -658,6 +659,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -658,6 +659,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
recordOperat(true); recordOperat(true);
if (XClickUtil.isFastDoubleClick(v, 200)) {
return;
}
int id = v.getId(); int id = v.getId();
if (id == R.id.btn_numberman) { if (id == R.id.btn_numberman) {
showChoosePeopleNumDialog(true); showChoosePeopleNumDialog(true);
......
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