Skip to content

S
supplier
Commit 67a1c0bc by 宁斌
Options

1、結賬支持多種支付方式

parent 9f67a4da
Showing with 359 additions and 212 deletions
base-module/build.gradle
......@@ -44,7 +44,7 @@ android {
/**
* 版本号
*/
schemaVersion 10
schemaVersion 11
/**
* greendao输出dao的数据库操作实体类文件夹（相对路径 包名+自定义路径名称，包将创建于包名的直接路径下）
*/
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/MemberInfo.java
......@@ -123,7 +123,10 @@ public class MemberInfo {
private UpdateTimeBean updateTime;
private MemberExpireDateBean memberExpireDate;
private VaildTimeBean vaildTime;
private String memberNo;
private int MemberPoint;
private String memberName;
private int phone;
private int birthdaybonusratio;
private int creditPoints;
private int birthdayperiod;
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/Discount.java
......@@ -9,6 +9,8 @@ import org.greenrobot.greendao.annotation.Property;
import java.util.Date;
import org.greenrobot.greendao.annotation.Generated;
import lombok.Data;
/**
* 作者：ELEGANT_BIN
* 版本：1.6.0
......@@ -16,30 +18,10 @@ import org.greenrobot.greendao.annotation.Generated;
* 修订历史：2020-04-08
* 描述：
*/
@Data
@Entity
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
*/
......@@ -58,14 +40,14 @@ public class Discount {
private int status;
/**折扣描述*/
private String remark;
private Date begin_time;
private Date end_time;
private String begin_time;
private String end_time;
@Generated(hash = 1370540661)
@Generated(hash = 1828565109)
public Discount(Long id, int restaurant_id, double amount, double discount_value,
int type, int status, String remark, Date begin_time, Date end_time) {
int type, int status, String remark, String begin_time, String end_time) {
this.id = id;
this.restaurant_id = restaurant_id;
this.amount = amount;
......@@ -76,106 +58,146 @@ public class Discount {
this.begin_time = begin_time;
this.end_time = end_time;
}
@Generated(hash = 1777606421)
public Discount() {
}
/**
* 計算折扣金額
* @param discount
* @param sourcePrice
* @return
*/
public static double calculationDiscount(Discount discount , double sourcePrice){
double discountPrice;
if(discount.getType() == 0){
//金額折扣
discountPrice = discount.getAmount();
}else {
//百分比折扣
discountPrice = MoneyUtil.multiply(sourcePrice, discount.getDiscount_value());
}
if(sourcePrice < discountPrice){
//折扣金額不能超出總額
discountPrice = sourcePrice;
}
// else {
// discountPrice = sourcePrice - discountPrice;
// }
return - MoneyUtil.get_ItemDecimals_money(discountPrice);
}
public Long getId() {
return id;
return this.id;
}
public void setId(Long id) {
this.id = id;
}
public int getRestaurant_id() {
return restaurant_id;
return this.restaurant_id;
}
public void setRestaurant_id(int restaurant_id) {
this.restaurant_id = restaurant_id;
}
public double getAmount() {
return amount;
return this.amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public double getDiscount_value() {
return discount_value;
return this.discount_value;
}
public void setDiscount_value(double discount_value) {
this.discount_value = discount_value;
}
public int getType() {
return type;
return this.type;
}
public void setType(int type) {
this.type = type;
}
public int getStatus() {
return status;
return this.status;
}
public void setStatus(int status) {
this.status = status;
}
public String getRemark() {
return remark;
return this.remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Date getBegin_time() {
return begin_time;
public String getBegin_time() {
return this.begin_time;
}
public void setBegin_time(Date begin_time) {
public void setBegin_time(String begin_time) {
this.begin_time = begin_time;
}
public Date getEnd_time() {
return end_time;
}
public void setEnd_time(Date end_time) {
this.end_time = end_time;
public String getEnd_time() {
return this.end_time;
}
/**
* 計算折扣金額
* @param discount
* @param sourcePrice
* @return
*/
public static double calculationDiscount(Discount discount , double sourcePrice){
double discountPrice;
if(discount.getType() == 0){
//金額折扣
discountPrice = discount.getAmount();
}else {
//百分比折扣
discountPrice = MoneyUtil.multiply(sourcePrice, discount.getDiscount_value());
}
if(sourcePrice < discountPrice){
//折扣金額不能超出總額
discountPrice = sourcePrice;
}
// else {
// discountPrice = sourcePrice - discountPrice;
// }
return - MoneyUtil.get_ItemDecimals_money(discountPrice);
public void setEnd_time(String end_time) {
this.end_time = end_time;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoMaster.java
......@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
/**
* Master of DAO (schema version 10): knows all DAOs.
* Master of DAO (schema version 11): knows all DAOs.
*/
public class DaoMaster extends AbstractDaoMaster {
public static final int SCHEMA_VERSION = 10;
public static final int SCHEMA_VERSION = 11;
/** Creates underlying database table using DAOs. */
public static void createAllTables(Database db, boolean ifNotExists) {
......@@ -76,9 +76,9 @@ public class DaoMaster extends AbstractDaoMaster {
registerDaoClass(FunctionDao.class);
registerDaoClass(LanguageDao.class);
registerDaoClass(ModifierDao.class);
registerDaoClass(PrintCurrencyBeanDao.class);
registerDaoClass(PrinterDeviceBeanDao.class);
registerDaoClass(PrintModelBeanDao.class);
registerDaoClass(PrintCurrencyBeanDao.class);
}
public DaoSession newSession() {
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DaoSession.java
......@@ -15,11 +15,11 @@ import com.gingersoft.gsa.cloud.database.bean.Food;
import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
import com.gingersoft.gsa.cloud.database.bean.FoodModifier;
import com.gingersoft.gsa.cloud.database.bean.Function;
import com.gingersoft.gsa.cloud.database.bean.Language;
import com.gingersoft.gsa.cloud.database.bean.Modifier;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.bean.PrintModelBean;
import com.gingersoft.gsa.cloud.database.bean.Language;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.greendao.ComboItemDao;
import com.gingersoft.gsa.cloud.database.greendao.DiscountDao;
......@@ -28,11 +28,11 @@ import com.gingersoft.gsa.cloud.database.greendao.FoodDao;
import com.gingersoft.gsa.cloud.database.greendao.FoodComboDao;
import com.gingersoft.gsa.cloud.database.greendao.FoodModifierDao;
import com.gingersoft.gsa.cloud.database.greendao.FunctionDao;
import com.gingersoft.gsa.cloud.database.greendao.LanguageDao;
import com.gingersoft.gsa.cloud.database.greendao.ModifierDao;
import com.gingersoft.gsa.cloud.database.greendao.PrintCurrencyBeanDao;
import com.gingersoft.gsa.cloud.database.greendao.PrinterDeviceBeanDao;
import com.gingersoft.gsa.cloud.database.greendao.PrintModelBeanDao;
import com.gingersoft.gsa.cloud.database.greendao.LanguageDao;
import com.gingersoft.gsa.cloud.database.greendao.PrintCurrencyBeanDao;
// THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
......@@ -50,11 +50,11 @@ public class DaoSession extends AbstractDaoSession {
private final DaoConfig foodComboDaoConfig;
private final DaoConfig foodModifierDaoConfig;
private final DaoConfig functionDaoConfig;
private final DaoConfig languageDaoConfig;
private final DaoConfig modifierDaoConfig;
private final DaoConfig printCurrencyBeanDaoConfig;
private final DaoConfig printerDeviceBeanDaoConfig;
private final DaoConfig printModelBeanDaoConfig;
private final DaoConfig languageDaoConfig;
private final DaoConfig printCurrencyBeanDaoConfig;
private final ComboItemDao comboItemDao;
private final DiscountDao discountDao;
......@@ -63,11 +63,11 @@ public class DaoSession extends AbstractDaoSession {
private final FoodComboDao foodComboDao;
private final FoodModifierDao foodModifierDao;
private final FunctionDao functionDao;
private final LanguageDao languageDao;
private final ModifierDao modifierDao;
private final PrintCurrencyBeanDao printCurrencyBeanDao;
private final PrinterDeviceBeanDao printerDeviceBeanDao;
private final PrintModelBeanDao printModelBeanDao;
private final LanguageDao languageDao;
private final PrintCurrencyBeanDao printCurrencyBeanDao;
public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
daoConfigMap) {
......@@ -94,21 +94,21 @@ public class DaoSession extends AbstractDaoSession {
functionDaoConfig = daoConfigMap.get(FunctionDao.class).clone();
functionDaoConfig.initIdentityScope(type);
languageDaoConfig = daoConfigMap.get(LanguageDao.class).clone();
languageDaoConfig.initIdentityScope(type);
modifierDaoConfig = daoConfigMap.get(ModifierDao.class).clone();
modifierDaoConfig.initIdentityScope(type);
printCurrencyBeanDaoConfig = daoConfigMap.get(PrintCurrencyBeanDao.class).clone();
printCurrencyBeanDaoConfig.initIdentityScope(type);
printerDeviceBeanDaoConfig = daoConfigMap.get(PrinterDeviceBeanDao.class).clone();
printerDeviceBeanDaoConfig.initIdentityScope(type);
printModelBeanDaoConfig = daoConfigMap.get(PrintModelBeanDao.class).clone();
printModelBeanDaoConfig.initIdentityScope(type);
languageDaoConfig = daoConfigMap.get(LanguageDao.class).clone();
languageDaoConfig.initIdentityScope(type);
printCurrencyBeanDaoConfig = daoConfigMap.get(PrintCurrencyBeanDao.class).clone();
printCurrencyBeanDaoConfig.initIdentityScope(type);
comboItemDao = new ComboItemDao(comboItemDaoConfig, this);
discountDao = new DiscountDao(discountDaoConfig, this);
expandInfoDao = new ExpandInfoDao(expandInfoDaoConfig, this);
......@@ -116,11 +116,11 @@ public class DaoSession extends AbstractDaoSession {
foodComboDao = new FoodComboDao(foodComboDaoConfig, this);
foodModifierDao = new FoodModifierDao(foodModifierDaoConfig, this);
functionDao = new FunctionDao(functionDaoConfig, this);
languageDao = new LanguageDao(languageDaoConfig, this);
modifierDao = new ModifierDao(modifierDaoConfig, this);
printCurrencyBeanDao = new PrintCurrencyBeanDao(printCurrencyBeanDaoConfig, this);
printerDeviceBeanDao = new PrinterDeviceBeanDao(printerDeviceBeanDaoConfig, this);
printModelBeanDao = new PrintModelBeanDao(printModelBeanDaoConfig, this);
languageDao = new LanguageDao(languageDaoConfig, this);
printCurrencyBeanDao = new PrintCurrencyBeanDao(printCurrencyBeanDaoConfig, this);
registerDao(ComboItem.class, comboItemDao);
registerDao(Discount.class, discountDao);
......@@ -129,11 +129,11 @@ public class DaoSession extends AbstractDaoSession {
registerDao(FoodCombo.class, foodComboDao);
registerDao(FoodModifier.class, foodModifierDao);
registerDao(Function.class, functionDao);
registerDao(Language.class, languageDao);
registerDao(Modifier.class, modifierDao);
registerDao(PrintCurrencyBean.class, printCurrencyBeanDao);
registerDao(PrinterDeviceBean.class, printerDeviceBeanDao);
registerDao(PrintModelBean.class, printModelBeanDao);
registerDao(Language.class, languageDao);
registerDao(PrintCurrencyBean.class, printCurrencyBeanDao);
}
public void clear() {
......@@ -144,11 +144,11 @@ public class DaoSession extends AbstractDaoSession {
foodComboDaoConfig.clearIdentityScope();
foodModifierDaoConfig.clearIdentityScope();
functionDaoConfig.clearIdentityScope();
languageDaoConfig.clearIdentityScope();
modifierDaoConfig.clearIdentityScope();
printCurrencyBeanDaoConfig.clearIdentityScope();
printerDeviceBeanDaoConfig.clearIdentityScope();
printModelBeanDaoConfig.clearIdentityScope();
languageDaoConfig.clearIdentityScope();
printCurrencyBeanDaoConfig.clearIdentityScope();
}
public ComboItemDao getComboItemDao() {
......@@ -179,10 +179,18 @@ public class DaoSession extends AbstractDaoSession {
return functionDao;
}
public LanguageDao getLanguageDao() {
return languageDao;
}
public ModifierDao getModifierDao() {
return modifierDao;
}
public PrintCurrencyBeanDao getPrintCurrencyBeanDao() {
return printCurrencyBeanDao;
}
public PrinterDeviceBeanDao getPrinterDeviceBeanDao() {
return printerDeviceBeanDao;
}
......@@ -191,12 +199,4 @@ public class DaoSession extends AbstractDaoSession {
return printModelBeanDao;
}
public LanguageDao getLanguageDao() {
return languageDao;
}
public PrintCurrencyBeanDao getPrintCurrencyBeanDao() {
return printCurrencyBeanDao;
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/DiscountDao.java
......@@ -31,8 +31,8 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
public final static Property Type = new Property(4, int.class, "type", false, "TYPE");
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 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 Begin_time = new Property(7, String.class, "begin_time", false, "BEGIN_TIME");
public final static Property End_time = new Property(8, String.class, "end_time", false, "END_TIME");
}
......@@ -55,8 +55,8 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
"\"TYPE\" INTEGER NOT NULL ," + // 4: type
"\"STATUS\" INTEGER NOT NULL ," + // 5: status
"\"REMARK\" TEXT," + // 6: remark
"\"BEGIN_TIME\" INTEGER," + // 7: begin_time
"\"END_TIME\" INTEGER);"); // 8: end_time
"\"BEGIN_TIME\" TEXT," + // 7: begin_time
"\"END_TIME\" TEXT);"); // 8: end_time
}
/** Drops the underlying database table. */
......@@ -84,14 +84,14 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
stmt.bindString(7, remark);
}
java.util.Date begin_time = entity.getBegin_time();
String begin_time = entity.getBegin_time();
if (begin_time != null) {
stmt.bindLong(8, begin_time.getTime());
stmt.bindString(8, begin_time);
}
java.util.Date end_time = entity.getEnd_time();
String end_time = entity.getEnd_time();
if (end_time != null) {
stmt.bindLong(9, end_time.getTime());
stmt.bindString(9, end_time);
}
}
......@@ -114,14 +114,14 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
stmt.bindString(7, remark);
}
java.util.Date begin_time = entity.getBegin_time();
String begin_time = entity.getBegin_time();
if (begin_time != null) {
stmt.bindLong(8, begin_time.getTime());
stmt.bindString(8, begin_time);
}
java.util.Date end_time = entity.getEnd_time();
String end_time = entity.getEnd_time();
if (end_time != null) {
stmt.bindLong(9, end_time.getTime());
stmt.bindString(9, end_time);
}
}
......@@ -140,8 +140,8 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
cursor.getInt(offset + 4), // type
cursor.getInt(offset + 5), // status
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 + 8) ? null : new java.util.Date(cursor.getLong(offset + 8)) // end_time
cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // begin_time
cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8) // end_time
);
return entity;
}
......@@ -155,8 +155,8 @@ public class DiscountDao extends AbstractDao<Discount, Long> {
entity.setType(cursor.getInt(offset + 4));
entity.setStatus(cursor.getInt(offset + 5));
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.setEnd_time(cursor.isNull(offset + 8) ? null : new java.util.Date(cursor.getLong(offset + 8)));
entity.setBegin_time(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
entity.setEnd_time(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));
}
@Override
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/adapter/BillMoneyAdapter.java
package com.gingersoft.gsa.cloud.ui.adapter;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
......@@ -55,11 +56,19 @@ public class BillMoneyAdapter extends BaseQuickAdapter<PayMethod, BaseViewHolder
ll_container.setBackgroundResource(R.color.theme_background_color);
}
setOnItemClickListener((adapter, view, position) -> {
if (mOnItemClickListener != null) {
mOnItemClickListener.onItemClick(datasBean, position);
ll_container.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mOnItemClickListener != null) {
mOnItemClickListener.onItemClick(datasBean,helper.getAdapterPosition());
}
}
});
// setOnItemClickListener((adapter, view, position) -> {
// if (mOnItemClickListener != null) {
// mOnItemClickListener.onItemClick(datasBean, position);
// }
// });
iv_bill_delete.setOnClickListener((v -> {
if (mOnItemClickListener != null)
mOnItemClickListener.onItemDeleteClick(datasBean, helper.getPosition());
......
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/OrderPayView.java
......@@ -110,7 +110,7 @@ public class OrderPayView extends LinearLayout {
} else if (mBillMoneyList.size() == 1) {
//差一种支付方式 直接补足余额
double differenceMoney = getDifferenceMoney();
if (differenceMoney > -1) {
if (differenceMoney > -1 && differenceMoney != totalAmount) {
//補足差額
method.setPayMoney(differenceMoney);
}
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -253,16 +253,16 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
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, 0));
// functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
// functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
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) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
// functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_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, 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_close, 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_sell_off_manger, 0));
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_close, 1));
functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
// functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
// functions.add(new Function((long) 147, 152, 5, "員工管理", R.drawable.ic_staff_management_close, 1));
......
manager-module/src/main/AndroidManifest.xml
......@@ -6,7 +6,7 @@
<activity
android:name=".mvp.ui.activity.TableManageActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustResize"/>
android:windowSoftInputMode="stateUnchanged|adjustPan"/>
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
......
manager-module/src/main/debug/AndroidManifest.xml
......@@ -11,7 +11,9 @@
android:networkSecurityConfig="@xml/network_android"
android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.TableManageActivity"/>
<activity android:name=".mvp.ui.activity.TableManageActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateUnchanged|adjustPan"/>
<!-- arms配置 -->
<meta-data
android:name="com.gingersoft.gsa.cloud.globalconfig.GlobalConfiguration"
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/activity/TableManageActivity.java
......@@ -92,11 +92,9 @@ public class TableManageActivity extends BaseFragmentActivity<TableManagePresent
@Override
public void initData(@Nullable Bundle savedInstanceState) {
if (findFragment(TableListFragment.class) == null) {
loadRootFragment(R.id.fl_container, TableListFragment.newInstance());
}
}
public void initGetTableTimer() {
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/adapter/TableManageSectiontAdapter.java
......@@ -132,6 +132,7 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
viewHolder.cb_checked.setVisibility(View.GONE);
} else {
viewHolder.cb_checked.setChecked(false);
viewHolder.rl_table.setVisibility(View.VISIBLE);
viewHolder.fl_add_table.setVisibility(View.GONE);
......@@ -151,11 +152,11 @@ public class TableManageSectiontAdapter extends QMUIDefaultStickySectionAdapter<
viewHolder.cb_checked.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
buttonView.setChecked(isChecked);
tableItem.setChecked(isChecked);
}
});
} else {
viewHolder.cb_checked.setChecked(false);
viewHolder.cb_checked.setOnCheckedChangeListener(null);
viewHolder.cb_checked.setVisibility(View.GONE);
}
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
......@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.text.InputFilter;
import android.text.InputType;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
......@@ -319,11 +320,11 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
if (mTableItem.getLayoutType() == 0 && mTableItem.getServiceCharge() != 0) {
serverchargeEditText.setText(mTableItem.getServiceCharge() + "");
}
InputFilter[] filters3 = {new InputFilter.LengthFilter(2)};
InputFilter[] filters3 = {new InputFilter.LengthFilter(5)};
serverchargeEditText.setFilters(filters3);
serverchargeEditText.setTextSize(16);
serverchargeEditText.setBackgroundColor(ContextCompat.getColor(mContext, R.color.trans));
serverchargeEditText.setInputType(EditorInfo.TYPE_CLASS_NUMBER);
serverchargeEditText.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
serverchargeItemView.addAccessoryCustomView(serverchargeEditText);
// 如下是内容为空的配置，需要两个属性结合使用；如果有默认值，进行相反的配置
// 设置文字的对齐方式
......
manager-module/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/TableListFragment.java
......@@ -168,7 +168,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
initRecycleScrollListener();
mActivity.queryAreas(null);
mActivity.queryTables(null);
// mActivity.initGetTableTimer();
mActivity.initGetTableTimer();
cb_all_select.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
......@@ -188,14 +188,14 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
super.onResume();
hideSoftInput();
//開始刷新餐檯數據
// mActivity.onStartRefreshTableData();
mActivity.onStartRefreshTableData();
}
@Override
public void onPause() {
super.onPause();
//停止刷新餐檯數據
// mActivity.onPauseRefreshTableData();
mActivity.onPauseRefreshTableData();
}
@Override
......@@ -436,7 +436,7 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
showMessage("請選擇餐檯");
return;
}
showEditTextDialog(mActivity, "批量修改服務費", "請輸入服務費");
showEditTextDialog(mActivity, "批量修改服務費", "請輸入服務費",InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_DECIMAL);
}
@OnClick(R2.id.btn_delete)
......@@ -483,11 +483,11 @@ public class TableListFragment extends BaseFragment<TableListPresenter> implemen
return updateServiceCharges;
}
public void showEditTextDialog(Activity context, String title, String placeholder) {
public void showEditTextDialog(Activity context, String title, String placeholder,int inputType) {
final QMUIDialog.EditTextDialogBuilder dialogBuilder = new QMUIDialog.EditTextDialogBuilder(context);
dialogBuilder.setTitle(title);
dialogBuilder.setPlaceholder(placeholder);
dialogBuilder.setInputType(InputType.TYPE_CLASS_NUMBER);
dialogBuilder.setInputType(inputType);
dialogBuilder.addAction(0, "確認", QMUIDialogAction.ACTION_PROP_NEGATIVE, (dialog, index) -> {
dialog.dismiss();
CharSequence text = dialogBuilder.getEditText().getText();
......
print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
......@@ -118,12 +118,12 @@ public class PrintBill extends PrinterRoot {
orderNum.setText(MyOrderManage.getInstance().getOrderId() + "");
}
BigDecimal totalAmount = new BigDecimal(0);
for (OrderDetail OrderDetail : MyOrderManage.getInstance().getOrderFoodList()) {
totalAmount = MoneyUtil.sum(totalAmount, OrderDetail.getPrice());
}
// BigDecimal totalAmount = new BigDecimal(0);
// for (OrderDetail OrderDetail : MyOrderManage.getInstance().getOrderFoodList()) {
// totalAmount = MoneyUtil.sum(totalAmount, OrderDetail.getPrice());
// }
//總金額
mTvTotalAmount.setText(totalAmount + "");
mTvTotalAmount.setText(MyOrderManage.getInstance().getTotalAmount() + "");
List<PayMethod> payBillMoneys = MyOrderManage.getInstance().getBillMoney();
rvPayType.setLayoutManager(new LinearLayoutManager(context));
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/bean/OrderDetailItem.java
......@@ -54,7 +54,7 @@ public class OrderDetailItem implements Serializable {
private double totalAmount;
private int totalPoints;
/**支付金額*/
// private double amount;
private double amount;
/**賬單小數*/
private Double rounding;
/**服務費*/
......@@ -79,7 +79,7 @@ public class OrderDetailItem implements Serializable {
private String endTime;
private List<OrderBean.OrderDetailsBean> orderDetails;
private List<orderPayBean> orderPays;
private List<OrderPayBean> orderPays;
/**
* 訂單狀態:0:未支付;1:待確認(已支付, 待餐廳確認);2:制作中（餐厅确认）;3:派送中;4:确认收货（完成）;5:是否评论;6:取消;
......@@ -95,11 +95,11 @@ public class OrderDetailItem implements Serializable {
@Data
public static class orderPayBean{
public static class OrderPayBean implements Serializable{
private long id;
private long lineOrderId;
private int payType;
private Date payTime;
private String payTime;
private double amount;
private double tipsPrice;
private int status;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
......@@ -222,8 +222,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
// .add("linePayType", String.valueOf(orderPayView.getLinePayType()))
// .add("tipsPrice", String.valueOf(orderPayView.getTipsPrice()))
// .build();
String deleteOrderRequest = GsonUtils.GsonString(getOrderPayRequest(orderPayView));
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), deleteOrderRequest);
String payRequest = GsonUtils.GsonString(getOrderPayRequest(orderPayView));
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), payRequest);
mModel.toOrderPay(requestBody)
.subscribeOn(Schedulers.io())
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
......@@ -195,6 +195,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
});
}
public void initBottomFunctionItem() {
// List<Function> functions = FunctionManager.getDefault().getFunctionByResModule(IActivity, ComponentTable.table.class, ComponentTable.table.bottom, "bottom");
// for (int i = 0; i < functions.size(); i++) {
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/AllOrderPresenter.java
......@@ -4,15 +4,19 @@ import android.app.Application;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import com.billy.cc.core.component.CC;
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.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
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.OpenTableManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.AllOrderContract;
import com.gingersoft.gsa.cloud.table.mvp.model.bean.OrderDetailItem;
......@@ -21,7 +25,9 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderCenterActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.orderManager.OrderDetailActivity;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderCenterMoneyAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.fragment.AllOrderFragment;
import com.gingersoft.gsa.cloud.ui.bean.view.SectionTextItem3;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -35,6 +41,7 @@ import java.util.List;
import javax.inject.Inject;
import androidx.recyclerview.widget.LinearLayoutManager;
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
......@@ -65,6 +72,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
private OrderCenterAdapter mOrderCenterAdapter;
private List<OrderDetailItem> mOrderItemList = new ArrayList<>();
@Inject
public AllOrderPresenter(AllOrderContract.Model model, AllOrderContract.View rootView) {
super(model, rootView);
......@@ -151,14 +159,21 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
}
private void startPrintOrder(OrderDetailItem orderDetailItem, List<OrderDetail> orderDetailList) {
double wholeAmount = getWholeAmount(orderDetailList);
MyOrderManage.getInstance().setOrderFoodList(orderDetailList);
MyOrderManage.getInstance().setOrderMoneyList(getOrderMoneyList(orderDetailItem,wholeAmount));
MyOrderManage.getInstance().setOrderId(orderDetailItem.getId());
MyOrderManage.getInstance().setWholeAmount(wholeAmount);
MyOrderManage.getInstance().setTotalAmount(orderDetailItem.getTotalAmount());
OpenTableManage.getDefault().setPeopleNumber(orderDetailItem.getPerson());
TableBean.DataBean dataBean = new TableBean.DataBean();
dataBean.setTableName(orderDetailItem.getTableName());
dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
OpenTableManage.getDefault().setTableBean(dataBean);
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem);
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays());
//設置打印所需支付方式
MyOrderManage.getInstance().setBillMoney(payMethodList);
CC.obtainBuilder("Component.Print")
......@@ -174,26 +189,116 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
});
}
private List<BillOrderMoney> getOrderMoneyList(OrderDetailItem orderDetailItem, double totalMoney) {
List<SectionTextItem3> printOrderMoneyList = new ArrayList<>();
List<BillOrderMoney> printBillOrderMoneyList = new ArrayList<>();
SectionTextItem3 serviceAmountSection = getOrderServiceAmountSection(orderDetailItem);
if (serviceAmountSection != null) {
printOrderMoneyList.add(serviceAmountSection);
}
List<SectionTextItem3> discountSections = getOrderDiscountSections(orderDetailItem, totalMoney);
if (discountSections != null) {
printOrderMoneyList.addAll(discountSections);
}
SectionTextItem3 roudingSection = getOrderRoudingSection(orderDetailItem);
if (roudingSection != null) {
printOrderMoneyList.add(roudingSection);
}
for (SectionTextItem3 item : printOrderMoneyList) {
BillOrderMoney billOrderMoney = new BillOrderMoney();
billOrderMoney.setTitle(item.getLeftText());
billOrderMoney.setMoney(Double.parseDouble(item.getRightText()));
printBillOrderMoneyList.add(billOrderMoney);
}
return printBillOrderMoneyList;
}
/**
* 獲取支付方式
* 返回合計金額
*
* @return
*/
private double getWholeAmount(List<OrderDetail> orderDetailList) {
double otherMoney = 0.0;
for (OrderDetail item : orderDetailList) {
otherMoney = MoneyUtil.sum(otherMoney, item.getPrice());
}
return otherMoney;
}
/**
* 獲取賬單折扣列
*
* @param orderDetailItem
* @param totalMoney
* @return
*/
private List<SectionTextItem3> getOrderDiscountSections(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 SectionTextItem3.discountTransSectionTextItem3(discount);
}
return null;
}
/**
* 獲取賬單小數列
*
* @param orderDetailItem
* @return
*/
private List<PayMethod> getPayMethodList(OrderDetailItem orderDetailItem) {
private SectionTextItem3 getOrderRoudingSection(OrderDetailItem orderDetailItem) {
if (orderDetailItem.getRounding() != null && orderDetailItem.getRounding() != 0) {
return SectionTextItem3.roundingTransSectionTextItem3(orderDetailItem.getRounding());
}
return null;
}
/**
* 获取服務費
*
* @param orderDetailItem
* @return
*/
private SectionTextItem3 getOrderServiceAmountSection(OrderDetailItem orderDetailItem) {
if (orderDetailItem.getServiceAmount() != null && orderDetailItem.getServiceAmount() != 0) {
return SectionTextItem3.serviceAmountTransSectionTextItem3(orderDetailItem.getServiceAmount());
}
return null;
}
/**
* 獲取支付方式
*
* @param orderPays
* @return
*/
private List<PayMethod> getPayMethodList(List<OrderDetailItem.OrderPayBean> orderPays) {
List<PayMethod> payMethodList = new ArrayList<>();
PayMethod payMethod = new PayMethod();
payMethod.setPayName(orderDetailItem.getPayName());
payMethod.setPayMoney(orderDetailItem.getTotalAmount());
payMethodList.add(payMethod);
if (orderDetailItem.getTipsPrice() != 0) {
//打印添加找零或貼士行
String linePayType = orderDetailItem.getLinePayType() == 1 ? "找零" : "貼士";
PayMethod payMethod2 = new PayMethod();
//這裡打印退一格
payMethod2.setPayName(" " + linePayType);
payMethod2.setPayMoney(orderDetailItem.getTipsPrice());
payMethodList.add(payMethod2);
if (orderPays != null) {
for (OrderDetailItem.OrderPayBean orderPayBean : orderPays) {
PayMethod payMethod = new PayMethod();
payMethod.setPayName(orderPayBean.getPayName());
payMethod.setPayMoney(orderPayBean.getAmount());
payMethodList.add(payMethod);
if (orderPayBean.getTipsPrice() != 0) {
//打印添加找零或貼士行
String linePayType = orderPayBean.getLinePayType() == 1 ? "找零" : "貼士";
PayMethod payMethod2 = new PayMethod();
//這裡打印退一格
payMethod2.setPayName(" " + linePayType);
payMethod2.setPayMoney(orderPayBean.getTipsPrice());
payMethodList.add(payMethod2);
}
}
}
return payMethodList;
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/OrderCenterPresenter.java
......@@ -86,7 +86,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
int restaurantId = GsaCloudApplication.getRestaurantId(mApplication);
if (pageIndex != 0) {
//根據數據庫下標分頁
pageIndex = pageIndex * pageSize ;
pageIndex = pageIndex * pageSize;
}
mModel.loadOrderList(restaurantId, status, pageIndex, pageSize)
.subscribeOn(Schedulers.io())
......@@ -115,7 +115,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
if (result.isSuccess()) {
if (result.getData() != null) {
List<OrderDetailItem> orderItemList = JsonUtils.parseArray(result.getData(), OrderDetailItem.class);
if (orderItemList.size() > 0) {
if (orderItemList != null && orderItemList.size() > 0) {
if (!noMoreData) {
mRootView.returnOrderItemList(orderItemList);
//每次更新完數據，頁碼+1
......@@ -128,7 +128,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
noMoreData = false;
}
} else {
if(!noMoreData){
if (!noMoreData) {
mRootView.getCurrentOrderFragment().showEmptyView(true, 0, null);
}
}
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/orderManager/OrderDetailActivity.java
......@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
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.OrderDetail;
import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
......@@ -154,7 +155,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
scrollview.post(new Runnable() {
@Override
public void run() {
scrollview.scrollTo(0,0);
scrollview.scrollTo(0, 0);
}
});
initOrderDetail(mOrderDetailItem);
......@@ -189,7 +190,6 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
}
}
private void setOrderMoneyAdpater(OrderDetailItem orderDetailItem, double totalMoney) {
if (mOrderCenterMoneyList.size() > 0) {
mOrderCenterMoneyList.clear();
......@@ -231,7 +231,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
}
private void setOrderPayMethodAdapter(OrderDetailItem orderDetailItem) {
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem);
List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays());
List<SectionTextItem3> sectionTextItem3List = SectionTextItem3.orderPayMethodTransSectionTextItem3(payMethodList);
if (mOrderDetailPayMethodAdapter == null) {
mOrderCenterPayMethodList.addAll(sectionTextItem3List);
......@@ -251,29 +251,34 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
/**
* 獲取支付方式
*
* @param orderDetailItem
* @param orderPays
* @return
*/
private List<PayMethod> getPayMethodList(OrderDetailItem orderDetailItem) {
private List<PayMethod> getPayMethodList(List<OrderDetailItem.OrderPayBean> orderPays) {
List<PayMethod> payMethodList = new ArrayList<>();
PayMethod payMethod = new PayMethod();
payMethod.setPayName(orderDetailItem.getPayName());
payMethod.setPayMoney(orderDetailItem.getAmount());
payMethodList.add(payMethod);
if (orderDetailItem.getTipsPrice() != 0) {
//打印添加找零或貼士行
String linePayType = orderDetailItem.getLinePayType() == 1 ? "找零" : "貼士";
PayMethod payMethod2 = new PayMethod();
//這裡打印退一格
payMethod2.setPayName(" " + linePayType);
payMethod2.setPayMoney(orderDetailItem.getTipsPrice());
payMethodList.add(payMethod2);
if (orderPays != null) {
for (OrderDetailItem.OrderPayBean orderPayBean : orderPays) {
PayMethod payMethod = new PayMethod();
payMethod.setPayName(orderPayBean.getPayName());
payMethod.setPayMoney(orderPayBean.getAmount());
payMethodList.add(payMethod);
if (orderPayBean.getTipsPrice() != 0) {
//打印添加找零或貼士行
String linePayType = orderPayBean.getLinePayType() == 1 ? "找零" : "貼士";
PayMethod payMethod2 = new PayMethod();
//這裡打印退一格
payMethod2.setPayName(" " + linePayType);
payMethod2.setPayMoney(orderPayBean.getTipsPrice());
payMethodList.add(payMethod2);
}
}
}
return payMethodList;
}
/**
* 獲取賬單折扣列
*
* @param orderDetailItem
* @param totalMoney
* @return
......@@ -294,6 +299,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
/**
* 獲取賬單小數列
*
* @param orderDetailItem
* @return
*/
......@@ -306,6 +312,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
/**
* 获取服務費
*
* @param orderDetailItem
* @return
*/
......@@ -401,7 +408,10 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
*/
private void startPrintOrder(OrderDetailItem orderDetailItem, List<OrderDetail> orderDetailList) {
MyOrderManage.getInstance().setOrderFoodList(orderDetailList);
MyOrderManage.getInstance().setOrderMoneyList(getOrderMoneyList());
MyOrderManage.getInstance().setOrderId(orderDetailItem.getId());
MyOrderManage.getInstance().setWholeAmount(getTotalMoney());
MyOrderManage.getInstance().setTotalAmount(orderDetailItem.getTotalAmount());
OpenTableManage.getDefault().setPeopleNumber(orderDetailItem.getPerson());
TableBean.DataBean dataBean = new TableBean.DataBean();
......@@ -409,6 +419,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
OpenTableManage.getDefault().setTableBean(dataBean);
CC.obtainBuilder("Component.Print")
.setActionName("printActivity")
.addParam(PrintConstans.PRINT_TYPE, 2)
......@@ -422,6 +433,19 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
});
}
private List<BillOrderMoney> getOrderMoneyList() {
List<BillOrderMoney> billOrderMoneyList = new ArrayList<>();
if(mOrderCenterMoneyList != null){
for (SectionTextItem3 item: mOrderCenterMoneyList) {
BillOrderMoney billOrderMoney = new BillOrderMoney();
billOrderMoney.setTitle(item.getLeftText());
billOrderMoney.setMoney(Double.parseDouble(item.getRightText()));
billOrderMoneyList.add(billOrderMoney);
}
}
return billOrderMoneyList;
}
private void showCancelDialog() {
QMUIDialog.MessageDialogBuilder dialogBuilder = new QMUIDialog.MessageDialogBuilder(this);
dialogBuilder.setTitle("溫馨提示");
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/FineItemOneAdapter.java
......@@ -44,7 +44,6 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
//所有沽清类型
private List<SoldoutCtrFood> mCurrentSlodoutFoodList_Full = new ArrayList<>();
// private List<Color.DatasBean> mColorList;
private int mOrderNumberShowSize;
private int mOrderNumberFontSize;
private int mModFontSize;
......@@ -233,7 +232,7 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
// tv_soldout.setMaxHeight(mOrderNumberShowSize);
// tv_soldout.setMinHeight(mOrderNumberShowSize);
tv_soldout.setTextSize(mOrderNumberFontSize);
tv_soldout.setTextColor(Color.parseColor("#FFFFFF"));
// tv_soldout.setTextColor(Color.parseColor("#FFFFFF"));
tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
// tv_soldout.setMinWidth(20);
// tv_soldout.setTextSize(10);
......@@ -249,12 +248,6 @@ public class FineItemOneAdapter extends DefaultAdapter<Modifier> {
if (TextUtils.isEmpty(qty)) {
tv_soldout.setVisibility(View.INVISIBLE);
} else {
// if (qty.equalsIgnoreCase("售罄")) {
// iv_qtySold.setVisibility(View.VISIBLE);
// } else {
// tv_soldout.setVisibility(View.VISIBLE);
// tv_soldout.setText(qty);
// }
if (qty.equalsIgnoreCase("售罄") || qty.equalsIgnoreCase("暫停") ) {
blv_soldout.setLableText(qty);
blv_soldout.setVisibility(View.VISIBLE);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/FineItemTwoAdapter.java
......@@ -262,7 +262,7 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> {
// tv_soldout.setMaxHeight(mOrderNumberShowSize);
// tv_soldout.setMinHeight(mOrderNumberShowSize);
tv_soldout.setTextSize(mOrderNumberFontSize);
tv_soldout.setTextColor(Color.parseColor("#FFFFFF"));
// tv_soldout.setTextColor(Color.parseColor("#FFFFFF"));
tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
// tv_soldout.setMinWidth(20);
// tv_soldout.setTextSize(10);
......@@ -287,12 +287,6 @@ public class FineItemTwoAdapter extends DefaultAdapter<Modifier> {
if (TextUtils.isEmpty(qty)) {
tv_soldout.setVisibility(View.INVISIBLE);
} else {
// if (qty.equalsIgnoreCase("售罄")) {
//// iv_qtySold.setVisibility(View.VISIBLE);
//// } else {
//// tv_soldout.setVisibility(View.VISIBLE);
//// tv_soldout.setText(qty);
//// }
if (qty.equalsIgnoreCase("售罄") || qty.equalsIgnoreCase("暫停") ) {
blv_soldout.setLableText(qty);
blv_soldout.setVisibility(View.VISIBLE);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/OrderCenterAdapter.java
......@@ -104,7 +104,7 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderDetailItem> {
if (!TextUtils.isEmpty(item.getEndTime())) {
tv_pay_time.setText(payTable + TimeUtil.getStringByFormat(new Date(item.getEndTime()), TimeUtil.dateFormatYMDHM));
}
tv_pay_money.setText(amount + item.getAmount());
tv_pay_money.setText(amount + item.getTotalAmount());
setOrderStatus(item,position);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ComboAdapter.java
......@@ -230,12 +230,6 @@ public class ComboAdapter extends DefaultAdapter<ComboItem> {
if (TextUtils.isEmpty(qty)) {
tv_soldout.setVisibility(View.INVISIBLE);
} else {
// if (qty.equalsIgnoreCase("售罄")) {
// iv_qty_sold.setVisibility(View.VISIBLE);
// } else {
// tv_soldout.setVisibility(View.VISIBLE);
// tv_soldout.setText(qty);
// }
if (qty.equalsIgnoreCase("售罄") || qty.equalsIgnoreCase("暫停") ) {
blv_soldout.setLableText(qty);
blv_soldout.setVisibility(View.VISIBLE);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/ModifierAdapter.java
......@@ -157,8 +157,8 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
// tv_soldout.setText(datasBean.getCurrentMaxNumber());
// }
tv_soldout.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.meal_shape_remaining_number_bg));
tv_soldout.setMaxHeight(OrderNumberChildShowSize);
tv_soldout.setMinHeight(OrderNumberChildShowSize);
// tv_soldout.setMaxHeight(OrderNumberChildShowSize);
// tv_soldout.setMinHeight(OrderNumberChildShowSize);
tv_soldout.setTextSize(OrderNumberChildFontSize);
tv_soldout.setVisibility(View.INVISIBLE);
......@@ -169,12 +169,6 @@ public class ModifierAdapter extends DefaultAdapter<Modifier> {
if (TextUtils.isEmpty(qty)) {
tv_soldout.setVisibility(View.INVISIBLE);
} else {
// if (qty.equalsIgnoreCase("售罄")) {
// iv_qty_sold.setVisibility(View.VISIBLE);
// } else {
// tv_soldout.setVisibility(View.VISIBLE);
// tv_soldout.setText(qty);
// }
if (qty.equalsIgnoreCase("售罄") || qty.equalsIgnoreCase("暫停") ) {
blv_soldout.setLableText(qty);
blv_soldout.setVisibility(View.VISIBLE);
......
table-module/src/main/res/layout/meal_item_combo.xml
......@@ -26,8 +26,14 @@
android:layout_gravity="right"
android:background="@drawable/meal_shape_remaining_number_bg"
android:visibility="invisible"
android:drawablePadding="@dimen/dp_1"
android:paddingTop="@dimen/dp_1"
android:paddingBottom="@dimen/dp_1"
android:paddingLeft="@dimen/dp_1"
android:paddingRight="@dimen/dp_6"
android:text="sold"
android:textAppearance="?android:attr/textAppearanceSmall" />
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/theme_white_color"/>
<com.gingersoft.gsa.cloud.ui.view.BeveLabelView
android:id="@+id/blv_soldout"
......
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