Skip to content

S
supplier
Commit f4ee4cd0 by 宁斌
Options

1、餐檯模式餐種過濾

parent 5064a31b
Showing with 65 additions and 16 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/database/utils/ComboItemDaoUtils.java
...@@ -157,12 +157,17 @@ public class ComboItemDaoUtils { ...@@ -157,12 +157,17 @@ public class ComboItemDaoUtils {
return mManager.getDaoSession().queryRaw(ComboItem.class, sql, conditions); return mManager.getDaoSession().queryRaw(ComboItem.class, sql, conditions);
} }
public ArrayList<ComboItem> queryComboItemsByFidQueryBuilder(long fid) { public ArrayList<ComboItem> queryComboItemsByFidQueryBuilder(long fid, Integer foodSummary) {
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;
String sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.FOOD_SUMMARY,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 (foodSummary != null) {
// sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.FOOD_SUMMARY,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 and where FOOD_SUMMARY LIKE %s join FOOD_COMBO r on r.COM_ID=c.COM_ID and r.DELETES!=1";
// sql = String.format(sql, foodSummary);
// } else {
sql = "SELECT c.*,f.FOOD_NAME,f.FOOD_NAME1,f.FOOD_NAME2,f.PRICE,f.FOOD_SUMMARY,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 + "'";
......
base-module/src/main/java/com/gingersoft/gsa/cloud/database/utils/FoodDaoUtils.java
...@@ -182,7 +182,7 @@ public class FoodDaoUtils { ...@@ -182,7 +182,7 @@ public class FoodDaoUtils {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
return queryBuilder.where(queryBuilder.and( return queryBuilder.where(queryBuilder.and(
FoodDao.Properties.ParentId.eq(0), FoodDao.Properties.ParentId.eq(0),
FoodDao.Properties.FoodSummary.like("%"+foodSummary+"%"), // FoodDao.Properties.FoodSummary.like("%"+foodSummary+"%"),
FoodDao.Properties.StartDate.le(currentTime), FoodDao.Properties.StartDate.le(currentTime),
FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list(); FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list();
} }
...@@ -212,7 +212,7 @@ public class FoodDaoUtils { ...@@ -212,7 +212,7 @@ public class FoodDaoUtils {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
return queryBuilder.where(queryBuilder.and( return queryBuilder.where(queryBuilder.and(
FoodDao.Properties.ParentId.eq(parentId), FoodDao.Properties.ParentId.eq(parentId),
FoodDao.Properties.FoodSummary.like("%"+foodSummary+"%"), // FoodDao.Properties.FoodSummary.like("%"+foodSummary+"%"),
FoodDao.Properties.Invisible.notEq(1), FoodDao.Properties.Invisible.notEq(1),
FoodDao.Properties.StartDate.le(currentTime), FoodDao.Properties.StartDate.le(currentTime),
FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list(); FoodDao.Properties.EndDate.ge(currentTime))).orderAsc(FoodDao.Properties.SeqNo).list();
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/MealStandContract.java
...@@ -143,7 +143,7 @@ public interface MealStandContract { ...@@ -143,7 +143,7 @@ public interface MealStandContract {
List<Modifier> queryDB_ModifierList(long fid, int mode); List<Modifier> queryDB_ModifierList(long fid, int mode);
List<ComboItem> queryDB_ComboList(long fid); List<ComboItem> queryDB_ComboList(long fid, int foodSummary);
List<FoodCombo> isComboFood(long fid); List<FoodCombo> isComboFood(long fid);
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/FineItemOneselfModel.java
...@@ -58,7 +58,7 @@ public class FineItemOneselfModel extends BaseModel implements FineItemOneselfCo ...@@ -58,7 +58,7 @@ public class FineItemOneselfModel extends BaseModel implements FineItemOneselfCo
@Override @Override
public List<ComboItem> queryDB_ComboList(long fid) { public List<ComboItem> queryDB_ComboList(long fid) {
ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication); ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication);
List<ComboItem> foodCombo = comboItemDao.queryComboItemsByFidQueryBuilder(fid); List<ComboItem> foodCombo = comboItemDao.queryComboItemsByFidQueryBuilder(fid,null);
return foodCombo; return foodCombo;
} }
} }
\ No newline at end of file
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java
...@@ -27,6 +27,7 @@ import com.jess.arms.di.scope.ActivityScope; ...@@ -27,6 +27,7 @@ import com.jess.arms.di.scope.ActivityScope;
import com.jess.arms.integration.IRepositoryManager; import com.jess.arms.integration.IRepositoryManager;
import com.jess.arms.mvp.BaseModel; import com.jess.arms.mvp.BaseModel;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.inject.Inject; import javax.inject.Inject;
...@@ -67,15 +68,54 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model ...@@ -67,15 +68,54 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
this.mApplication = null; this.mApplication = null;
} }
private List<Food> foodConditionFilter(List<Food> foodList) { /**
* 過濾食品條件
* 1、過濾餐種
* @param foodList
* @param summary
* @return
*/
public List<Food> foodConditionFilter(List<Food> foodList, int summary) {
String strSummary = String.valueOf(summary);
List<Food> newFoodList = new ArrayList<>();
for (int i = foodList.size() - 1; i >= 0; i--) { for (int i = foodList.size() - 1; i >= 0; i--) {
Food food = foodList.get(i); Food food = foodList.get(i);
String foodSummary = food.getFoodSummary(); String foodSummary = food.getFoodSummary();
if (!TextUtils.isEmpty(foodSummary)) { if (!TextUtils.isEmpty(foodSummary)) {
foodSummary.split(","); String[] summarys = foodSummary.split(",");
for (String item : summarys) {
if (item.equals(strSummary)) {
newFoodList.add(food);
}
}
} }
} }
return foodList; return newFoodList;
}
/**
* 過濾套餐食品條件
* 1、過濾餐種
* @param comboItemList
* @param summary
* @return
*/
public List<ComboItem> comboConditionFilter(List<ComboItem> comboItemList, int summary) {
String strSummary = String.valueOf(summary);
List<ComboItem> newComboItemList = new ArrayList<>();
for (int i = comboItemList.size() - 1; i >= 0; i--) {
ComboItem comboItem = comboItemList.get(i);
String foodSummary = comboItem.getFoodSummary();
if (!TextUtils.isEmpty(foodSummary)) {
String[] summarys = foodSummary.split(",");
for (String item : summarys) {
if (item.equals(strSummary)) {
newComboItemList.add(comboItem);
}
}
}
}
return newComboItemList;
} }
@Override @Override
...@@ -89,14 +129,16 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model ...@@ -89,14 +129,16 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
public List<Food> queryDB_FoodGroupList(int foodSummary) { public List<Food> queryDB_FoodGroupList(int foodSummary) {
FoodDaoUtils foodDaoUtils = new FoodDaoUtils(mApplication); FoodDaoUtils foodDaoUtils = new FoodDaoUtils(mApplication);
List<Food> foods = foodDaoUtils.queryFoodGroupByQueryBuilder(foodSummary); List<Food> foods = foodDaoUtils.queryFoodGroupByQueryBuilder(foodSummary);
return foods; // return foods;
return foodConditionFilter(foods,foodSummary);
} }
@Override @Override
public List<Food> queryDB_FoodList(long parentId, int foodSummary) { public List<Food> queryDB_FoodList(long parentId, int foodSummary) {
FoodDaoUtils foodDaoUtils = new FoodDaoUtils(mApplication); FoodDaoUtils foodDaoUtils = new FoodDaoUtils(mApplication);
List<Food> foods = foodDaoUtils.queryFoodByQueryBuilder(parentId, foodSummary); List<Food> foods = foodDaoUtils.queryFoodByQueryBuilder(parentId, foodSummary);
return foods; // return foods;
return foodConditionFilter(foods,foodSummary);
} }
...@@ -107,10 +149,11 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model ...@@ -107,10 +149,11 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
} }
@Override @Override
public List<ComboItem> queryDB_ComboList(long fid) { public List<ComboItem> queryDB_ComboList(long fid, int foodSummary) {
ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication); ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication);
List<ComboItem> foodCombo = comboItemDao.queryComboItemsByFidQueryBuilder(fid); List<ComboItem> foodCombos = comboItemDao.queryComboItemsByFidQueryBuilder(fid, foodSummary);
return foodCombo; // return foodCombos;
return comboConditionFilter(foodCombos,foodSummary);
} }
@Override @Override
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -467,7 +467,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -467,7 +467,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
List<ComboItem> comboItemList = new ArrayList<>(); List<ComboItem> comboItemList = new ArrayList<>();
if (itemType == 1) { if (itemType == 1) {
//获取套餐细项数据 //获取套餐细项数据
List<ComboItem> comboItems = mModel.queryDB_ComboList(fid); List<ComboItem> comboItems = mModel.queryDB_ComboList(fid,orderType);
comboItemList.addAll(comboItems); comboItemList.addAll(comboItems);
} }
List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All); List<Modifier> modifierList = mModel.queryDB_ModifierList(fid, ModifierDaoUtils.modifierMode_All);
......
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