1.1.0正式版

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/MealStandModel.java

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 
 
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
+import com.gingersoft.gsa.cloud.base.utils.CollectionUtils;
 import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
 import com.gingersoft.gsa.cloud.database.bean.FoodCombo;
@@ -28,11 +29,15 @@ 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.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.List;
 
 
 import javax.inject.Inject;
 import javax.inject.Inject;
 
 
 import io.reactivex.Observable;
 import io.reactivex.Observable;
+import io.reactivex.SingleObserver;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Function;
 import io.reactivex.functions.Function;
 import okhttp3.RequestBody;
 import okhttp3.RequestBody;
 
 
@@ -71,15 +76,15 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
     /**
     /**
      * 過濾食品條件
      * 過濾食品條件
      * 1、過濾餐種
      * 1、過濾餐種
+     *
      * @param foodList
      * @param foodList
      * @param summary
      * @param summary
      * @return
      * @return
      */
      */
     public List<Food> foodConditionFilter(List<Food> foodList, int summary) {
     public List<Food> foodConditionFilter(List<Food> foodList, int summary) {
-       String strSummary  = String.valueOf(summary);
+        String strSummary = String.valueOf(summary);
         List<Food> newFoodList = new ArrayList<>();
         List<Food> newFoodList = new ArrayList<>();
-        for (int i = foodList.size() - 1; i >= 0; i--) {
-            Food food = foodList.get(i);
+        for (Food food : foodList) {
             String foodSummary = food.getFoodSummary();
             String foodSummary = food.getFoodSummary();
             if (!TextUtils.isEmpty(foodSummary)) {
             if (!TextUtils.isEmpty(foodSummary)) {
                 String[] summarys = foodSummary.split(",");
                 String[] summarys = foodSummary.split(",");
@@ -96,15 +101,15 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
     /**
     /**
      * 過濾套餐食品條件
      * 過濾套餐食品條件
      * 1、過濾餐種
      * 1、過濾餐種
+     *
      * @param comboItemList
      * @param comboItemList
      * @param summary
      * @param summary
      * @return
      * @return
      */
      */
     public List<ComboItem> comboConditionFilter(List<ComboItem> comboItemList, int summary) {
     public List<ComboItem> comboConditionFilter(List<ComboItem> comboItemList, int summary) {
-        String strSummary  = String.valueOf(summary);
+        String strSummary = String.valueOf(summary);
         List<ComboItem> newComboItemList = new ArrayList<>();
         List<ComboItem> newComboItemList = new ArrayList<>();
-        for (int i = comboItemList.size() - 1; i >= 0; i--) {
-            ComboItem comboItem = comboItemList.get(i);
+        for (ComboItem comboItem : comboItemList) {
             String foodSummary = comboItem.getFoodSummary();
             String foodSummary = comboItem.getFoodSummary();
             if (!TextUtils.isEmpty(foodSummary)) {
             if (!TextUtils.isEmpty(foodSummary)) {
                 String[] summarys = foodSummary.split(",");
                 String[] summarys = foodSummary.split(",");
@@ -130,7 +135,7 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
         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);
+        return foodConditionFilter(foods, foodSummary);
     }
     }
 
 
     @Override
     @Override
@@ -138,7 +143,7 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
         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);
+        return foodConditionFilter(foods, foodSummary);
     }
     }
 
 
 
 
@@ -153,7 +158,7 @@ public class MealStandModel extends BaseModel implements MealStandContract.Model
         ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication);
         ComboItemDaoUtils comboItemDao = new ComboItemDaoUtils(mApplication);
         List<ComboItem> foodCombos = comboItemDao.queryComboItemsByFidQueryBuilder(fid, foodSummary);
         List<ComboItem> foodCombos = comboItemDao.queryComboItemsByFidQueryBuilder(fid, foodSummary);
 //        return foodCombos;
 //        return foodCombos;
-        return comboConditionFilter(foodCombos,foodSummary);
+        return comboConditionFilter(foodCombos, foodSummary);
     }
     }
 
 
     @Override
     @Override

table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

@@ -170,6 +170,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
 
 
             Food defalutFoodGroup = getDefalutFoodGroup(mFoodGroupList);
             Food defalutFoodGroup = getDefalutFoodGroup(mFoodGroupList);
             if (defalutFoodGroup != null) {
             if (defalutFoodGroup != null) {
+
                 //默認選中第一組
                 //默認選中第一組
                 defalutFoodGroup.setSelected(true);
                 defalutFoodGroup.setSelected(true);
             }
             }