菜品消耗 api 加入 代码同步

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/contract/OtherFunctionContract.java

@@ -68,6 +68,7 @@ public interface OtherFunctionContract {
 
         Observable<OrderCategoryBean> getCategoryTrees(Map<String, Object> map);
 
-        Observable<FoodByCategoryResultBean> getFoodByCategory(Map<String, Object> map);
+        Observable<FoodByCategoryResultBean> getFoodList(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

@@ -68,7 +68,7 @@ public class OtherFunctionModel extends BaseModel implements OtherFunctionContra
     }
 
     @Override
-    public Observable<FoodByCategoryResultBean> getFoodByCategory(Map<String, Object> map) {
-        return mRepositoryManager.obtainRetrofitService(SupplierServer.class).getFoodByCategory(map);
+    public Observable<FoodByCategoryResultBean> getFoodList(Map<String, Object> 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

@@ -42,7 +42,7 @@ import java.util.Map;
 /**
  * ================================================
  * Created by zjs on 07/07/2021 21:11
- * Description
+ * Description 菜品食材消耗
  * ================================================
  */
 @FragmentScope
@@ -184,8 +184,9 @@ public class OtherFunctionPresenter extends BasePresenter<OtherFunctionContract.
         map.put("pageIndex", 0);
         AppConstant.addBrandId(map);
         AppConstant.addRestaurantId(map);
-        map.put("parentId", categoryTrees.getId());
-        mModel.getFoodByCategory(map)
+        map.put("parentId","");
+        map.put("isParent", "0");
+        mModel.getFoodList(map)
                 .subscribeOn(Schedulers.io())
                 .doOnSubscribe(disposable -> {
 //                    mRootView.showLoading(Constant.GET_INFO_LOADING)

component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/server/SupplierServer.java

@@ -543,4 +543,21 @@ public interface SupplierServer {
     @GET("purchaseWarehousingOrder/details/getFoodNoInventoryDetails" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
     Observable<BaseResult> getFoodInOutBoundRecordDetails(@QueryMap Map<String, Object> map);
 
+
+    /**
+     * 查询菜品
+     * https://hktest.ricepon.com:64377/ricepon-restaurant/api/admin/food/getFood?
+     * pageSize=10&pageIndex=0&restaurantId=441&parentId=&brandId=1&isParent=0
+     * pageSize: 10
+     * pageIndex: 0
+     * restaurantId: 441
+     * parentId:
+     * brandId: 1
+     * isParent: 0
+     * admin/food/getFood?
+     */
+    @Headers({"Domain-Name: ricepon_restaurant"})
+    @GET("admin/food/getFood" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
+    Observable<FoodByCategoryResultBean> getFoodList(@QueryMap Map<String, Object> map);
+
 }