Skip to content

S
supplier
Commit 7d5e8b8b by Wyh
Options

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

# Conflicts:
#	config.gradle
#	delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
parents 9cda6142 2bcca59b
Showing with 127 additions and 179 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
...@@ -169,7 +169,7 @@ public class TableBean { ...@@ -169,7 +169,7 @@ public class TableBean {
} }
} }
public static TableBean.DataBean splitTableTransformTable(TableExtBean.DataBean dataBean) { public static TableBean.DataBean splitTableTransformTable(TableBean.DataBean mainTable,TableExtBean.DataBean dataBean) {
TableBean.DataBean tableBean = new TableBean.DataBean(); TableBean.DataBean tableBean = new TableBean.DataBean();
tableBean.setId(dataBean.getId()); tableBean.setId(dataBean.getId());
tableBean.setTableName(dataBean.getTableName() + "-" + dataBean.getTableNumber()); tableBean.setTableName(dataBean.getTableName() + "-" + dataBean.getTableNumber());
...@@ -179,7 +179,8 @@ public class TableBean { ...@@ -179,7 +179,8 @@ public class TableBean {
// tableBean.setQrCode(); // tableBean.setQrCode();
// tableBean.setQrCodeImg(); // tableBean.setQrCodeImg();
tableBean.setSeatCount(dataBean.getSeatCount()); tableBean.setSeatCount(dataBean.getSeatCount());
// tableBean.setMaxSeatCount(); tableBean.setMaxSeatCount(mainTable.getMaxSeatCount());
tableBean.setMinSeatCount(mainTable.getMinSeatCount());
tableBean.setStatus(dataBean.getTableStatus()); tableBean.setStatus(dataBean.getTableStatus());
tableBean.setUseStatus(dataBean.getInUse()); tableBean.setUseStatus(dataBean.getInUse());
tableBean.setTableNumber(dataBean.getTableNumber()); tableBean.setTableNumber(dataBean.getTableNumber());
...@@ -197,7 +198,8 @@ public class TableBean { ...@@ -197,7 +198,8 @@ public class TableBean {
// tableBean.setQrCode(); // tableBean.setQrCode();
// tableBean.setQrCodeImg(); // tableBean.setQrCodeImg();
tableBean.setSeatCount(dataBean.getSeatCount()); tableBean.setSeatCount(dataBean.getSeatCount());
// tableBean.setMaxSeatCount(); tableBean.setMaxSeatCount(mainTable.getMaxSeatCount());
tableBean.setMinSeatCount(mainTable.getMinSeatCount());
tableBean.setStatus(dataBean.getTableStatus()); tableBean.setStatus(dataBean.getTableStatus());
tableBean.setUseStatus(dataBean.getInUse()); tableBean.setUseStatus(dataBean.getInUse());
tableBean.setTableNumber(dataBean.getTableNumber()); tableBean.setTableNumber(dataBean.getTableNumber());
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/mealManage/MyOrderManage.java
...@@ -103,7 +103,7 @@ public class MyOrderManage { ...@@ -103,7 +103,7 @@ public class MyOrderManage {
/** /**
* 現在有多少積分 * 現在有多少積分
*/ */
private float nowPoint; private float nowPoints;
/** /**
* 結賬積分QRCode * 結賬積分QRCode
*/ */
...@@ -336,7 +336,7 @@ public class MyOrderManage { ...@@ -336,7 +336,7 @@ public class MyOrderManage {
} }
addPoints = 0; addPoints = 0;
oldPoints = 0; oldPoints = 0;
nowPoint = 0; nowPoints = 0;
integralQrcode = ""; integralQrcode = "";
wholeAmount = 0.0; wholeAmount = 0.0;
totalAmount = 0.0; totalAmount = 0.0;
...@@ -472,12 +472,12 @@ public class MyOrderManage { ...@@ -472,12 +472,12 @@ public class MyOrderManage {
this.oldPoints = oldPoints; this.oldPoints = oldPoints;
} }
public float getNowPoint() { public float getNowPoints() {
return nowPoint; return nowPoints;
} }
public void setNowPoint(float nowPoint) { public void setNowPoints(float nowPoints) {
this.nowPoint = nowPoint; this.nowPoints = nowPoints;
} }
public String getIntegralQrcode() { public String getIntegralQrcode() {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BillMethodAdapter.java
...@@ -30,10 +30,13 @@ public class BillMethodAdapter extends BaseQuickAdapter<PayMethod, BaseViewHolde ...@@ -30,10 +30,13 @@ public class BillMethodAdapter extends BaseQuickAdapter<PayMethod, BaseViewHolde
} else { } else {
tv_bill_method_name.setText(item.getPayName()); tv_bill_method_name.setText(item.getPayName());
} }
tv_bill_method_name.setTextSize(item.getPayModeSize()); tv_bill_method_name.setTextSize(item.getPayModeSize());
if(!TextUtils.isEmpty(item.getFont_color())){
tv_bill_method_name.setTextColor(Color.parseColor(item.getFont_color())); tv_bill_method_name.setTextColor(Color.parseColor(item.getFont_color()));
}
if(!TextUtils.isEmpty(item.getColor())) {
tv_bill_method_name.setBackgroundColor(Color.parseColor(item.getColor())); tv_bill_method_name.setBackgroundColor(Color.parseColor(item.getColor()));
} }
}
} }
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/bean/view/SectionTextItem3.java
...@@ -101,11 +101,7 @@ public class SectionTextItem3 { ...@@ -101,11 +101,7 @@ public class SectionTextItem3 {
} }
sectionTextItem3.setLeftText(foodName); sectionTextItem3.setLeftText(foodName);
sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber())); sectionTextItem3.setCenterText(String.valueOf(orderDetail.getNumber()));
if (orderDetail.getType() == OrderDetail.DISCOUNT_TYPE) {
sectionTextItem3.setRightText(String.valueOf(orderDetail.getPrice())); 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;
......
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 : 7, versionCode : 8,
versionName : "1.0.73" versionName : "1.0.8"
] ]
version = [ version = [
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
...@@ -377,8 +377,7 @@ class OrderDetailsActivity : BaseActivity() { ...@@ -377,8 +377,7 @@ class OrderDetailsActivity : BaseActivity() {
//添加服務費 //添加服務費
addServiceChargeBean.observe(this@OrderDetailsActivity, Observer { addServiceChargeBean.observe(this@OrderDetailsActivity, Observer {
cancelDialogForLoading() cancelDialogForLoading()
it?.let { if (it != null) {
refreshBalance(it.paymentValue.toDouble())
finish() finish()
if (TextUtil.isNotEmptyOrNullOrUndefined(it.errMsg)) { if (TextUtil.isNotEmptyOrNullOrUndefined(it.errMsg)) {
ToastUtils.show(this@OrderDetailsActivity, it.errMsg) ToastUtils.show(this@OrderDetailsActivity, it.errMsg)
...@@ -439,6 +438,7 @@ class OrderDetailsActivity : BaseActivity() { ...@@ -439,6 +438,7 @@ class OrderDetailsActivity : BaseActivity() {
private fun additionalServiceCharge(amount: Int) { private fun additionalServiceCharge(amount: Int) {
showLoading() showLoading()
pageViewModel.additionalServiceCharge(GsaCloudApplication.getMemberId(this@OrderDetailsActivity).toString(), orderId, amount) pageViewModel.additionalServiceCharge(GsaCloudApplication.getMemberId(this@OrderDetailsActivity).toString(), orderId, amount)
} }
private fun PageViewModel.selectLalaMove(orderDetails: OrderDetails.DataBean, isPrint: Boolean, black: (it: List<TransportationBean.DataX.Transportation>, orderDetails: OrderDetails.DataBean) -> Unit) { private fun PageViewModel.selectLalaMove(orderDetails: OrderDetails.DataBean, isPrint: Boolean, black: (it: List<TransportationBean.DataX.Transportation>, orderDetails: OrderDetails.DataBean) -> Unit) {
...@@ -523,7 +523,9 @@ class OrderDetailsActivity : BaseActivity() { ...@@ -523,7 +523,9 @@ class OrderDetailsActivity : BaseActivity() {
showLoading() showLoading()
confirmOrder(orderDetails, trafficType, restaurantId, isPrint) { msg -> confirmOrder(orderDetails, trafficType, restaurantId, isPrint) { msg ->
cancelDialogForLoading() cancelDialogForLoading()
refreshBalance(orderDetails.deliveryAmount) val intent = Intent()
intent.putExtra("deliveryAmount", orderDetails.deliveryAmount)
setResult(1001, intent)
when (msg.code) { when (msg.code) {
Transportation.toString() -> {//修改運輸工具 Transportation.toString() -> {//修改運輸工具
finish() finish()
...@@ -560,12 +562,6 @@ class OrderDetailsActivity : BaseActivity() { ...@@ -560,12 +562,6 @@ class OrderDetailsActivity : BaseActivity() {
} }
} }
private fun refreshBalance(deliveryAmount: Double) {
val intent = Intent()
intent.putExtra("deliveryAmount", deliveryAmount)
setResult(1001, intent)
}
/** /**
* 取消訂單，獲取取消原因 * 取消訂單，獲取取消原因
*/ */
......
manager-module/src/main/res/layout/manager_item_manage_table.xml
...@@ -106,8 +106,10 @@ ...@@ -106,8 +106,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:backgroundColor="@color/theme_white_color" app:backgroundColor="@color/theme_white_color"
app:corner="rightBottom" app:corner="rightBottom"
app:primaryText="堂"
app:primaryTextColor="#249B65" app:primaryTextColor="#249B65"
app:primaryTextSize="10sp" /> app:primaryTextSize="10sp"
app:isRestoreText="false"/>
<TextView <TextView
android:id="@+id/tv_type_labe" android:id="@+id/tv_type_labe"
......
print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
...@@ -103,22 +103,21 @@ public class PrintBill extends PrinterRoot { ...@@ -103,22 +103,21 @@ public class PrintBill extends PrinterRoot {
layout.addView(getDiningBillPayMethod(mContext, MyOrderManage.getInstance().getBillMoney())); layout.addView(getDiningBillPayMethod(mContext, MyOrderManage.getInstance().getBillMoney()));
layout.addView(getLine(mContext)); layout.addView(getLine(mContext));
layout.addView(getTableMealMemberIntegerView(mContext, getOrderDetail(),MyOrderManage.getInstance().getIntegralQrcode())); layout.addView(getTableMealMemberIntegerView(mContext, getOrderMemberInfo(),MyOrderManage.getInstance().getIntegralQrcode()));
return zoomBitmap(deviceBean, viewToBitmap(mContext, layout)); return zoomBitmap(deviceBean, viewToBitmap(mContext, layout));
} }
private OrderDetails.DataBean getOrderDetail() { private OrderDetails.DataBean getOrderMemberInfo() {
OrderDetails.DataBean dataBean = new OrderDetails.DataBean(); OrderDetails.DataBean dataBean = new OrderDetails.DataBean();
dataBean.setNowPoints(MyOrderManage.getInstance().getNowPoint());
dataBean.setAddPoints(MyOrderManage.getInstance().getAddPoints());
dataBean.setOldPoints(MyOrderManage.getInstance().getOldPoints());
MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo(); MemberInfo memberInfo = MyOrderManage.getInstance().getMemberInfo();
if (memberInfo != null) { if (memberInfo != null) {
dataBean.setMEMBER_NAME(memberInfo.getMemberName()); dataBean.setMEMBER_NAME(memberInfo.getMemberName());
dataBean.setPHONE(memberInfo.getPhone()); dataBean.setPHONE(memberInfo.getPhone());
dataBean.setNowPoints(MyOrderManage.getInstance().getNowPoints());
dataBean.setAddPoints(MyOrderManage.getInstance().getAddPoints());
dataBean.setOldPoints(MyOrderManage.getInstance().getOldPoints());
} }
return dataBean; return dataBean;
} }
......
print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
...@@ -570,6 +570,7 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis ...@@ -570,6 +570,7 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
protected View getTableMealMemberIntegerView(Context mContext, OrderDetails.DataBean data, String integralQrcode) { protected View getTableMealMemberIntegerView(Context mContext, OrderDetails.DataBean data, String integralQrcode) {
View view = View.inflate(mContext, R.layout.print_model_meal_member_integer_info, null); View view = View.inflate(mContext, R.layout.print_model_meal_member_integer_info, null);
LinearLayout ll_member_info = view.findViewById(R.id.ll_member_info);
TextView tvMemberNum = view.findViewById(R.id.tv_print_model_member_number);//會員號碼 TextView tvMemberNum = view.findViewById(R.id.tv_print_model_member_number);//會員號碼
TextView tvMemberName = view.findViewById(R.id.tv_print_model_member_name);//會員名稱 TextView tvMemberName = view.findViewById(R.id.tv_print_model_member_name);//會員名稱
TextView tvMemberPhone = view.findViewById(R.id.tv_print_model_member_phone);//會員電話 TextView tvMemberPhone = view.findViewById(R.id.tv_print_model_member_phone);//會員電話
...@@ -591,6 +592,9 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis ...@@ -591,6 +592,9 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
if (data.getPHONE() != null && data.getPHONE().length() > 0) { if (data.getPHONE() != null && data.getPHONE().length() > 0) {
tvMemberPhone.setText("會員電話：" + getReplaceAfter(data.getPHONE())); tvMemberPhone.setText("會員電話：" + getReplaceAfter(data.getPHONE()));
} }
ll_member_info.setVisibility(View.VISIBLE);
}else {
ll_member_info.setVisibility(View.GONE);
} }
//生成積分QRCode碼（飯糰APP掃碼獲得積分） //生成積分QRCode碼（飯糰APP掃碼獲得積分）
if (TextUtils.isEmpty(integralQrcode)) { if (TextUtils.isEmpty(integralQrcode)) {
......
print-module/src/main/res/layout/print_model_meal_member_integer_info.xml
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_member_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_print_model_member_number" android:id="@+id/tv_print_model_member_number"
style="@style/print_other_order_twenty_six_style" style="@style/print_other_order_twenty_six_style"
...@@ -51,7 +57,7 @@ ...@@ -51,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5" android:layout_marginTop="@dimen/dp_5"
android:text="結餘積分：" /> android:text="結餘積分：" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_integral_qrcode" android:id="@+id/ll_integral_qrcode"
...@@ -70,8 +76,8 @@ ...@@ -70,8 +76,8 @@
<ImageView <ImageView
android:id="@+id/iv_integral_qrcode" android:id="@+id/iv_integral_qrcode"
android:layout_width="@dimen/dp_180" android:layout_width="@dimen/dp_250"
android:layout_height="@dimen/dp_180" android:layout_height="@dimen/dp_250"
android:layout_marginTop="@dimen/dp_5"/> android:layout_marginTop="@dimen/dp_5"/>
<TextView <TextView
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java
...@@ -76,21 +76,6 @@ public class OrderDetailItem implements Serializable { ...@@ -76,21 +76,6 @@ public class OrderDetailItem implements Serializable {
private String billNo; private String billNo;
/**取餐碼*/ /**取餐碼*/
private String takeFoodCode; private String takeFoodCode;
// private String payName;
// private String orderPayType;
// private double tipsPrice;
// private byte linePayType;
// /**折扣ID*/
// private Long discountId;
// /**折扣金額*/
// private double discountAmount;
// /**折扣比例*/
// private int discountValue;
// /**折扣名稱*/
// private String remark;
// /**折扣類型*/
// private int type;
/**生成訂單時間*/ /**生成訂單時間*/
private String createTime; private String createTime;
...@@ -109,6 +94,8 @@ public class OrderDetailItem implements Serializable { ...@@ -109,6 +94,8 @@ public class OrderDetailItem implements Serializable {
private MemberInfo memberInfo; private MemberInfo memberInfo;
/**會員積分碼*/ /**會員積分碼*/
private String verifyCode; private String verifyCode;
/**會員積分相关实体*/
private OrderPayRespose integralInfo;
/** /**
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderPayRespose.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean; package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import java.io.Serializable;
import lombok.Data; import lombok.Data;
/** /**
...@@ -10,7 +12,7 @@ import lombok.Data; ...@@ -10,7 +12,7 @@ import lombok.Data;
* 描述： * 描述：
*/ */
@Data @Data
public class OrderPayRespose { public class OrderPayRespose implements Serializable {
/** /**
* verifyCode : 387F9C1D8B2AD91B42982C8E50835A8C * verifyCode : 387F9C1D8B2AD91B42982C8E50835A8C
...@@ -18,12 +20,12 @@ public class OrderPayRespose { ...@@ -18,12 +20,12 @@ public class OrderPayRespose {
*/ */
private String verifyCode; private String verifyCode;
//本次加多少積分 //本次加减多少積分
private float addPoints; private float addPoints;
//之前有多少積分 //上次積分
private float oldPoints; private float oldPoints;
//現在有多少積分 //结余積分
private float nowPoint; private float nowPoints;
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/SoldoutCtrFood.java
package com.gingersoft.gsa.cloud.table.mvp.model.bean; package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/TableDetail.java
...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.bean; ...@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.table.mvp.model.bean;
import com.gingersoft.gsa.cloud.base.common.bean.TableBean; import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
import lombok.Data;
/** /**
* 作者：ELEGANT_BIN * 作者：ELEGANT_BIN
* 版本：1.6.0 * 版本：1.6.0
...@@ -9,6 +11,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean; ...@@ -9,6 +11,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
* 修订历史：2020-02-22 * 修订历史：2020-02-22
* 描述： * 描述：
*/ */
@Data
public class TableDetail { public class TableDetail {
/** /**
...@@ -22,36 +25,5 @@ public class TableDetail { ...@@ -22,36 +25,5 @@ public class TableDetail {
private long sysTime; private long sysTime;
private TableBean.DataBean data; private TableBean.DataBean data;
public boolean isSuccess() {
return success;
}
public void setSuccess(boolean success) {
this.success = success;
}
public String getErrMsg() {
return errMsg;
}
public void setErrMsg(String errMsg) {
this.errMsg = errMsg;
}
public long getSysTime() {
return sysTime;
}
public void setSysTime(long sysTime) {
this.sysTime = sysTime;
}
public TableBean.DataBean getData() {
return data;
}
public void setData(TableBean.DataBean data) {
this.data = data;
}
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -280,6 +280,18 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -280,6 +280,18 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
if (mSelectMealAdapter.getSelect_position() == -1) { if (mSelectMealAdapter.getSelect_position() == -1) {
return false; return false;
} }
if (myOrderManage.getOrderFoodList().size() <= 0) {
return false;
}
if (myOrderManage.getSelmainstartpositon() > myOrderManage.getOrderFoodList().size()) {
return false;
}
OrderDetail orderMainFood = myOrderManage.getOrderFoodList().get(myOrderManage.getSelmainstartpositon());
if (mMealStandPresenter != null && orderMainFood != null) {
if (!mMealStandPresenter.memberPointsCondition(orderMainFood.getPointsRedeem() * i, orderMainFood.getProductName())) {
return false;
}
}
return true; return true;
} }
...@@ -712,9 +724,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -712,9 +724,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
*/ */
public double getDiscountableFoodTotal(int discountType, boolean add) { public double getDiscountableFoodTotal(int discountType, boolean add) {
double total = 0.0; double total = 0.0;
int orderSize = myOrderManage.getOrderFoodList().size(); List<OrderDetail> orderFoodList = myOrderManage.getOrderFoodList();
int orderSize = orderFoodList.size();
for (int i = 0; i < orderSize; i++) { for (int i = 0; i < orderSize; i++) {
OrderDetail food = myOrderManage.getOrderFoodList().get(i); OrderDetail food = orderFoodList.get(i);
if (food.getNumber() == 0) if (food.getNumber() == 0)
continue; continue;
if (food.getItemType() == 1) { if (food.getItemType() == 1) {
...@@ -722,12 +735,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -722,12 +735,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
total = MoneyUtil.sum(total, food.getPrice()); total = MoneyUtil.sum(total, food.getPrice());
} }
} else { } else {
int parentIndex = food.getParentIndex() - 1;
if (orderSize > parentIndex && orderFoodList.get(parentIndex).getAblediscount() == 1) {
if (food.getType() == OrderDetail.DISCOUNT_TYPE) { if (food.getType() == OrderDetail.DISCOUNT_TYPE) {
//折扣金额直接减掉 //主食品参与折扣,折扣金额直接减掉
total = MoneyUtil.sub(total, Math.abs(food.getPrice())); total = MoneyUtil.sub(total, Math.abs(food.getPrice()));
} else { } else {
int parentIndex = food.getParentIndex() - 1;
if (orderSize > parentIndex && myOrderManage.getOrderFoodList().get(parentIndex).getAblediscount() == 1) {
//主食品可參與折扣 子食品才能參與折扣 //主食品可參與折扣 子食品才能參與折扣
if (food.getAblediscount() == 1) { if (food.getAblediscount() == 1) {
total = MoneyUtil.sum(total, food.getPrice()); total = MoneyUtil.sum(total, food.getPrice());
...@@ -788,9 +801,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -788,9 +801,10 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
*/ */
public double getScAbleFoodTotal() { public double getScAbleFoodTotal() {
double total = 0.0; double total = 0.0;
int orderSize = myOrderManage.getOrderFoodList().size(); List<OrderDetail> orderFoodList = myOrderManage.getOrderFoodList();
int orderSize = orderFoodList.size();
for (int i = 0; i < orderSize; i++) { for (int i = 0; i < orderSize; i++) {
OrderDetail food = myOrderManage.getOrderFoodList().get(i); OrderDetail food = orderFoodList.get(i);
if (food.getNumber() == 0) if (food.getNumber() == 0)
continue; continue;
if (food.getItemType() == 1) { if (food.getItemType() == 1) {
...@@ -798,12 +812,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas ...@@ -798,12 +812,12 @@ public class BaseOrderPresenter<M extends BaseOrderContract.Model, V extends Bas
total = MoneyUtil.sum(total, food.getPrice()); total = MoneyUtil.sum(total, food.getPrice());
} }
} else { } else {
int parentIndex = food.getParentIndex() - 1;
if (orderSize > parentIndex && orderFoodList.get(parentIndex).getScAble() == 1) {
if (food.getType() == OrderDetail.DISCOUNT_TYPE) { if (food.getType() == OrderDetail.DISCOUNT_TYPE) {
//折扣金额直接减掉 //主食品参与服务费,折扣金额直接减掉
total = MoneyUtil.sub(total, Math.abs(food.getPrice())); total = MoneyUtil.sub(total, Math.abs(food.getPrice()));
} else { } else {
int parentIndex = food.getParentIndex() - 1;
if (orderSize > parentIndex && myOrderManage.getOrderFoodList().get(parentIndex).getScAble() == 1) {
//主食品可參與服务费 子食品才能參與服务费 //主食品可參與服务费 子食品才能參與服务费
if (food.getScAble() == 1) { if (food.getScAble() == 1) {
total = MoneyUtil.sum(total, food.getPrice()); total = MoneyUtil.sum(total, food.getPrice());
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -795,7 +795,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -795,7 +795,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
if (GsaCloudApplication.androidSetting.isAutoPrinterParper()) { if (GsaCloudApplication.androidSetting.isAutoPrinterParper()) {
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_SERVE)
.build() .build()
.callAsyncCallbackOnMainThread((cc, result) -> { .callAsyncCallbackOnMainThread((cc, result) -> {
if (result.isSuccess()) { if (result.isSuccess()) {
...@@ -968,66 +968,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -968,66 +968,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
}); });
} }
// public void memeberUse(int tableId, String tableNumber, long memberId, Button btn_table) {
// mModel.memeberUse(tableId, tableNumber, memberId)
// .subscribeOn(Schedulers.io())
// .doOnSubscribe(disposable -> mRootView.showLoading(null))
// .subscribeOn(AndroidSchedulers.mainThread())
// .observeOn(AndroidSchedulers.mainThread())
// .doAfterTerminate(() -> mRootView.hideLoading())
// .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
// .subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
//
// @Override
// public void onNext(@NonNull BaseResult info) {
// if (info != null && info.isSuccess()) {
// if (info.getData() != null) {
// MyOrderManage.getInstance().setMemberInfo(mMemberInfo);
// btn_table.setBackgroundResource(R.color.pink_300);
// //添加会员折扣行
// addMemberDiscount(mMemberInfo.getId(),mMemberInfo.getMemberDiscount(),mMemberInfo.getLevelName1());
// } else {
// mRootView.showMessage("使用失敗!");
// }
// } else {
// mRootView.showMessage(info.getErrMsg());
// }
// }
// });
// }
// public void memeberUseCancel(int tableId, String tableNumber, long memberId, Button btn_table) {
// mModel.memeberUseCancel(tableId, tableNumber, memberId)
// .subscribeOn(Schedulers.io())
// .doOnSubscribe(disposable -> mRootView.showLoading(null))
// .subscribeOn(AndroidSchedulers.mainThread())
// .observeOn(AndroidSchedulers.mainThread())
// .doAfterTerminate(() -> mRootView.hideLoading())
// .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
// .subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) {
//
// @Override
// public void onNext(@NonNull BaseResult info) {
// if (info != null && info.isSuccess()) {
// if (info.getData() != null) {
// btn_table.setBackgroundColor(Color.parseColor("#336699"));
// MyOrderManage.getInstance().setMemberInfo(null);
// //刪除會員折扣行
// removeMemberDiscountItem();
// //更新會員信息
// mRootView.memberUseCancelSuccess();
// } else {
// mRootView.showMessage("清除失敗!");
// }
// } else {
// mRootView.showMessage(info.getErrMsg());
// }
// }
//
// });
// }
public void getRestaurantFoodReason() { public void getRestaurantFoodReason() {
int brandId = GsaCloudApplication.getBrandId(mApplication); int brandId = GsaCloudApplication.getBrandId(mApplication);
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication); int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
...@@ -1610,7 +1550,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -1610,7 +1550,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
* @param pointsRedeem * @param pointsRedeem
* @return * @return
*/ */
private boolean memberPointsCondition(double pointsRedeem, String foodName) { public boolean memberPointsCondition(double pointsRedeem, String foodName) {
MemberInfo memberInfo = myOrderManage.getMemberInfo(); MemberInfo memberInfo = myOrderManage.getMemberInfo();
if (memberInfo == null) { if (memberInfo == null) {
//当前食品需要会员积分 //当前食品需要会员积分
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -361,13 +361,13 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -361,13 +361,13 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
} }
/** /**
* 送單 * 送單打印上菜纸
*/ */
private void printSendOrder(List<OrderDetail> newFoods) { private void printSendOrder(List<OrderDetail> newFoods) {
if (GsaCloudApplication.androidSetting.isAutoPrinterParper()) { if (GsaCloudApplication.androidSetting.isAutoPrinterParper()) {
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_SERVE)
.build() .build()
.callAsyncCallbackOnMainThread((cc, result) -> { .callAsyncCallbackOnMainThread((cc, result) -> {
if (result.isSuccess()) { if (result.isSuccess()) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
...@@ -238,12 +238,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -238,12 +238,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
if (baseResult.isSuccess()) { if (baseResult.isSuccess()) {
OrderPayRespose orderPayRespose = JsonUtils.parseObject(baseResult.getData(), OrderPayRespose.class); OrderPayRespose orderPayRespose = JsonUtils.parseObject(baseResult.getData(), OrderPayRespose.class);
if (orderPayRespose != null) { if (orderPayRespose != null) {
if(myOrderManage.getMemberInfo() != null){ if (myOrderManage.getMemberInfo() != null) {
MyOrderManage.getInstance().setAddPoints(orderPayRespose.getAddPoints()); MyOrderManage.getInstance().setAddPoints(orderPayRespose.getAddPoints());
MyOrderManage.getInstance().setNowPoint(orderPayRespose.getNowPoint()); MyOrderManage.getInstance().setNowPoints(orderPayRespose.getNowPoints());
MyOrderManage.getInstance().setOldPoints(orderPayRespose.getOldPoints()); MyOrderManage.getInstance().setOldPoints(orderPayRespose.getOldPoints());
}else { } else {
if(!TextUtils.isEmpty(orderPayRespose.getVerifyCode())){ if (!TextUtils.isEmpty(orderPayRespose.getVerifyCode())) {
MyOrderManage.getInstance().setIntegralQrcode(orderPayRespose.getVerifyCode()); MyOrderManage.getInstance().setIntegralQrcode(orderPayRespose.getVerifyCode());
} }
} }
...@@ -276,6 +276,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -276,6 +276,7 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
payRequest.setPointsAdd(getPointsAdd()); payRequest.setPointsAdd(getPointsAdd());
payRequest.setPointsUse(getPointsRedeem()); payRequest.setPointsUse(getPointsRedeem());
int whetherFreeService = 0;
for (int i = 0; i < payMethodList.size(); i++) { for (int i = 0; i < payMethodList.size(); i++) {
PayMethod payMethod = payMethodList.get(i); PayMethod payMethod = payMethodList.get(i);
OrderPayRequest.orderPay orderPay = new OrderPayRequest.orderPay(); OrderPayRequest.orderPay orderPay = new OrderPayRequest.orderPay();
...@@ -288,9 +289,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -288,9 +289,12 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
} else { } else {
orderPay.setTipsPrice(orderPayView.getTipsPrice()); orderPay.setTipsPrice(orderPayView.getTipsPrice());
} }
whetherFreeService = payMethod.getWhetherFreeService();
orderPay.setAmount(payMethod.getPayMoney()); orderPay.setAmount(payMethod.getPayMoney());
payRequest.getOrderPays().add(orderPay); payRequest.getOrderPays().add(orderPay);
} }
payRequest.setWhetherFreeService(whetherFreeService);
return payRequest; return payRequest;
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -711,9 +711,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -711,9 +711,8 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}); });
} }
public void splitTable(TableBean.DataBean tableBean) {
public void splitTable(int tableId) { mModel.splitTable(tableBean.getId())
mModel.splitTable(tableId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
...@@ -729,7 +728,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -729,7 +728,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
TableExtBean.DataBean tableExtBean = JsonUtils.parseObject(result.getData(), TableExtBean.DataBean.class); TableExtBean.DataBean tableExtBean = JsonUtils.parseObject(result.getData(), TableExtBean.DataBean.class);
long tableExtId = tableExtBean.getId(); long tableExtId = tableExtBean.getId();
//分檯开檯 //分檯开檯
openTable(tableExtId, TableBean.splitTableTransformTable(tableExtBean)); openTable(tableExtId, TableBean.splitTableTransformTable(tableBean,tableExtBean));
} }
} else { } else {
mRootView.showMessage(result.getErrMsg()); mRootView.showMessage(result.getErrMsg());
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/AllOrderPresenter.java
...@@ -7,6 +7,7 @@ import android.text.TextUtils; ...@@ -7,6 +7,7 @@ import android.text.TextUtils;
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.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney; import com.gingersoft.gsa.cloud.base.common.bean.BillOrderMoney;
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;
...@@ -184,9 +185,16 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All ...@@ -184,9 +185,16 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM)); dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
OpenTableManage.getDefault().setTableBean(dataBean); OpenTableManage.getDefault().setTableBean(dataBean);
if (orderDetailItem.getMemberInfo() != null) {
MyOrderManage.getInstance().setMemberInfo(orderDetailItem.getMemberInfo());
}else {
MyOrderManage.getInstance().setIntegralQrcode(orderDetailItem.getVerifyCode());
}
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays()); List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays());
if (payMethodList != null) {
//設置打印所需支付方式 //設置打印所需支付方式
MyOrderManage.getInstance().setBillMoney(payMethodList); MyOrderManage.getInstance().setBillMoney(payMethodList);
}
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_BILL) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_BILL)
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
...@@ -53,6 +53,7 @@ import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils; ...@@ -53,6 +53,7 @@ import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
import com.gingersoft.gsa.cloud.database.utils.FoodModifierDaoUtils; 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.print.bean.OrderDetails; import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.gingersoft.gsa.cloud.table.BuildConfig;
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.constans.GoldConstants; import com.gingersoft.gsa.cloud.constans.GoldConstants;
...@@ -731,12 +732,14 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -731,12 +732,14 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
case 3: case 3:
case 4: case 4:
case 5: case 5:
if (BuildConfig.DEBUG) {
if (i == 1) { if (i == 1) {
OrderBean order = MyOrderManage.getInstance().getOrderBean(); OrderBean order = MyOrderManage.getInstance().getOrderBean();
if (order != null) { if (order != null) {
ArmsUtils.snackbarText("訂單ID:" + order.getId()); ArmsUtils.snackbarText("訂單ID:" + order.getId());
} }
} }
}
mPresenter.changeNumber(i); mPresenter.changeNumber(i);
break; break;
case 99: case 99:
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderPayActivity.java
...@@ -482,13 +482,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements ...@@ -482,13 +482,11 @@ public class OrderPayActivity extends BaseActivity<OrderPayPresenter> implements
} }
} }
if (openInstruction) { if (openInstruction) {
printBill();
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_INSTRUCTION)
.build() .build();
.callAsync((cc, result) -> {
});
printBill();
} else { } else {
printBill(); printBill();
} }
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/TableActivity.java
...@@ -307,7 +307,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen ...@@ -307,7 +307,7 @@ public class TableActivity extends BaseFragmentActivity<TablePresenter> implemen
switch (mPresenter.getCurrentChooseOperatType()) { switch (mPresenter.getCurrentChooseOperatType()) {
case TableOperatTypeConstant.splite_table_1: case TableOperatTypeConstant.splite_table_1:
setOperatContentText(dataBean.getTableName()); setOperatContentText(dataBean.getTableName());
mPresenter.splitTable(dataBean.getId()); mPresenter.splitTable(dataBean);
break; break;
case TableOperatTypeConstant.print_parper_2: case TableOperatTypeConstant.print_parper_2:
case TableOperatTypeConstant.init_table_3: case TableOperatTypeConstant.init_table_3:
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
...@@ -447,6 +447,16 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -447,6 +447,16 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM)); dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
OpenTableManage.getDefault().setTableBean(dataBean); OpenTableManage.getDefault().setTableBean(dataBean);
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays());
if (payMethodList != null) {
//設置打印所需支付方式
MyOrderManage.getInstance().setBillMoney(payMethodList);
}
if (orderDetailItem.getMemberInfo() != null) {
MyOrderManage.getInstance().setMemberInfo(orderDetailItem.getMemberInfo());
}else {
MyOrderManage.getInstance().setIntegralQrcode(orderDetailItem.getVerifyCode());
}
CC.obtainBuilder("Component.Print") CC.obtainBuilder("Component.Print")
.setActionName("printActivity") .setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_BILL) .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_BILL)
...@@ -460,6 +470,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl ...@@ -460,6 +470,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
}); });
} }
private List<BillOrderMoney> getOrderMoneyList() { private List<BillOrderMoney> getOrderMoneyList() {
List<BillOrderMoney> billOrderMoneyList = new ArrayList<>(); List<BillOrderMoney> billOrderMoneyList = new ArrayList<>();
if (mOrderCenterMoneyList != null) { if (mOrderCenterMoneyList != null) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/widget/DiscountDialog.java
...@@ -138,12 +138,12 @@ public class DiscountDialog extends Dialog { ...@@ -138,12 +138,12 @@ public class DiscountDialog extends Dialog {
mTopBar.setBackgroundColor(ContextCompat.getColor(mContext, R.color.theme_color)); mTopBar.setBackgroundColor(ContextCompat.getColor(mContext, R.color.theme_color));
} }
if (canScan) { if (canScan) {
mTopBar.addRightImageButton(R.mipmap.table_white_scan, R.id.topbar_right_change_button) // mTopBar.addRightImageButton(R.mipmap.table_white_scan, R.id.topbar_right_change_button)
.setOnClickListener(v -> { // .setOnClickListener(v -> {
if (onClickListener != null) { // if (onClickListener != null) {
onClickListener.onScan(); // onClickListener.onScan();
} // }
}); // });
} }
mTopBar.setTitle("折扣"); mTopBar.setTitle("折扣");
} }
......
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