Skip to content

S
supplier
Commit 679817da by jason
Options

菜品组数据获取

parent 2cd106f2
Showing with 139 additions and 33 deletions
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/DishesInfo.java 0 → 100644
package com.gingersoft.supply_chain.mvp.bean;
import lombok.Data;
@Data
public class DishesInfo {
private int id;
private int parentId;
private int restaurantId;
private boolean isParent;
private int seqNo;
private String foodName;
private boolean autoMod;
private int lunchboxPrice;
private boolean serviceCharge;
private int invisible;
private int riceponInvisible;
private int cost;
private String startDate;
private String endDate;
private int totalSold;
private int isSold;
private String createBy;
private String createTime;
private String updateBy;
private String updateTime;
private int periodId;
private String posFId;
private int ablediscount;
private int takeaway;
private int limitAmount;
private int limitType;
private String foodSummary;
private String foodName1;
private String foodName2;
private int printTo;
private int printToBill;
private int conditions;
private int isRt;
private int deletes;
private String periodName1;
private String startDateStr;
private String endDateStr;
private double price;
private int marketPrice;
private int blueEdit;
private int cartEdit;
private int autoMerge;
private String foodDesc;
private String imageUrl;
private int colorId;
private int deptId;
private int approve;
private int printFont;
private int advPrice;
private int pointsAdd;
private int pointsRatio;
private int pointsRedeem;
private int ktPrintMainItem;
private int ktShowPrice;
private int toPax;
private int foodType;
private int majorMainId;
private int isTimingFood;
private int minLongTime;
private int unitTime;
private int unitPrice;
private int freeLongTime;
private String fId;
private String plu;
private String printseting;
private int isPrintQueueCode;
private int queueHeadId;
private String imgUrlSmall;
private String freePeriodBegin;
private int agreementType;
}
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/DishesResultBean.java 0 → 100644
package com.gingersoft.supply_chain.mvp.bean;
import java.util.List;
import lombok.Data;
@Data
public class DishesResultBean {
private boolean success;
private long sysTime;
private String errMsg;
private DataBean data;
@Data
public static class DataBean {
private int count;
private List<DishesInfo> list;
}
}
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/contract/OtherFunctionContract.java
...@@ -2,6 +2,7 @@ package com.gingersoft.supply_chain.mvp.contract; ...@@ -2,6 +2,7 @@ package com.gingersoft.supply_chain.mvp.contract;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.supply_chain.mvp.bean.BuyIngredientsBean; import com.gingersoft.supply_chain.mvp.bean.BuyIngredientsBean;
import com.gingersoft.supply_chain.mvp.bean.DishesResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean; import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean;
...@@ -68,7 +69,7 @@ public interface OtherFunctionContract { ...@@ -68,7 +69,7 @@ public interface OtherFunctionContract {
Observable<OrderCategoryBean> getCategoryTrees(Map<String, Object> map); Observable<OrderCategoryBean> getCategoryTrees(Map<String, Object> map);
Observable<FoodByCategoryResultBean> getFoodList(Map<String, Object> map); Observable<DishesResultBean> getFoodList(Map<String, Object> map);
// Observable<FoodByCategoryResultBean> getFoodByCategory(Map<String, Object> map); // Observable<FoodByCategoryResultBean> getFoodByCategory(Map<String, Object> map);
} }
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/model/OtherFunctionModel.java
...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.model; ...@@ -3,6 +3,7 @@ package com.gingersoft.supply_chain.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.supply_chain.mvp.bean.DishesResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean; import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean;
...@@ -68,7 +69,7 @@ public class OtherFunctionModel extends BaseModel implements OtherFunctionContra ...@@ -68,7 +69,7 @@ public class OtherFunctionModel extends BaseModel implements OtherFunctionContra
} }
@Override @Override
public Observable<FoodByCategoryResultBean> getFoodList(Map<String, Object> map) { public Observable<DishesResultBean> getFoodList(Map<String, Object> map) {
return mRepositoryManager.obtainRetrofitService(SupplierServer.class).getFoodList(map); return mRepositoryManager.obtainRetrofitService(SupplierServer.class).getFoodList(map);
} }
} }
\ No newline at end of file
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/OtherFunctionPresenter.java
...@@ -11,6 +11,8 @@ import com.gingersoft.gsa.cloud.common.utils.JsonUtils; ...@@ -11,6 +11,8 @@ import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.log.LogUtil; import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.BuyIngredientsBean; import com.gingersoft.supply_chain.mvp.bean.BuyIngredientsBean;
import com.gingersoft.supply_chain.mvp.bean.DishesInfo;
import com.gingersoft.supply_chain.mvp.bean.DishesResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean; import com.gingersoft.supply_chain.mvp.bean.OrderCategoryBean;
...@@ -179,13 +181,13 @@ public class OtherFunctionPresenter extends BasePresenter<OtherFunctionContract. ...@@ -179,13 +181,13 @@ public class OtherFunctionPresenter extends BasePresenter<OtherFunctionContract.
*/ */
public void getFoodByCategory(int position, OrderCategoryBean.FoodCategoryTrees categoryTrees, boolean addToHead, boolean isReset) { public void getFoodByCategory(int position, OrderCategoryBean.FoodCategoryTrees categoryTrees, boolean addToHead, boolean isReset) {
//先看看這個分類的食材有沒有緩存，沒有緩衝再加載 //先看看這個分類的食材有沒有緩存，沒有緩衝再加載
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(1);
map.put("pageSize", 1000); // map.put("pageSize", 1000);
map.put("pageIndex", 0); // map.put("pageIndex", 0);
AppConstant.addBrandId(map); // AppConstant.addBrandId(map);
AppConstant.addRestaurantId(map); AppConstant.addRestaurantId(map);
map.put("parentId",""); // map.put("parentId","");
map.put("isParent", "0"); // map.put("isParent", "0");
mModel.getFoodList(map) mModel.getFoodList(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
...@@ -195,24 +197,32 @@ public class OtherFunctionPresenter extends BasePresenter<OtherFunctionContract. ...@@ -195,24 +197,32 @@ public class OtherFunctionPresenter extends BasePresenter<OtherFunctionContract.
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterNext(dis -> mRootView.hideLoading()) .doAfterNext(dis -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<FoodByCategoryResultBean>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<DishesResultBean>(mErrorHandler) {
@Override @Override
public void onNext(@NonNull FoodByCategoryResultBean info) { public void onNext(@NonNull DishesResultBean info) {
if (info.isSuccess()) { if (info.isSuccess()) {
//拿到所有食品 //拿到所有的 菜品组 和菜品信息
List<PurchaseFoodBean> foodBeans = info.getData(); DishesResultBean.DataBean data = info.getData();
//初始化分類和食品的顯示集合 if (data != null) {
List<BuyIngredientsBean> buyIngredientsBeans = new ArrayList<>(); List<DishesInfo> list= data.getList();
conversionShowInfo(foodBeans, categoryTrees, buyIngredientsBeans, 0); LogUtil.d("zjs"," list="+list.size());
//將數據插入緩衝中 LogUtil.d("zjs"," data="+data.getCount());
categoryFoods.set(position, buyIngredientsBeans); for (int i = 0; i < list.size(); i++) {
if (addToHead) { LogUtil.d("zjs"," d="+list.get(i).toString());
showFoods.addAll(0, buyIngredientsBeans); }
} else {
showFoods.addAll(buyIngredientsBeans);
} }
mRootView.loadFood(buyIngredientsBeans, addToHead, isReset); //初始化分類和食品的顯示集合
// List<BuyIngredientsBean> buyIngredientsBeans = new ArrayList<>();
// conversionShowInfo(foodBeans, categoryTrees, buyIngredientsBeans, 0);
// //將數據插入緩衝中
// categoryFoods.set(position, buyIngredientsBeans);
// if (addToHead) {
// showFoods.addAll(0, buyIngredientsBeans);
// } else {
// showFoods.addAll(buyIngredientsBeans);
// }
// mRootView.loadFood(buyIngredientsBeans, addToHead, isReset);
} else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) { } else if (TextUtil.isNotEmptyOrNullOrUndefined(info.getErrMsg())) {
mRootView.showMessage(info.getErrMsg()); mRootView.showMessage(info.getErrMsg());
mRootView.loadFail(); mRootView.loadFail();
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/server/SupplierServer.java
package com.gingersoft.supply_chain.mvp.server; package com.gingersoft.supply_chain.mvp.server;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.supply_chain.mvp.bean.DishesResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodByCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean; import com.gingersoft.supply_chain.mvp.bean.FoodListInfoBean;
...@@ -546,18 +547,13 @@ public interface SupplierServer { ...@@ -546,18 +547,13 @@ public interface SupplierServer {
/** /**
* 查询菜品 * 查询菜品
* https://hktest.ricepon.com:64377/ricepon-restaurant/api/admin/food/getFood? * http://a.ricepon.com:58201/ricepon-purchase/api/
* pageSize=10&pageIndex=0&restaurantId=441&parentId=&brandId=1&isParent=0 * purchaseDishesConversion/getPurchaseDishesConversionDishes?
* pageSize: 10 * parentId=9615&restaurantId=25
* pageIndex: 0
* restaurantId: 441
* parentId:
* brandId: 1
* isParent: 0 * isParent: 0
* admin/food/getFood?
*/ */
@Headers({"Domain-Name: ricepon_restaurant"}) @Headers({"Domain-Name: ricepon-purchase"})
@GET("admin/food/getFood" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("purchaseDishesConversion/getPurchaseDishesConversionDishes" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<FoodByCategoryResultBean> getFoodList(@QueryMap Map<String, Object> map); Observable<DishesResultBean> getFoodList(@QueryMap Map<String, Object> map);
} }
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