Skip to content

S
supplier
Commit 0cb22cb8 by 宁斌
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 367cd0b3 36307038
Showing with 732 additions and 522 deletions
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/ColdChainMainPresenter.java
...@@ -12,7 +12,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; ...@@ -12,7 +12,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateRestaurantStateBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateRestaurantStateBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
...@@ -132,7 +132,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract. ...@@ -132,7 +132,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
} }
public void getBalance() { public void getBalance() {
mModel.getBalance(ResturantInfoManager.newInstance().getBrandId() + "") mModel.getBalance(RestaurantInfoManager.newInstance().getBrandId() + "")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
}) })
...@@ -182,7 +182,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract. ...@@ -182,7 +182,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
public void updateExpandInfo(String settingName, String[] valueType, String[] value) { public void updateExpandInfo(String settingName, String[] valueType, String[] value) {
FormBody.Builder builder = new FormBody.Builder() FormBody.Builder builder = new FormBody.Builder()
.add("id", RestaurantExpandInfoUtils.getId(settingName) + "") .add("id", RestaurantExpandInfoUtils.getId(settingName) + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("settingName", settingName); .add("settingName", settingName);
for (int i = 0; i < valueType.length; i++) { for (int i = 0; i < valueType.length; i++) {
builder.add(valueType[i], value[i]); builder.add(valueType[i], value[i]);
...@@ -306,7 +306,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract. ...@@ -306,7 +306,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
thirdDelivery(info.getData().get(0)); thirdDelivery(info.getData().get(0));
} else { } else {
if (errorCount < maxErrorCount) { if (errorCount < maxErrorCount) {
startToBeConfirmedOrderList(ResturantInfoManager.newInstance().getRestaurantId()); startToBeConfirmedOrderList(RestaurantInfoManager.newInstance().getRestaurantId());
errorCount++; errorCount++;
} }
} }
...@@ -416,7 +416,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract. ...@@ -416,7 +416,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
findOrderDetails(ids.get(0)); findOrderDetails(ids.get(0));
ids.remove(0); ids.remove(0);
} else { } else {
startToBeConfirmedOrderList(ResturantInfoManager.newInstance().getRestaurantId()); startToBeConfirmedOrderList(RestaurantInfoManager.newInstance().getRestaurantId());
} }
} }
}); });
...@@ -443,7 +443,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract. ...@@ -443,7 +443,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
} }
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "") .add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString()) .add("orderDetailsIds", ids.toString())
.build(); .build();
mModel.addPrj(requestBody); mModel.addPrj(requestBody);
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderDetailsPresenter.java
...@@ -11,7 +11,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; ...@@ -11,7 +11,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.FileUtils; import com.gingersoft.gsa.cloud.common.utils.FileUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
...@@ -281,7 +281,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -281,7 +281,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
} }
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "") .add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString()) .add("orderDetailsIds", ids.toString())
.build(); .build();
mModel.addPrj(requestBody); mModel.addPrj(requestBody);
...@@ -410,7 +410,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -410,7 +410,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
public void cancelLogistics(int orderId, boolean isCancelOrder) { public void cancelLogistics(int orderId, boolean isCancelOrder) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderId", orderId + "") .add("orderId", orderId + "")
.add("reasonId", "") .add("reasonId", "")
.add("reasonDesc", "") .add("reasonDesc", "")
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/OrderListPresenter.java
...@@ -8,7 +8,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList; ...@@ -8,7 +8,7 @@ import com.gingersoft.coldchain_module.mvp.model.bean.OrderList;
import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean; import com.gingersoft.coldchain_module.mvp.model.bean.ShipAnyOrdersNewBean;
import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem; import com.gingersoft.coldchain_module.mvp.model.bean.ThirdItem;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean; import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -314,7 +314,7 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O ...@@ -314,7 +314,7 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
} }
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "") .add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString()) .add("orderDetailsIds", ids.toString())
.build(); .build();
mModel.addPrj(requestBody); mModel.addPrj(requestBody);
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/SupplementOrderPresenter.java
...@@ -6,7 +6,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants; ...@@ -6,7 +6,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants;
import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract; import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementResultBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementResultBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -126,7 +126,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr ...@@ -126,7 +126,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr
JSONObject json; JSONObject json;
json = new JSONObject(); json = new JSONObject();
try { try {
json.put("shopId", ResturantInfoManager.newInstance().getRestaurantId()); json.put("shopId", RestaurantInfoManager.newInstance().getRestaurantId());
json.put("phone", phone); json.put("phone", phone);
json.put("replenishmentType", "1"); json.put("replenishmentType", "1");
json.put("transportationType", "3"); json.put("transportationType", "3");
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/ColdChainMainActivity.java
...@@ -38,7 +38,7 @@ import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment; ...@@ -38,7 +38,7 @@ import com.gingersoft.coldchain_module.mvp.ui.fragment.OrderListFragment;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans; import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.service.GetInfoUpdateService; import com.gingersoft.gsa.cloud.common.service.GetInfoUpdateService;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -144,7 +144,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre ...@@ -144,7 +144,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.getBalance(); mPresenter.getBalance();
restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
fragments = new ArrayList<>(); fragments = new ArrayList<>();
List<String> titles = Arrays.asList("全部", "待確認", "待提交", "派送中"); List<String> titles = Arrays.asList("全部", "待確認", "待提交", "派送中");
for (int i = 0; i < titles.size(); i++) { for (int i = 0; i < titles.size(); i++) {
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/SupplementOrderActivity.java
...@@ -15,7 +15,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants; ...@@ -15,7 +15,7 @@ import com.gingersoft.coldchain_module.mvp.constans.ColdChainConstants;
import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract; import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean; import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
import com.gingersoft.coldchain_module.mvp.presenter.SupplementOrderPresenter; import com.gingersoft.coldchain_module.mvp.presenter.SupplementOrderPresenter;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
...@@ -68,7 +68,7 @@ public class SupplementOrderActivity extends BaseActivity<SupplementOrderPresent ...@@ -68,7 +68,7 @@ public class SupplementOrderActivity extends BaseActivity<SupplementOrderPresent
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mPresenter.getNumByOrderType(restaurantId); mPresenter.getNumByOrderType(restaurantId);
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java
...@@ -24,7 +24,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderListPresenter; ...@@ -24,7 +24,7 @@ import com.gingersoft.coldchain_module.mvp.presenter.OrderListPresenter;
import com.gingersoft.coldchain_module.mvp.ui.activity.ColdChainMainActivity; import com.gingersoft.coldchain_module.mvp.ui.activity.ColdChainMainActivity;
import com.gingersoft.coldchain_module.mvp.ui.activity.OrderDetailsActivity; import com.gingersoft.coldchain_module.mvp.ui.activity.OrderDetailsActivity;
import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderListAdapter; import com.gingersoft.coldchain_module.mvp.ui.adapter.OrderListAdapter;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.jess.arms.base.BaseFragment; import com.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
...@@ -83,7 +83,7 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen ...@@ -83,7 +83,7 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mRefreshLayout.setPrimaryColorsId(android.R.color.transparent, android.R.color.black); mRefreshLayout.setPrimaryColorsId(android.R.color.transparent, android.R.color.black);
restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
Bundle arguments = getArguments(); Bundle arguments = getArguments();
if (arguments != null) { if (arguments != null) {
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/HistoryOrderViewModel.kt
...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData ...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.component.ComponentName import com.gingersoft.gsa.cloud.component.ComponentName
...@@ -36,7 +36,7 @@ class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepo ...@@ -36,7 +36,7 @@ class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepo
} else { } else {
orderNumber = orderNum orderNumber = orderNum
} }
historyOrderRepository.getHistoryOrderList(ResturantInfoManager.newInstance().getRestaurantId().toString(), status, startDate, endDate, pageIndex, "10", orderType, orderNumber, phone).apply { historyOrderRepository.getHistoryOrderList(RestaurantInfoManager.newInstance().getRestaurantId().toString(), status, startDate, endDate, pageIndex, "10", orderType, orderNumber, phone).apply {
this.data?.let { this.data?.let {
if (it.size > 0) { if (it.size > 0) {
it.removeAt(it.size - 1)//移除最後一個，最後一個是顯示總條數的 it.removeAt(it.size - 1)//移除最後一個，最後一個是顯示總條數的
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/model/viewModel/PageViewModel.kt
...@@ -20,7 +20,7 @@ import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails ...@@ -20,7 +20,7 @@ import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verificationAmount import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verificationAmount
import com.gingersoft.gsa.cloud.print.bean.adapter.PrintContentAdapter import com.gingersoft.gsa.cloud.print.bean.adapter.PrintContentAdapter
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.service.GetInfoUpdateService import com.gingersoft.gsa.cloud.common.service.GetInfoUpdateService
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils
...@@ -61,7 +61,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -61,7 +61,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
val ErrorCode = 1011//報錯提示 val ErrorCode = 1011//報錯提示
} }
val restaurantId by lazy { ResturantInfoManager.newInstance().getRestaurantId() } val restaurantId by lazy { RestaurantInfoManager.newInstance().getRestaurantId() }
var mOrderNum = arrayListOf<MutableLiveData<Int>>() var mOrderNum = arrayListOf<MutableLiveData<Int>>()
var mOrderList = arrayListOf<MutableLiveData<ArrayList<OrderList.DataBeanX.DataBean>>>() var mOrderList = arrayListOf<MutableLiveData<ArrayList<OrderList.DataBeanX.DataBean>>>()
...@@ -768,7 +768,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() { ...@@ -768,7 +768,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
*/ */
fun selectorDelivery(context: Context, dataBean: OrderDetails.DataBean, status: Int, listener: (Int, Boolean) -> Unit) { fun selectorDelivery(context: Context, dataBean: OrderDetails.DataBean, status: Int, listener: (Int, Boolean) -> Unit) {
launch({ launch({
repository.getDeliveryInfo(ResturantInfoManager.newInstance().getRestaurantId().toString(), UserContext.newInstance().getMemberId().toString()).apply { repository.getDeliveryInfo(RestaurantInfoManager.newInstance().getRestaurantId().toString(), UserContext.newInstance().getMemberId().toString()).apply {
deliveryBean = this deliveryBean = this
if (this.data.isEmpty()) { if (this.data.isEmpty()) {
ToastUtils.show(context, "沒有配置配送員信息") ToastUtils.show(context, "沒有配置配送員信息")
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/model/PrjQueryModel.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.delivery_pick_mode.mvp.bean.PrjQueryBean; import com.gingersoft.gsa.delivery_pick_mode.mvp.bean.PrjQueryBean;
import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.PrjQueryContract; import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.PrjQueryContract;
...@@ -52,7 +52,7 @@ public class PrjQueryModel extends BaseModel implements PrjQueryContract.Model { ...@@ -52,7 +52,7 @@ public class PrjQueryModel extends BaseModel implements PrjQueryContract.Model {
@Override @Override
public Observable<PrjQueryBean> getKitchenPrint(String orderId) { public Observable<PrjQueryBean> getKitchenPrint(String orderId) {
return mRepositoryManager.obtainRetrofitService(PrjQueryServer.class). return mRepositoryManager.obtainRetrofitService(PrjQueryServer.class).
getKitchenPrint(orderId, ResturantInfoManager.newInstance().getRestaurantId() + ""); getKitchenPrint(orderId, RestaurantInfoManager.newInstance().getRestaurantId() + "");
} }
@Override @Override
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
...@@ -5,7 +5,7 @@ import android.app.Application; ...@@ -5,7 +5,7 @@ import android.app.Application;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.order.order.TakeawayOrder; import com.gingersoft.gsa.cloud.order.order.TakeawayOrder;
...@@ -188,7 +188,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -188,7 +188,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
} }
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("orderId", orderId) .add("orderId", orderId)
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString()) .add("orderDetailsIds", ids.toString())
.build(); .build();
mModel.addPrj(requestBody) mModel.addPrj(requestBody)
...@@ -226,7 +226,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -226,7 +226,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
JSONObject json; JSONObject json;
json = new JSONObject(); json = new JSONObject();
try { try {
json.put("shopId", ResturantInfoManager.newInstance().getRestaurantId()); json.put("shopId", RestaurantInfoManager.newInstance().getRestaurantId());
json.put("phone", phone); json.put("phone", phone);
json.put("appointmentType", 0); json.put("appointmentType", 0);
json.put("transportationType", "0");//0 本店配送 ，是，1，Zeek，2，Lalamove json.put("transportationType", "0");//0 本店配送 ，是，1，Zeek，2，Lalamove
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
...@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer ...@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.billy.cc.core.component.CC import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils import com.gingersoft.gsa.cloud.common.utils.other.SPUtils
...@@ -57,7 +57,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen ...@@ -57,7 +57,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
private val pageViewModel by lazy { ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] } private val pageViewModel by lazy { ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] }
private val instance by lazy { this } private val instance by lazy { this }
private val restaurantId by lazy { ResturantInfoManager.newInstance().getRestaurantId() } private val restaurantId by lazy { RestaurantInfoManager.newInstance().getRestaurantId() }
private val memberId by lazy { UserContext.newInstance().getMemberId() } private val memberId by lazy { UserContext.newInstance().getMemberId() }
private val ints = arrayOf( private val ints = arrayOf(
...@@ -207,7 +207,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen ...@@ -207,7 +207,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
override fun onStart() { override fun onStart() {
super.onStart() super.onStart()
pageViewModel.getBanlance(ResturantInfoManager.newInstance().getBrandId()) pageViewModel.getBanlance(RestaurantInfoManager.newInstance().getBrandId())
} }
override fun onResume() { override fun onResume() {
...@@ -461,7 +461,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen ...@@ -461,7 +461,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
} }
} }
//刷新餘額 //刷新餘額
pageViewModel.getBanlance(ResturantInfoManager.newInstance().getBrandId()) pageViewModel.getBanlance(RestaurantInfoManager.newInstance().getBrandId())
} }
}) })
it.execute { it.execute {
...@@ -540,7 +540,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen ...@@ -540,7 +540,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
val openCashBoxFunction = FunctionManager.getFunctionByKey(functionByResModule, FunctionManagerConstants.takeaway.TAKEAWAY_OPEN_CASH_BOX) val openCashBoxFunction = FunctionManager.getFunctionByKey(functionByResModule, FunctionManagerConstants.takeaway.TAKEAWAY_OPEN_CASH_BOX)
qm_other_order_bar.setTitle(ResturantInfoManager.newInstance().getRestaurantName()) qm_other_order_bar.setTitle(RestaurantInfoManager.newInstance().getRestaurantName())
qm_other_order_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() } qm_other_order_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() }
if (newOrderFunction != null || historyOrderFunction != null || openCashBoxFunction != null) { if (newOrderFunction != null || historyOrderFunction != null || openCashBoxFunction != null) {
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/HistoryOrderActivity.kt
...@@ -27,9 +27,6 @@ class HistoryOrderActivity : BaseActivity<IPresenter>() { ...@@ -27,9 +27,6 @@ class HistoryOrderActivity : BaseActivity<IPresenter>() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_history_order) setContentView(R.layout.activity_history_order)
// type = CCUtil.getNavigateParam(this, , )
tv_start_time.text = TimeUtils.getOldDate(0) tv_start_time.text = TimeUtils.getOldDate(0)
tv_end_time.text = TimeUtils.getOldDate(0) tv_end_time.text = TimeUtils.getOldDate(0)
...@@ -88,42 +85,23 @@ class HistoryOrderActivity : BaseActivity<IPresenter>() { ...@@ -88,42 +85,23 @@ class HistoryOrderActivity : BaseActivity<IPresenter>() {
when (v!!.id) { when (v!!.id) {
R.id.iv_start_time_triangle, R.id.tv_start_time -> { R.id.iv_start_time_triangle, R.id.tv_start_time -> {
iv_start_time_triangle.toggle() iv_start_time_triangle.toggle()
val cal = Calendar.getInstance() val startTime = Calendar.getInstance()
startTime.set(2019, 0, 1)
val defaultTime = Calendar.getInstance()
try { try {
//設置默認時間為當前的起止時間 //設置默認時間為當前的起止時間
TimeUtils.DATE_FORMAT_DATE.parse(tv_start_time.text.toString())?.let { TimeUtils.DATE_FORMAT_DATE.parse(tv_start_time.text.toString())?.let {
cal.time = it defaultTime.time = it
} }
} catch (e: ParseException) { } catch (e: ParseException) {
e.printStackTrace() e.printStackTrace()
} }
TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, cal) { date, _ -> TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, startTime, Calendar.getInstance(), defaultTime) { date, _ ->
// tv_start_time.text = TimeUtils.DATE_FORMAT_DATE.format(date)
// time = TimeUtils.DATE_FORMAT_DATE.format(date)
mViewModel.historyTime.postValue(TimeUtils.DATE_FORMAT_DATE.format(date)) mViewModel.historyTime.postValue(TimeUtils.DATE_FORMAT_DATE.format(date))
// pageIndex = 1
// getHistoryInfo()
}.setOnDismissListener { }.setOnDismissListener {
iv_start_time_triangle.toggle() iv_start_time_triangle.toggle()
} }
} }
// R.id.tv_end_time, R.id.iv_end_time_triangle -> {
// iv_end_time_triangle.toggle()
// val cal = Calendar.getInstance()
// try {
// //設置默認時間為當前的起止時間
// cal.time = TimeUtils.DATE_FORMAT_DATE.parse(tv_end_time.text.toString())
// } catch (e: ParseException) {
// e.printStackTrace()
// }
// TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, cal) { date, v ->
// tv_end_time.text = TimeUtils.DATE_FORMAT_DATE.format(date)
// }.setOnDismissListener {
// iv_end_time_triangle.toggle()
// pageIndex = 1
// getHistoryInfo()
// }
// }
} }
} }
} }
\ No newline at end of file
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
...@@ -20,7 +20,7 @@ import com.ethanhua.skeleton.ViewSkeletonScreen ...@@ -20,7 +20,7 @@ import com.ethanhua.skeleton.ViewSkeletonScreen
import com.gingersoft.gsa.cloud.common.constans.FunctionManagerConstants import com.gingersoft.gsa.cloud.common.constans.FunctionManagerConstants
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.function.FunctionManager import com.gingersoft.gsa.cloud.common.function.FunctionManager
import com.gingersoft.gsa.cloud.common.ui.utils.BtnBuilder import com.gingersoft.gsa.cloud.common.ui.utils.BtnBuilder
...@@ -92,7 +92,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -92,7 +92,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
.color(R.color.white) .color(R.color.white)
.show() .show()
restaurantId = ResturantInfoManager.newInstance().getRestaurantId() restaurantId = RestaurantInfoManager.newInstance().getRestaurantId()
orderId = intent.getStringExtra("orderId")!!//訂單id orderId = intent.getStringExtra("orderId")!!//訂單id
orderType = intent.getIntExtra("orderType", 0)//訂單類型 orderType = intent.getIntExtra("orderType", 0)//訂單類型
orderPayType = intent.getIntExtra("orderPayType", 0)//訂單支付方式 orderPayType = intent.getIntExtra("orderPayType", 0)//訂單支付方式
...@@ -113,7 +113,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -113,7 +113,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
} }
private fun initTopBar(topbar: QMUITopBar) { private fun initTopBar(topbar: QMUITopBar) {
topbar.setTitle(ResturantInfoManager.newInstance().restaurantName) topbar.setTitle(RestaurantInfoManager.newInstance().restaurantName)
topbar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() } topbar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() }
topbar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color)) topbar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color))
} }
...@@ -628,7 +628,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -628,7 +628,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
private fun PageViewModel.cancelOrder(orderDetails: OrderDetails.DataBean) { private fun PageViewModel.cancelOrder(orderDetails: OrderDetails.DataBean) {
//獲取取消原因讓用戶選擇 //獲取取消原因讓用戶選擇
showLoading() showLoading()
getCancelReason(ResturantInfoManager.newInstance().getBrandId(), restaurantId, 3) { cancelReson -> getCancelReason(RestaurantInfoManager.newInstance().getBrandId(), restaurantId, 3) { cancelReson ->
cancelDialogForLoading() cancelDialogForLoading()
if (cancelReson != null && cancelReson.data.isNotEmpty()) { if (cancelReson != null && cancelReson.data.isNotEmpty()) {
//如果有配置取消原因 //如果有配置取消原因
...@@ -686,7 +686,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() { ...@@ -686,7 +686,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
private fun PageViewModel.cancelLogistics(orderDetails: OrderDetails.DataBean) { private fun PageViewModel.cancelLogistics(orderDetails: OrderDetails.DataBean) {
//獲取取消原因讓用戶選擇 //獲取取消原因讓用戶選擇
showLoading() showLoading()
getCancelReason(ResturantInfoManager.newInstance().getBrandId(), restaurantId, 2) { cancelReson -> getCancelReason(RestaurantInfoManager.newInstance().getBrandId(), restaurantId, 2) { cancelReson ->
cancelDialogForLoading() cancelDialogForLoading()
if (cancelReson != null && cancelReson.data.isNotEmpty()) { if (cancelReson != null && cancelReson.data.isNotEmpty()) {
//如果有配置取消原因 //如果有配置取消原因
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
...@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.Companion.verifiAmountTip
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.DataBean import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails.DataBean
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil import com.gingersoft.gsa.cloud.common.utils.MoneyUtil
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.pay.bean.PayMethod import com.gingersoft.gsa.cloud.pay.bean.PayMethod
...@@ -67,7 +67,7 @@ class PayActivity : BaseActivity<IPresenter>() { ...@@ -67,7 +67,7 @@ class PayActivity : BaseActivity<IPresenter>() {
} }
other_pay_view.loadInfo(this, ArrayList<PayMethod>(), totalAmount, foodCount) other_pay_view.loadInfo(this, ArrayList<PayMethod>(), totalAmount, foodCount)
pageViewModel.getPayMethod(ResturantInfoManager.newInstance().getBrandId(), ResturantInfoManager.newInstance().getRestaurantId()) pageViewModel.getPayMethod(RestaurantInfoManager.newInstance().getBrandId(), RestaurantInfoManager.newInstance().getRestaurantId())
pageViewModel.payTypeBean.observe(this, Observer { pageViewModel.payTypeBean.observe(this, Observer {
//獲取支付方式 //獲取支付方式
// other_pay_view.loadInfo(this, PayTypeInfo.getPayMethodByPayType(it), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount) // other_pay_view.loadInfo(this, PayTypeInfo.getPayMethodByPayType(it), MoneyUtil.sub(orderDetails.TOTAL_AMOUNT!!.toDouble(), orderDetails.discount_amount), foodCount)
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/DeliveryFragment.kt
...@@ -8,7 +8,7 @@ import android.widget.Button ...@@ -8,7 +8,7 @@ import android.widget.Button
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.ui.utils.AppDialog import com.gingersoft.gsa.cloud.ui.utils.AppDialog
import com.gingersoft.gsa.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
...@@ -58,7 +58,7 @@ class DeliveryFragment : BaseFragment() { ...@@ -58,7 +58,7 @@ class DeliveryFragment : BaseFragment() {
AppDialog().showWaringDialog(context, "是否確認刪除") { _, dialog -> AppDialog().showWaringDialog(context, "是否確認刪除") { _, dialog ->
showLoading() showLoading()
it.data.list[position].apply { it.data.list[position].apply {
viewModel.updateDeliveryConfig(distributionFeeMin.toString(), distributionFeeMax.toString(), distributionFee.toString(), deliveryCost.toString(), distributionType, type, desc, id, ResturantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), lackPrice.toString(), 1) { viewModel.updateDeliveryConfig(distributionFeeMin.toString(), distributionFeeMax.toString(), distributionFee.toString(), deliveryCost.toString(), distributionType, type, desc, id, RestaurantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), lackPrice.toString(), 1) {
dialog.dismiss() dialog.dismiss()
cancelDialogForLoading() cancelDialogForLoading()
} }
...@@ -76,7 +76,7 @@ class DeliveryFragment : BaseFragment() { ...@@ -76,7 +76,7 @@ class DeliveryFragment : BaseFragment() {
} }
}) })
viewModel.queryDeliveryList(ResturantInfoManager.newInstance().getRestaurantId().toString()) viewModel.queryDeliveryList(RestaurantInfoManager.newInstance().getRestaurantId().toString())
} }
} }
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/PlaceholderFragment.kt
...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData ...@@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil import com.gingersoft.gsa.cloud.common.utils.other.TextUtil
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
...@@ -27,7 +27,7 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) { ...@@ -27,7 +27,7 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
private val pageViewModel by lazy { ViewModelProvider(activity?.viewModelStore!!, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] } private val pageViewModel by lazy { ViewModelProvider(activity?.viewModelStore!!, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] }
private var page = 1 private var page = 1
private val restaurantId by lazy { ResturantInfoManager.newInstance().getRestaurantId() } private val restaurantId by lazy { RestaurantInfoManager.newInstance().getRestaurantId() }
private val memberId by lazy { UserContext.newInstance().getMemberId() } private val memberId by lazy { UserContext.newInstance().getMemberId() }
private lateinit var adapter: OtherOrdersAdapter private lateinit var adapter: OtherOrdersAdapter
private var position = 0 private var position = 0
......
component-delivery-pick/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/fragment/UpdateDeliveryFragment.kt
...@@ -6,7 +6,7 @@ import android.view.View ...@@ -6,7 +6,7 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
import com.gingersoft.gsa.delivery_pick_mode.R import com.gingersoft.gsa.delivery_pick_mode.R
...@@ -113,7 +113,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) { ...@@ -113,7 +113,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) {
if (deliveryConfig == null) { if (deliveryConfig == null) {
//新增 //新增
viewModel.addDeliveryConfig(et_min_delivery_fee.text.toString(), et_max_delivery_fee.text.toString(), ed_delivery_fee.text.toString(), ed_start_delivery_fee.text.toString(), selectDeliveryType, selectDeliveryMethodPosition, viewModel.addDeliveryConfig(et_min_delivery_fee.text.toString(), et_max_delivery_fee.text.toString(), ed_delivery_fee.text.toString(), ed_start_delivery_fee.text.toString(), selectDeliveryType, selectDeliveryMethodPosition,
ed_desc.text.toString(), ResturantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), ed_difference_fee.text.toString()) { ed_desc.text.toString(), RestaurantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), ed_difference_fee.text.toString()) {
cancelDialogForLoading() cancelDialogForLoading()
if (it != null && it.success) { if (it != null && it.success) {
ToastUtils.show(context, "保存成功") ToastUtils.show(context, "保存成功")
...@@ -125,7 +125,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) { ...@@ -125,7 +125,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) {
} else { } else {
//編輯 //編輯
viewModel.updateDeliveryConfig(et_min_delivery_fee.text.toString(), et_max_delivery_fee.text.toString(), ed_delivery_fee.text.toString(), ed_start_delivery_fee.text.toString(), selectDeliveryType, selectDeliveryMethodPosition, viewModel.updateDeliveryConfig(et_min_delivery_fee.text.toString(), et_max_delivery_fee.text.toString(), ed_delivery_fee.text.toString(), ed_start_delivery_fee.text.toString(), selectDeliveryType, selectDeliveryMethodPosition,
ed_desc.text.toString(), deliveryConfig!!.id, ResturantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), ed_difference_fee.text.toString(), 0) { ed_desc.text.toString(), deliveryConfig!!.id, RestaurantInfoManager.newInstance().getRestaurantId(), UserContext.newInstance().getMemberId(), ed_difference_fee.text.toString(), 0) {
cancelDialogForLoading() cancelDialogForLoading()
if (it != null && it.success) { if (it != null && it.success) {
ToastUtils.show(context, "修改成功") ToastUtils.show(context, "修改成功")
......
component-download/src/main/java/com/gingersoft/gsa/cloud/download/mvp/presenter/DownloadPresenter.java
package com.gingersoft.gsa.cloud.download.mvp.presenter; package com.gingersoft.gsa.cloud.download.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.Api; import com.gingersoft.gsa.cloud.common.Api;
...@@ -152,7 +152,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -152,7 +152,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
setDownAverageRatio(); setDownAverageRatio();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
List<DownloadRequest> requests = getDownloadRequests(getDownloadUrls(restaurantId), restaurantId); List<DownloadRequest> requests = getDownloadRequests(getDownloadUrls(restaurantId), restaurantId);
...@@ -263,7 +263,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -263,7 +263,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downFoodList(int downTag) { public void downFoodList(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodList(restaurantId) mModel.downFoodList(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -316,7 +316,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -316,7 +316,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downModifier(int downTag) { public void downModifier(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downModifier(restaurantId) mModel.downModifier(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -369,7 +369,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -369,7 +369,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downFoodCombo(int downTag) { public void downFoodCombo(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodCombo(restaurantId) mModel.downFoodCombo(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -423,7 +423,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -423,7 +423,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downComboItem(int downTag) { public void downComboItem(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downComboItem(restaurantId) mModel.downComboItem(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -475,7 +475,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -475,7 +475,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downFoodModifier(int downTag) { public void downFoodModifier(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodModifier(restaurantId) mModel.downFoodModifier(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -526,7 +526,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -526,7 +526,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downDiscount(int downTag) { public void downDiscount(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downDiscount(restaurantId) mModel.downDiscount(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -580,7 +580,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -580,7 +580,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downExpandInfo(int downTag) { public void downExpandInfo(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downExpandInfo(restaurantId) mModel.downExpandInfo(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
...@@ -635,7 +635,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow ...@@ -635,7 +635,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
} }
public void downPrinterList(int downTag) { public void downPrinterList(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downPrinterList(restaurantId) mModel.downPrinterList(restaurantId)
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/contract/LoginInterfaceImpl.java
...@@ -12,7 +12,7 @@ import com.billy.cc.core.component.CC; ...@@ -12,7 +12,7 @@ import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.core.login.LoginBean; import com.gingersoft.gsa.cloud.common.core.login.LoginBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo; import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfo; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean; import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserConstans; import com.gingersoft.gsa.cloud.common.core.user.UserConstans;
...@@ -47,14 +47,14 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -47,14 +47,14 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
int restaurantSize = 0; int restaurantSize = 0;
List<BrandsBean.BrandsData> brandsBeans = new ArrayList<>(); List<BrandsBean.BrandsData> brandsBeans = new ArrayList<>();
if (brands != null) { if (brands != null) {
ResturantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands)); RestaurantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands); restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands);
brandsBeans.addAll(brands); brandsBeans.addAll(brands);
} }
boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false); boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
if (autoLogin && UserContext.newInstance().isLogin()) { if (autoLogin && UserContext.newInstance().isLogin()) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (restaurantId != 0) { if (restaurantId != 0) {
//上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數 //上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數
mPresenter.getLoginLimit(restaurantId, false); mPresenter.getLoginLimit(restaurantId, false);
...@@ -108,7 +108,7 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -108,7 +108,7 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
// mPresenter.getRestaurantList(); // mPresenter.getRestaurantList();
boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false); boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
if (autoLogin) { if (autoLogin) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (restaurantId != 0) { if (restaurantId != 0) {
//上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數 //上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數
// mPresenter.getLoginLimit(restaurantId, false); // mPresenter.getLoginLimit(restaurantId, false);
...@@ -137,12 +137,12 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B ...@@ -137,12 +137,12 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) { protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) {
ResturantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName)); RestaurantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName));
// GsaCloudApplication.setBrandId(mContext, brandId); // GsaCloudApplication.setBrandId(mContext, brandId);
// GsaCloudApplication.setBrandName(mContext, brandName); // GsaCloudApplication.setBrandName(mContext, brandName);
if (restaurantsBean != null) { if (restaurantsBean != null) {
ResturantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName() RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
,restaurantsBean.getGsPosShopId())); ,restaurantsBean.getGsPosShopId()));
// GsaCloudApplication.setRestaurantId(mContext, restaurantsBean.getRestaurantId()); // GsaCloudApplication.setRestaurantId(mContext, restaurantsBean.getRestaurantId());
// GsaCloudApplication.setRestaurantName(mContext, restaurantsBean.getRestaurantName()); // GsaCloudApplication.setRestaurantName(mContext, restaurantsBean.getRestaurantName());
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/ChooseRestaurantActivity.java
...@@ -18,7 +18,7 @@ import com.billy.cc.core.component.CC; ...@@ -18,7 +18,7 @@ import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo; import com.gingersoft.gsa.cloud.common.core.restaurant.BrandInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfo; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean; import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
...@@ -176,7 +176,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese ...@@ -176,7 +176,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
// String brandRestaurantInfos = JsonUtils.toJson(brands); // String brandRestaurantInfos = JsonUtils.toJson(brands);
// GsaCloudApplication.setBrandRestaurantInfos(mContext, brandRestaurantInfos); // GsaCloudApplication.setBrandRestaurantInfos(mContext, brandRestaurantInfos);
ResturantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands)); RestaurantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
brandsBeans.addAll(brands); brandsBeans.addAll(brands);
// restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands); // restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands);
...@@ -208,9 +208,9 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese ...@@ -208,9 +208,9 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
} }
protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) { protected void saveBrandAndRestaurantInfo(int brandId, String brandName, BrandsBean.BrandsData.RestaurantsBean restaurantsBean) {
ResturantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName)); RestaurantInfoManager.newInstance().setBrandInfo(new BrandInfo(brandId, brandName));
if (restaurantsBean != null) { if (restaurantsBean != null) {
ResturantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName() RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
,restaurantsBean.getGsPosShopId())); ,restaurantsBean.getGsPosShopId()));
} }
} }
......
component-login/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
...@@ -19,7 +19,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; ...@@ -19,7 +19,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.viewpager2.widget.ViewPager2; import androidx.viewpager2.widget.ViewPager2;
import com.gingersoft.gsa.cloud.common.core.login.LoginBean; import com.gingersoft.gsa.cloud.common.core.login.LoginBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserConstans; import com.gingersoft.gsa.cloud.common.core.user.UserConstans;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.encryption.Aes; import com.gingersoft.gsa.cloud.common.utils.encryption.Aes;
...@@ -108,7 +108,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem ...@@ -108,7 +108,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
boolean isLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false); boolean isLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
if (isLogin) { if (isLogin) {
if (!TextUtils.isEmpty(UserContext.newInstance().getLoginToken()) && ResturantInfoManager.newInstance().getRestaurantId() != 0) { if (!TextUtils.isEmpty(UserContext.newInstance().getLoginToken()) && RestaurantInfoManager.newInstance().getRestaurantId() != 0) {
//自動登陸 //自動登陸
String pwd = Aes.aesDecrypt((String) SPUtils.get(UserConstans.LOGIN_PASSWORD, "")); String pwd = Aes.aesDecrypt((String) SPUtils.get(UserConstans.LOGIN_PASSWORD, ""));
mPresenter.login(SPUtils.get(UserConstans.LOGIN_USERNAME, "") + "", pwd); mPresenter.login(SPUtils.get(UserConstans.LOGIN_USERNAME, "") + "", pwd);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/EditFoodPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.EditFoodContract; import com.gingersoft.gsa.cloud.main.mvp.contract.EditFoodContract;
...@@ -118,7 +118,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi ...@@ -118,7 +118,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi
* 獲取時段列表 * 獲取時段列表
*/ */
private void getPeriodList() { private void getPeriodList() {
mModel.getPeriodList(ResturantInfoManager.newInstance().getBrandId()) mModel.getPeriodList(RestaurantInfoManager.newInstance().getBrandId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("獲取時段信息中...")) .doOnSubscribe(disposable -> mRootView.showLoading("獲取時段信息中..."))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
...@@ -152,7 +152,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi ...@@ -152,7 +152,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi
* 獲取餐種 * 獲取餐種
*/ */
private void getSummaryList() { private void getSummaryList() {
mModel.getSummaryList(ResturantInfoManager.newInstance().getRestaurantId()) mModel.getSummaryList(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("獲取餐種信息中...")) .doOnSubscribe(disposable -> mRootView.showLoading("獲取餐種信息中..."))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/ExpandListPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils; import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
...@@ -61,7 +61,7 @@ public class ExpandListPresenter extends BasePresenter<ExpandListContract.Model, ...@@ -61,7 +61,7 @@ public class ExpandListPresenter extends BasePresenter<ExpandListContract.Model,
} }
public void getExpandInfoList() { public void getExpandInfoList() {
mModel.getExpandList(ResturantInfoManager.newInstance().getRestaurantId()) mModel.getExpandList(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("")) .doOnSubscribe(disposable -> mRootView.showLoading(""))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
...@@ -6,7 +6,7 @@ import android.net.Uri; ...@@ -6,7 +6,7 @@ import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.webview.WebviewHelper; import com.gingersoft.gsa.cloud.common.webview.WebviewHelper;
import com.gingersoft.gsa.cloud.component.ComponentName; import com.gingersoft.gsa.cloud.component.ComponentName;
...@@ -73,7 +73,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa ...@@ -73,7 +73,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
} }
public void syncRestaurantExtendedConfiguration() { public void syncRestaurantExtendedConfiguration() {
mModel.syncRestaurantExtendedConfiguration(ResturantInfoManager.newInstance().getRestaurantId()) mModel.syncRestaurantExtendedConfiguration(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
...@@ -160,7 +160,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa ...@@ -160,7 +160,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
public void clearHeartbeat(){ public void clearHeartbeat(){
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "") .add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.build(); .build();
//關閉心跳 //關閉心跳
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewlyAddedPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -121,8 +121,8 @@ public class NewlyAddedPresenter extends BasePresenter<NewlyAddedContract.Model, ...@@ -121,8 +121,8 @@ public class NewlyAddedPresenter extends BasePresenter<NewlyAddedContract.Model,
return; return;
} }
Observable<BaseResult> baseResultObservable; Observable<BaseResult> baseResultObservable;
timePeriodBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); timePeriodBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
timePeriodBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); timePeriodBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(timePeriodBean)); RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(timePeriodBean));
if (isUpdate) { if (isUpdate) {
baseResultObservable = mModel.updatePeriod(requestBody); baseResultObservable = mModel.updatePeriod(requestBody);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/QrCodePresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract; import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -46,7 +46,7 @@ public class QrCodePresenter extends BasePresenter<QrCodeContract.Model, QrCodeC ...@@ -46,7 +46,7 @@ public class QrCodePresenter extends BasePresenter<QrCodeContract.Model, QrCodeC
} }
public void getRestaurantQrCode() { public void getRestaurantQrCode() {
mModel.getRestaurantQrCode(ResturantInfoManager.newInstance().getRestaurantId() + "") mModel.getRestaurantQrCode(RestaurantInfoManager.newInstance().getRestaurantId() + "")
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("加載中...")) .doOnSubscribe(disposable -> mRootView.showLoading("加載中..."))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.main.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract; import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract;
...@@ -60,7 +60,7 @@ public class SettlementPresenter extends BasePresenter<SettlementContract.Model, ...@@ -60,7 +60,7 @@ public class SettlementPresenter extends BasePresenter<SettlementContract.Model,
} }
public void getSettlementReport() { public void getSettlementReport() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getSettlementReport(restaurantId) mModel.getSettlementReport(restaurantId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/SettlementReportPresenter.java
...@@ -4,7 +4,7 @@ import android.app.Activity; ...@@ -4,7 +4,7 @@ import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
...@@ -113,7 +113,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -113,7 +113,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
} }
public void sendSettlement(int type) { public void sendSettlement(int type) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody; RequestBody requestBody;
if (type != 0) { if (type != 0) {
requestBody = new FormBody.Builder() requestBody = new FormBody.Builder()
...@@ -210,7 +210,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon ...@@ -210,7 +210,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
} }
public void getSettlementReport() { public void getSettlementReport() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getSettlementReport(restaurantId) mModel.getSettlementReport(restaurantId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LanguageActivity.java
...@@ -8,7 +8,7 @@ import androidx.annotation.Nullable; ...@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.listener.OnItemClickListener; import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
...@@ -82,7 +82,7 @@ public class LanguageActivity extends BaseActivity<LanguagePresenter> implements ...@@ -82,7 +82,7 @@ public class LanguageActivity extends BaseActivity<LanguagePresenter> implements
initAdapter(); initAdapter();
initItemListener(); initItemListener();
mPresenter.getLanguageByBrandId(ResturantInfoManager.newInstance().getBrandId()); mPresenter.getLanguageByBrandId(RestaurantInfoManager.newInstance().getBrandId());
} }
private void initAdapter() { private void initAdapter() {
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LookLogActivity.kt
...@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat ...@@ -7,7 +7,7 @@ import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.utils.FileUtils import com.gingersoft.gsa.cloud.common.utils.FileUtils
import com.gingersoft.gsa.cloud.main.R import com.gingersoft.gsa.cloud.main.R
import kotlinx.android.synthetic.main.activity_look_log.* import kotlinx.android.synthetic.main.activity_look_log.*
...@@ -21,7 +21,7 @@ class LookLogActivity : AppCompatActivity() { ...@@ -21,7 +21,7 @@ class LookLogActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_look_log) setContentView(R.layout.activity_look_log)
log_top_bar.setTitle(ResturantInfoManager.newInstance().getRestaurantName()) log_top_bar.setTitle(RestaurantInfoManager.newInstance().getRestaurantName())
log_top_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { onBackPressed() } log_top_bar.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { onBackPressed() }
log_top_bar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color)) log_top_bar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color))
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -26,7 +26,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.ResultConstans; import com.gingersoft.gsa.cloud.common.constans.ResultConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean; import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
...@@ -166,7 +166,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -166,7 +166,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
FragmentManager fragmentManager = getSupportFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager();
mainTopFragment = (MainTopFragment) fragmentManager.findFragmentById(R.id.main_top_fragment); mainTopFragment = (MainTopFragment) fragmentManager.findFragmentById(R.id.main_top_fragment);
tvStoreName.setText(ResturantInfoManager.newInstance().getRestaurantName()); tvStoreName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
refresh.setOnRefreshListener(refreshLayout -> { refresh.setOnRefreshListener(refreshLayout -> {
if (mainTopFragment != null) { if (mainTopFragment != null) {
Message msg = new Message(); Message msg = new Message();
...@@ -210,7 +210,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -210,7 +210,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
@Override @Override
protected void onRestart() { protected void onRestart() {
super.onRestart(); super.onRestart();
String restaurantName = ResturantInfoManager.newInstance().getRestaurantName(); String restaurantName = RestaurantInfoManager.newInstance().getRestaurantName();
tvStoreName.setText(restaurantName); tvStoreName.setText(restaurantName);
tvRestaurantName.setText(restaurantName); tvRestaurantName.setText(restaurantName);
} }
...@@ -441,7 +441,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -441,7 +441,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
} }
private void updateTitleInfo() { private void updateTitleInfo() {
String restaurantName = ResturantInfoManager.newInstance().getRestaurantName(); String restaurantName = RestaurantInfoManager.newInstance().getRestaurantName();
String memberName = UserContext.newInstance().getMemberName(); String memberName = UserContext.newInstance().getMemberName();
if (!TextUtils.isEmpty(restaurantName)) { if (!TextUtils.isEmpty(restaurantName)) {
if (RestaurantInfoUtils.getRestaurantSize(this) > 1) { if (RestaurantInfoUtils.getRestaurantSize(this) > 1) {
...@@ -459,7 +459,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -459,7 +459,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
} }
private void showChooseRestaurantDialog() { private void showChooseRestaurantDialog() {
String brandRestaurantInfos = ResturantInfoManager.getBrandRestaurantInfos(); String brandRestaurantInfos = RestaurantInfoManager.getBrandRestaurantInfos();
if (!TextUtils.isEmpty(brandRestaurantInfos)) { if (!TextUtils.isEmpty(brandRestaurantInfos)) {
List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class); List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class);
if (brandsBeans != null && brandsBeans.size() > 0) { if (brandsBeans != null && brandsBeans.size() > 0) {
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
...@@ -239,8 +239,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -239,8 +239,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
@Override @Override
public void initLanguage() { public void initLanguage() {
String brandName = "品牌名稱: " + ResturantInfoManager.newInstance().getBrandName(); String brandName = "品牌名稱: " + RestaurantInfoManager.newInstance().getBrandName();
String restaurantName = "店鋪名稱: " + ResturantInfoManager.newInstance().getRestaurantName(); String restaurantName = "店鋪名稱: " + RestaurantInfoManager.newInstance().getRestaurantName();
tv_restaurant_name.setText(brandName + "\n" + restaurantName); tv_restaurant_name.setText(brandName + "\n" + restaurantName);
} }
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/foodmenu/FoodMenuAdapter.java
...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.adapter.foodmenu; ...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.adapter.foodmenu;
import android.content.Context; import android.content.Context;
import com.chad.library.adapter.base.BaseProviderMultiAdapter; import com.chad.library.adapter.base.BaseProviderMultiAdapter;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.FoodMenuEditBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.FoodMenuEditBean;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.SummaryBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.SummaryBean;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.TimePeriodBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.TimePeriodBean;
...@@ -182,7 +182,7 @@ public class FoodMenuAdapter extends BaseProviderMultiAdapter<FoodMenuEditBean> ...@@ -182,7 +182,7 @@ public class FoodMenuAdapter extends BaseProviderMultiAdapter<FoodMenuEditBean>
if(summaryBean == null){ if(summaryBean == null){
summaryBean = new SummaryBean(); summaryBean = new SummaryBean();
} }
summaryBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); summaryBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
summaryBean.setName(data.get(0).getShowValue()); summaryBean.setName(data.get(0).getShowValue());
summaryBean.setValid(data.get(1).isShowState() ? 1 : 0); summaryBean.setValid(data.get(1).isShowState() ? 1 : 0);
return summaryBean; return summaryBean;
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java
...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; ...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.PrintTransitUtils; import com.gingersoft.gsa.cloud.common.utils.PrintTransitUtils;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.component.ComponentName; import com.gingersoft.gsa.cloud.component.ComponentName;
...@@ -132,7 +132,7 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter ...@@ -132,7 +132,7 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
restaurantId = String.valueOf(ResturantInfoManager.newInstance().getRestaurantId()); restaurantId = String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId());
//獲取一段時間內的營業信息，默認獲取七天的數據 //獲取一段時間內的營業信息，默認獲取七天的數據
startTime = TimeUtils.getOldDate(-manyDay); startTime = TimeUtils.getOldDate(-manyDay);
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/HomeFragment.java
...@@ -13,7 +13,7 @@ import androidx.annotation.Nullable; ...@@ -13,7 +13,7 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.component.ComponentName; import com.gingersoft.gsa.cloud.component.ComponentName;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
...@@ -103,7 +103,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon ...@@ -103,7 +103,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.getRestaurantReport(ResturantInfoManager.newInstance().getRestaurantId() + ""); mPresenter.getRestaurantReport(RestaurantInfoManager.newInstance().getRestaurantId() + "");
// mPresenter.getRestaurantFunList("26"); // mPresenter.getRestaurantFunList("26");
initTopBar(); initTopBar();
initStickyLayout(); initStickyLayout();
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
...@@ -13,7 +13,7 @@ import android.widget.TextView; ...@@ -13,7 +13,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
...@@ -124,8 +124,8 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M ...@@ -124,8 +124,8 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
} }
private void getInfo() { private void getInfo() {
mPresenter.getOrderInfoChart(ResturantInfoManager.newInstance().getRestaurantId() + ""); mPresenter.getOrderInfoChart(RestaurantInfoManager.newInstance().getRestaurantId() + "");
mPresenter.getRestaurantReport(ResturantInfoManager.newInstance().getRestaurantId() + "");//ResturantInfoManager.newInstance().getRestaurantId() 獲取餐廳營業信息 mPresenter.getRestaurantReport(RestaurantInfoManager.newInstance().getRestaurantId() + "");//ResturantInfoManager.newInstance().getRestaurantId() 獲取餐廳營業信息
} }
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/PaymentMethodReportFragment.java
...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment; ...@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.R2; import com.gingersoft.gsa.cloud.main.R2;
...@@ -114,7 +114,7 @@ public class PaymentMethodReportFragment extends BaseFragment<PaymentMethodRepor ...@@ -114,7 +114,7 @@ public class PaymentMethodReportFragment extends BaseFragment<PaymentMethodRepor
private void getPayMenthInfo() { private void getPayMenthInfo() {
String startTime = TimeUtils.getDatebyDate(mTvStartTime.getText().toString(), -1); String startTime = TimeUtils.getDatebyDate(mTvStartTime.getText().toString(), -1);
String endTime = TimeUtils.getDatebyDate(mTvEndTime.getText().toString(), 1); String endTime = TimeUtils.getDatebyDate(mTvEndTime.getText().toString(), 1);
mPresenter.getPaymentInfo(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime); mPresenter.getPaymentInfo(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
} }
/** /**
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/SalesFragment.java
...@@ -14,7 +14,7 @@ import androidx.annotation.Nullable; ...@@ -14,7 +14,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
...@@ -540,14 +540,14 @@ public class SalesFragment extends BaseFragment<SalesPresenter> implements Sales ...@@ -540,14 +540,14 @@ public class SalesFragment extends BaseFragment<SalesPresenter> implements Sales
private void getSaleReport() { private void getSaleReport() {
String startTime = TimeUtils.getDatebyDate(mTvStartTime.getText().toString(), -1); String startTime = TimeUtils.getDatebyDate(mTvStartTime.getText().toString(), -1);
String endTime = TimeUtils.getDatebyDate(mTvEndTime.getText().toString(), 1); String endTime = TimeUtils.getDatebyDate(mTvEndTime.getText().toString(), 1);
mPresenter.getSalesReportInfo(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime); mPresenter.getSalesReportInfo(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
} }
private void getDeliveryReport(){ private void getDeliveryReport(){
String startTime = TimeUtils.getDatebyDate(startEndTimePickerView.getStartTime(), -1); String startTime = TimeUtils.getDatebyDate(startEndTimePickerView.getStartTime(), -1);
String endTime = TimeUtils.getDatebyDate(startEndTimePickerView.getEndTime(), 1); String endTime = TimeUtils.getDatebyDate(startEndTimePickerView.getEndTime(), 1);
mPresenter.getDeliveryOrderCurveInfo(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime); mPresenter.getDeliveryOrderCurveInfo(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
mPresenter.getDeliveryPersonnelReport(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime); mPresenter.getDeliveryPersonnelReport(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
} }
private StartEndTimePickerView.onUpdateTimePicker onUpdateTimePicker = (startTime, endTime) -> getDeliveryReport(); private StartEndTimePickerView.onUpdateTimePicker onUpdateTimePicker = (startTime, endTime) -> getDeliveryReport();
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/DailyBusinessView.java
...@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat; ...@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.main.R; import com.gingersoft.gsa.cloud.main.R;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.BusinessBean; import com.gingersoft.gsa.cloud.main.mvp.model.bean.BusinessBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter; import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter;
...@@ -62,7 +62,7 @@ public class DailyBusinessView extends BaseReloadView { ...@@ -62,7 +62,7 @@ public class DailyBusinessView extends BaseReloadView {
TextView tvRestaurantName = contentView.findViewById(R.id.tv_restaurant_name); TextView tvRestaurantName = contentView.findViewById(R.id.tv_restaurant_name);
View horizontalLine = contentView.findViewById(R.id.horizontal_dividing_line); View horizontalLine = contentView.findViewById(R.id.horizontal_dividing_line);
mBusinessDetails = contentView.findViewById(R.id.rv_business_details); mBusinessDetails = contentView.findViewById(R.id.rv_business_details);
tvRestaurantName.setText(ResturantInfoManager.newInstance().getRestaurantName()); tvRestaurantName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
if (isPrint) { if (isPrint) {
tvRestaurantName.setTextSize(24); tvRestaurantName.setTextSize(24);
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/model/TableManageModel.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.model; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.manager.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.manager.mvp.model.service.TableManageService; import com.gingersoft.gsa.cloud.manager.mvp.model.service.TableManageService;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -98,7 +98,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M ...@@ -98,7 +98,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M
@Override @Override
public Observable<BaseResult> queryAreas() { public Observable<BaseResult> queryAreas() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
return mRepositoryManager.obtainRetrofitService(TableManageService.class) return mRepositoryManager.obtainRetrofitService(TableManageService.class)
.queryArea(restaurantId); .queryArea(restaurantId);
} }
...@@ -150,7 +150,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M ...@@ -150,7 +150,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M
@Override @Override
public Observable<BaseResult> queryTables() { public Observable<BaseResult> queryTables() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
return mRepositoryManager.obtainRetrofitService(TableManageService.class) return mRepositoryManager.obtainRetrofitService(TableManageService.class)
.queryTable(restaurantId); .queryTable(restaurantId);
} }
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
...@@ -4,7 +4,7 @@ import android.app.Application; ...@@ -4,7 +4,7 @@ import android.app.Application;
import android.os.CountDownTimer; import android.os.CountDownTimer;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.table.TableArea; import com.gingersoft.gsa.cloud.common.core.table.TableArea;
import com.gingersoft.gsa.cloud.common.core.table.TableManagerItem; import com.gingersoft.gsa.cloud.common.core.table.TableManagerItem;
...@@ -458,7 +458,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -458,7 +458,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void changeAreaSort(String ids) { public void changeAreaSort(String ids) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(ResturantInfoManager.newInstance().getRestaurantId())) .add("restaurantId", String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId()))
.add("ids", ids) .add("ids", ids)
.build(); .build();
LogUtil.d(TAG, "changeAreaSort " + " ids:" + ids); LogUtil.d(TAG, "changeAreaSort " + " ids:" + ids);
...@@ -509,7 +509,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode ...@@ -509,7 +509,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void changeTableSort(String ids) { public void changeTableSort(String ids) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(ResturantInfoManager.newInstance().getRestaurantId())) .add("restaurantId", String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId()))
.add("ids", ids) .add("ids", ids)
.build(); .build();
LogUtil.d(TAG, "changeTableSort " + " ids:" + ids); LogUtil.d(TAG, "changeTableSort " + " ids:" + ids);
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddAreaFragment.java
...@@ -15,7 +15,7 @@ import androidx.annotation.NonNull; ...@@ -15,7 +15,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableArea; import com.gingersoft.gsa.cloud.common.core.table.TableArea;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
...@@ -235,7 +235,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A ...@@ -235,7 +235,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
public AreaRequest.Add createAddAreaRequest() { public AreaRequest.Add createAddAreaRequest() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
AreaRequest.Add areaRequest = new AreaRequest.Add(); AreaRequest.Add areaRequest = new AreaRequest.Add();
areaRequest.setRestaurantId(restaurantId); areaRequest.setRestaurantId(restaurantId);
areaRequest.setRegionName(ed_area_name.getText().toString()); areaRequest.setRegionName(ed_area_name.getText().toString());
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AddTableFragment.java
...@@ -19,7 +19,7 @@ import androidx.annotation.NonNull; ...@@ -19,7 +19,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableManagerItem; import com.gingersoft.gsa.cloud.common.core.table.TableManagerItem;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
...@@ -431,7 +431,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -431,7 +431,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
public TableRequest.Add createAddTableRequest() { public TableRequest.Add createAddTableRequest() {
TableRequest.Add addTableRequest = new TableRequest.Add(); TableRequest.Add addTableRequest = new TableRequest.Add();
addTableRequest.setRegionId(currentAreaId); addTableRequest.setRegionId(currentAreaId);
addTableRequest.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); addTableRequest.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
addTableRequest.setTableName(tableNameEditText.getText().toString()); addTableRequest.setTableName(tableNameEditText.getText().toString());
if (!TextUtils.isEmpty(serverchargeEditText.getText().toString())) { if (!TextUtils.isEmpty(serverchargeEditText.getText().toString())) {
addTableRequest.setServiceCharge(Double.parseDouble(serverchargeEditText.getText().toString())); addTableRequest.setServiceCharge(Double.parseDouble(serverchargeEditText.getText().toString()));
...@@ -453,7 +453,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements ...@@ -453,7 +453,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
TableRequest.Update update = new TableRequest.Update(); TableRequest.Update update = new TableRequest.Update();
update.setId(id); update.setId(id);
update.setRegionId(currentAreaId); update.setRegionId(currentAreaId);
update.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); update.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
update.setTableName(tableNameEditText.getText().toString()); update.setTableName(tableNameEditText.getText().toString());
if (!TextUtils.isEmpty(serverchargeEditText.getText().toString())) { if (!TextUtils.isEmpty(serverchargeEditText.getText().toString())) {
update.setServiceCharge(Double.parseDouble(serverchargeEditText.getText().toString())); update.setServiceCharge(Double.parseDouble(serverchargeEditText.getText().toString()));
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/ui/fragment/AreaListFragment.java
...@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.ItemTouchHelper; ...@@ -20,7 +20,7 @@ import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableArea; import com.gingersoft.gsa.cloud.common.core.table.TableArea;
import com.gingersoft.gsa.cloud.manager.R; import com.gingersoft.gsa.cloud.manager.R;
import com.gingersoft.gsa.cloud.manager.R2; import com.gingersoft.gsa.cloud.manager.R2;
...@@ -453,7 +453,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements ...@@ -453,7 +453,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
} }
public AreaRequest.Add createAddAreaRequest() { public AreaRequest.Add createAddAreaRequest() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
AreaRequest.Add areaRequest = new AreaRequest.Add(); AreaRequest.Add areaRequest = new AreaRequest.Add();
areaRequest.setRestaurantId(restaurantId); areaRequest.setRestaurantId(restaurantId);
areaRequest.setRegionName(ed_area_name.getText().toString()); areaRequest.setRegionName(ed_area_name.getText().toString());
......
component-print/src/main/java/com/joe/print/mvp/model/bean/PrintInfoBean.java
...@@ -2,7 +2,7 @@ package com.joe.print.mvp.model.bean; ...@@ -2,7 +2,7 @@ package com.joe.print.mvp.model.bean;
import android.content.Context; import android.content.Context;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -336,8 +336,8 @@ public class PrintInfoBean { ...@@ -336,8 +336,8 @@ public class PrintInfoBean {
if (data == null) { if (data == null) {
return null; return null;
} }
printInfoBeans.add(new PrintInfoBean(new String[]{ResturantInfoManager.newInstance().getBrandName()}, new Boolean[]{true}, new Double[]{2d})); printInfoBeans.add(new PrintInfoBean(new String[]{RestaurantInfoManager.newInstance().getBrandName()}, new Boolean[]{true}, new Double[]{2d}));
printInfoBeans.add(new PrintInfoBean(new String[]{ResturantInfoManager.newInstance().getRestaurantName()}, new Boolean[]{true}, new Double[]{2d})); printInfoBeans.add(new PrintInfoBean(new String[]{RestaurantInfoManager.newInstance().getRestaurantName()}, new Boolean[]{true}, new Double[]{2d}));
printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder(data.getOrder_type() == 2 ? "外送" : "自取", 2, paperWidth)}, new Boolean[]{true}, new Double[]{2d})); printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder(data.getOrder_type() == 2 ? "外送" : "自取", 2, paperWidth)}, new Boolean[]{true}, new Double[]{2d}));
......
component-print/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java
...@@ -5,7 +5,7 @@ import android.graphics.Bitmap; ...@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.view.View; import android.view.View;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
...@@ -115,8 +115,8 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> { ...@@ -115,8 +115,8 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
List<String> items = new ArrayList<>(); List<String> items = new ArrayList<>();
items.add("上次清機時間:" + mCleanMachineContent.getRestaurantOperationTime()); items.add("上次清機時間:" + mCleanMachineContent.getRestaurantOperationTime());
items.add("品牌名稱:" + ResturantInfoManager.newInstance().getBrandName()); items.add("品牌名稱:" + RestaurantInfoManager.newInstance().getBrandName());
items.add("店鋪名稱:" + ResturantInfoManager.newInstance().getRestaurantName()); items.add("店鋪名稱:" + RestaurantInfoManager.newInstance().getRestaurantName());
items.add("每日營業報表"); items.add("每日營業報表");
items.add("由營業日期:" + mCleanMachineContent.getStartTime()); items.add("由營業日期:" + mCleanMachineContent.getStartTime());
items.add("到營業日期:" + mCleanMachineContent.getCurrentTime()); items.add("到營業日期:" + mCleanMachineContent.getCurrentTime());
......
component-print/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
...@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
...@@ -91,9 +91,9 @@ public class PrintOtherOrderClosing extends PrinterRoot<PrintTakeawayCheckoutCon ...@@ -91,9 +91,9 @@ public class PrintOtherOrderClosing extends PrinterRoot<PrintTakeawayCheckoutCon
TextView tvBillNumber = view.findViewById(R.id.tv_bill_number); TextView tvBillNumber = view.findViewById(R.id.tv_bill_number);
TextView tvPayMethodTwo = view.findViewById(R.id.tv_pay_amount_text_two); TextView tvPayMethodTwo = view.findViewById(R.id.tv_pay_amount_text_two);
//品牌名 //品牌名
setText(view, R.id.tv_brand_name, ResturantInfoManager.newInstance().getBrandName()); setText(view, R.id.tv_brand_name, RestaurantInfoManager.newInstance().getBrandName());
//餐廳名 //餐廳名
setText(view, R.id.tv_restaurant_name, ResturantInfoManager.newInstance().getRestaurantName()); setText(view, R.id.tv_restaurant_name, RestaurantInfoManager.newInstance().getRestaurantName());
// 訂單號 // 訂單號
setText(view, R.id.tv_order_number, "單號：" + data.getORDER_NO()); setText(view, R.id.tv_order_number, "單號：" + data.getORDER_NO());
......
component-print/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
...@@ -30,7 +30,7 @@ import com.gingersoft.gsa.cloud.common.constans.AppConstans; ...@@ -30,7 +30,7 @@ import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.utils.AidlUtil; import com.gingersoft.gsa.cloud.common.utils.AidlUtil;
...@@ -527,8 +527,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket ...@@ -527,8 +527,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
View view = View.inflate(mContext, R.layout.print_model_header, null); View view = View.inflate(mContext, R.layout.print_model_header, null);
TextView tvBrandName = view.findViewById(R.id.print_brand_name); TextView tvBrandName = view.findViewById(R.id.print_brand_name);
TextView tvRestaurantName = view.findViewById(R.id.print_restaurant_name); TextView tvRestaurantName = view.findViewById(R.id.print_restaurant_name);
tvBrandName.setText(ResturantInfoManager.newInstance().getBrandName()); tvBrandName.setText(RestaurantInfoManager.newInstance().getBrandName());
tvRestaurantName.setText(ResturantInfoManager.newInstance().getRestaurantName()); tvRestaurantName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
return view; return view;
} }
...@@ -879,8 +879,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket ...@@ -879,8 +879,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
protected String getHtmlPrintHeadInfo() { protected String getHtmlPrintHeadInfo() {
return getPLable(ResturantInfoManager.newInstance().getBrandName(), HTML_PRINT_GRAVITY_CENTER) + return getPLable(RestaurantInfoManager.newInstance().getBrandName(), HTML_PRINT_GRAVITY_CENTER) +
getPLable(ResturantInfoManager.newInstance().getRestaurantName(), HTML_PRINT_GRAVITY_CENTER); getPLable(RestaurantInfoManager.newInstance().getRestaurantName(), HTML_PRINT_GRAVITY_CENTER);
} }
protected String getHtmlPrintHeadOrderInfo(TableBean.DataBean tableBean) { protected String getHtmlPrintHeadOrderInfo(TableBean.DataBean tableBean) {
......
component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
...@@ -15,7 +15,7 @@ import com.epson.epos2.Epos2Exception; ...@@ -15,7 +15,7 @@ import com.epson.epos2.Epos2Exception;
import com.epson.epos2.printer.Printer; import com.epson.epos2.printer.Printer;
import com.epson.epos2.printer.PrinterStatusInfo; import com.epson.epos2.printer.PrinterStatusInfo;
import com.epson.epos2.printer.ReceiveListener; import com.epson.epos2.printer.ReceiveListener;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.threadPool.ThreadPoolManager; import com.gingersoft.gsa.cloud.common.utils.threadPool.ThreadPoolManager;
import com.gingersoft.gsa.cloud.common.utils.AidlUtil; import com.gingersoft.gsa.cloud.common.utils.AidlUtil;
...@@ -188,7 +188,7 @@ public class PrjService extends Service implements ReceiveListener { ...@@ -188,7 +188,7 @@ public class PrjService extends Service implements ReceiveListener {
* 請求prj數據 * 請求prj數據
*/ */
private void getPrjInfo() { private void getPrjInfo() {
OkHttp3Utils.get(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL + "printerRecording/get?restaurantId=" + ResturantInfoManager.newInstance().getRestaurantId()) OkHttp3Utils.get(HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL + "printerRecording/get?restaurantId=" + RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())//切换到io线程進行網絡請求 .subscribeOn(Schedulers.io())//切换到io线程進行網絡請求
.observeOn(Schedulers.io())//切換到io线程處理請求結果 .observeOn(Schedulers.io())//切換到io线程處理請求結果
.subscribe(new Observer<String>() { .subscribe(new Observer<String>() {
......
component-print/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
...@@ -3,7 +3,7 @@ package com.joe.print.mvp.print.utils; ...@@ -3,7 +3,7 @@ package com.joe.print.mvp.print.utils;
import android.content.Context; import android.content.Context;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean; import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils; import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils;
...@@ -145,11 +145,11 @@ public class MyPrintUtils { ...@@ -145,11 +145,11 @@ public class MyPrintUtils {
} }
public TextView getBrandName(Context context) { public TextView getBrandName(Context context) {
return getNormalTextView(context,ResturantInfoManager.newInstance().getBrandName(), HEADER_TEXTSIZE); return getNormalTextView(context, RestaurantInfoManager.newInstance().getBrandName(), HEADER_TEXTSIZE);
} }
public TextView getRestaurantName(Context context) { public TextView getRestaurantName(Context context) {
return getNormalTextView(context, ResturantInfoManager.newInstance().getRestaurantName(), HEADER_TEXTSIZE); return getNormalTextView(context, RestaurantInfoManager.newInstance().getRestaurantName(), HEADER_TEXTSIZE);
} }
public TextView getDashedLine(Context context) { public TextView getDashedLine(Context context) {
......
component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintAddCurrencyActivity.java
...@@ -9,7 +9,7 @@ import android.widget.TextView; ...@@ -9,7 +9,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean; import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
...@@ -190,7 +190,7 @@ public class PrintAddCurrencyActivity extends BaseActivity<PrintAddCurrencyPrese ...@@ -190,7 +190,7 @@ public class PrintAddCurrencyActivity extends BaseActivity<PrintAddCurrencyPrese
private void addCurrencyPrinter() { private void addCurrencyPrinter() {
if (printCurrencyBean == null) { if (printCurrencyBean == null) {
printCurrencyBean = new PrintCurrencyBean(); printCurrencyBean = new PrintCurrencyBean();
printCurrencyBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); printCurrencyBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
} }
printCurrencyBean.setUid(UserContext.newInstance().getMemberId()); printCurrencyBean.setUid(UserContext.newInstance().getMemberId());
printCurrencyBean.setType(typePosition); printCurrencyBean.setType(typePosition);
......
component-print/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
...@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -22,7 +22,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils; import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
...@@ -596,7 +596,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem ...@@ -596,7 +596,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
hideKeyBoard(); hideKeyBoard();
printerDeviceBean.setName(mEdPrintName.getText().toString().trim()); printerDeviceBean.setName(mEdPrintName.getText().toString().trim());
printerDeviceBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); printerDeviceBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
//飛單打印機 //飛單打印機
if (oneFailPosition != -1) { if (oneFailPosition != -1) {
...@@ -645,7 +645,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem ...@@ -645,7 +645,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
mPresenter.updatePrinterInfo(printerDeviceBean); mPresenter.updatePrinterInfo(printerDeviceBean);
} else { } else {
printerDeviceBean.setUid(null); printerDeviceBean.setUid(null);
printerDeviceBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); printerDeviceBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
mPresenter.addPrinter(printerDeviceBean); mPresenter.addPrinter(printerDeviceBean);
} }
} else if (v.getId() == R.id.print_test) { } else if (v.getId() == R.id.print_test) {
......
component-print/src/main/java/com/joe/print/mvp/ui/fragment/IpPrintListActivityFragment.java
...@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat; ...@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean; import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.utils.PrinterDeviceDaoUtils; import com.gingersoft.gsa.cloud.database.utils.PrinterDeviceDaoUtils;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog; import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
...@@ -73,13 +73,13 @@ public class IpPrintListActivityFragment extends BaseFragment<IpPrintListActivit ...@@ -73,13 +73,13 @@ public class IpPrintListActivityFragment extends BaseFragment<IpPrintListActivit
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mTvAddPrint.setText("+添加打印機"); mTvAddPrint.setText("+添加打印機");
mPresenter.getModelList(ResturantInfoManager.newInstance().getRestaurantId()); mPresenter.getModelList(RestaurantInfoManager.newInstance().getRestaurantId());
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mPresenter.getPrinterList(ResturantInfoManager.newInstance().getRestaurantId()); mPresenter.getPrinterList(RestaurantInfoManager.newInstance().getRestaurantId());
} }
/** /**
......
component-print/src/main/java/com/joe/print/mvp/ui/fragment/LocalPrintFragment.java
...@@ -12,7 +12,7 @@ import android.widget.TextView; ...@@ -12,7 +12,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean; import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils; import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog; import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
...@@ -64,7 +64,7 @@ public class LocalPrintFragment extends BaseFragment<LocalPrintPresenter> implem ...@@ -64,7 +64,7 @@ public class LocalPrintFragment extends BaseFragment<LocalPrintPresenter> implem
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
mPresenter.getPrinterCurrencyList(ResturantInfoManager.newInstance().getRestaurantId()); mPresenter.getPrinterCurrencyList(RestaurantInfoManager.newInstance().getRestaurantId());
} }
@Override @Override
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/ConfirmOrderBean.java
package com.gingersoft.supply_chain.mvp.bean; package com.gingersoft.supply_chain.mvp.bean;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
...@@ -42,8 +42,8 @@ public class ConfirmOrderBean { ...@@ -42,8 +42,8 @@ public class ConfirmOrderBean {
PurchaseOrder purchaseOrder = new PurchaseOrder(); PurchaseOrder purchaseOrder = new PurchaseOrder();
purchaseOrder.setSupplierId(cartFood.getSupplierId()); purchaseOrder.setSupplierId(cartFood.getSupplierId());
purchaseOrder.setSupplierName(cartFood.getSupplierName()); purchaseOrder.setSupplierName(cartFood.getSupplierName());
purchaseOrder.setBrandId(ResturantInfoManager.newInstance().getBrandId()); purchaseOrder.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
purchaseOrder.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); purchaseOrder.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseOrder.setInitialShippingTime(TimeUtils.getNextDayLong(1)); purchaseOrder.setInitialShippingTime(TimeUtils.getNextDayLong(1));
purchaseOrder.setTotalAmount(MoneyUtil.priceCalculation(cartFood.getUnitPrice(), cartFood.getFoodQuantity())); purchaseOrder.setTotalAmount(MoneyUtil.priceCalculation(cartFood.getUnitPrice(), cartFood.getFoodQuantity()));
purchaseOrder.setActualPayment(MoneyUtil.sum(purchaseOrder.getTotalAmount(), purchaseOrder.getShipping())); purchaseOrder.setActualPayment(MoneyUtil.sum(purchaseOrder.getTotalAmount(), purchaseOrder.getShipping()));
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/DeputyUnitBean.java
...@@ -16,11 +16,11 @@ public class DeputyUnitBean implements Serializable { ...@@ -16,11 +16,11 @@ public class DeputyUnitBean implements Serializable {
/** /**
* 品牌id * 品牌id
*/ */
private Long brandId; private int brandId;
/** /**
* 餐廳id * 餐廳id
*/ */
private Long restaurantId; private int restaurantId;
/** /**
* 食材id，沒有時傳0 * 食材id，沒有時傳0
*/ */
...@@ -30,6 +30,10 @@ public class DeputyUnitBean implements Serializable { ...@@ -30,6 +30,10 @@ public class DeputyUnitBean implements Serializable {
*/ */
private String deputyUnit; private String deputyUnit;
/** /**
* 食材id
*/
private int purchaseFoodId;
/**
* 換算倍數 * 換算倍數
*/ */
private String conversionMultiple = "1"; private String conversionMultiple = "1";
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/PurchaseFoodBean.java
...@@ -44,6 +44,10 @@ public class PurchaseFoodBean implements Serializable { ...@@ -44,6 +44,10 @@ public class PurchaseFoodBean implements Serializable {
*/ */
private double minimumAmount; private double minimumAmount;
/** /**
* 基本單位類型
*/
private String basicUnitName;
/**
* 採購商地址 * 採購商地址
*/ */
private String address; private String address;
...@@ -95,7 +99,7 @@ public class PurchaseFoodBean implements Serializable { ...@@ -95,7 +99,7 @@ public class PurchaseFoodBean implements Serializable {
/** /**
* 副單位 * 副單位
*/ */
private List<DeputyUnitBean> deputyUnitBeans; private List<DeputyUnitBean> foodUnits;
public boolean isChecked() { public boolean isChecked() {
return isChecked; return isChecked;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/PurchaseOrderDetailsBean.java
...@@ -75,12 +75,23 @@ public class PurchaseOrderDetailsBean { ...@@ -75,12 +75,23 @@ public class PurchaseOrderDetailsBean {
* unit_content : ML * unit_content : ML
*/ */
private int id; private int id;
/**
* 食品數量
*/
private int foodQuantity; private int foodQuantity;
private int foodPrice; private int foodPrice;
private int status; private int status;
private int purchaseFoodId; private int purchaseFoodId;
private String images; private String images;
private String foodNo; private String foodNo;
/**
* 基本單位
*/
private String basicUnitName;
/**
* 包裝描述
*/
private String packingDescription;
private int quantityStarts; private int quantityStarts;
private int quantityEnd; private int quantityEnd;
private int type; private int type;
...@@ -90,5 +101,20 @@ public class PurchaseOrderDetailsBean { ...@@ -90,5 +101,20 @@ public class PurchaseOrderDetailsBean {
private double totalAmount; private double totalAmount;
//是否被選中 //是否被選中
private boolean isChecked = false; private boolean isChecked = false;
private List<DeputyUnitBean> foodUnits;
//用戶顯示的可操作的集合
List<WareHouseBean> wareHouseBeans;
@Data
public static class WareHouseBean {
private String title;
private String value;
public WareHouseBean(String title, String value) {
this.title = title;
this.value = value;
}
}
} }
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/content/Constant.java
package com.gingersoft.supply_chain.mvp.content; package com.gingersoft.supply_chain.mvp.content;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import java.util.Map; import java.util.Map;
...@@ -28,11 +28,11 @@ public class Constant { ...@@ -28,11 +28,11 @@ public class Constant {
public static void addBrandId(Map<String, Object> map) { public static void addBrandId(Map<String, Object> map) {
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
} }
public static void addRestaurantId(Map<String, Object> map) { public static void addRestaurantId(Map<String, Object> map) {
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
} }
public static void addPageSize(Map<String, Object> map) { public static void addPageSize(Map<String, Object> map) {
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/contract/FoodUnitPageContract.java
...@@ -30,13 +30,16 @@ public interface FoodUnitPageContract { ...@@ -30,13 +30,16 @@ public interface FoodUnitPageContract {
void loadBasicUnitAdapter(List<BasicUnitBean> basicUnitBeans); void loadBasicUnitAdapter(List<BasicUnitBean> basicUnitBeans);
void loadDeputyUnitAdapter(List<DeputyUnitBean> deputyUnitBeans); void loadDeputyUnitAdapter(List<DeputyUnitBean> deputyUnitBeans);
void initTopBar(String title);
} }
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存 //Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel { interface Model extends IModel {
/** /**
* 獲取基本單位集合 * 獲取基本單位集合
* @param brandId 品牌id *
* @param brandId 品牌id
* @param restaurantId 餐廳ID * @param restaurantId 餐廳ID
* @return * @return
*/ */
...@@ -44,6 +47,7 @@ public interface FoodUnitPageContract { ...@@ -44,6 +47,7 @@ public interface FoodUnitPageContract {
/** /**
* 批量修改副單位 * 批量修改副單位
*
* @return * @return
*/ */
Observable<BaseResult> updateDeputyUnitList(RequestBody requestBody); Observable<BaseResult> updateDeputyUnitList(RequestBody requestBody);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/CategoryPresenter.java
...@@ -3,7 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,7 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
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.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
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.FoodCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
...@@ -81,8 +81,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -81,8 +81,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
map.put("parentId", parentId); map.put("parentId", parentId);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(name)) { if (!TextUtil.isEmptyOrNullOrUndefined(name)) {
map.put("name", name); map.put("name", name);
} }
...@@ -192,8 +192,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat ...@@ -192,8 +192,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
public FoodCategoryResultBean.DataBean.FoodCategoryBean toFoodCategoryBean(int parentId, String categoryName, int id) { public FoodCategoryResultBean.DataBean.FoodCategoryBean toFoodCategoryBean(int parentId, String categoryName, int id) {
FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean(); FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean();
foodCategoryBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); foodCategoryBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
foodCategoryBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); foodCategoryBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
foodCategoryBean.setName(categoryName); foodCategoryBean.setName(categoryName);
foodCategoryBean.setParentId(parentId); foodCategoryBean.setParentId(parentId);
foodCategoryBean.setId(id); foodCategoryBean.setId(id);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/CategorySelectPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.bean.SectionCheckItem; import com.gingersoft.gsa.cloud.ui.bean.SectionCheckItem;
import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean; import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
...@@ -75,8 +75,8 @@ public class CategorySelectPresenter extends BasePresenter<CategorySelectContrac ...@@ -75,8 +75,8 @@ public class CategorySelectPresenter extends BasePresenter<CategorySelectContrac
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
map.put("parentId", parentId); map.put("parentId", parentId);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(name)) { if (!TextUtil.isEmptyOrNullOrUndefined(name)) {
map.put("name", name); map.put("name", name);
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/FoodIngredientsPresenter.java
...@@ -3,7 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,7 +3,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
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.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean; import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
...@@ -92,8 +92,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -92,8 +92,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (supplierId != -1) { if (supplierId != -1) {
map.put("supplierId", supplierId); map.put("supplierId", supplierId);
} }
...@@ -166,8 +166,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -166,8 +166,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000); map.put("pageSize", 1000);
map.put("pageIndex", 0); map.put("pageIndex", 0);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (supplierId != -1) { if (supplierId != -1) {
map.put("supplierId", supplierId); map.put("supplierId", supplierId);
} }
...@@ -235,8 +235,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr ...@@ -235,8 +235,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
*/ */
public void deleteFood(PurchaseFoodBean purchaseFoodBean, int position) { public void deleteFood(PurchaseFoodBean purchaseFoodBean, int position) {
purchaseFoodBean.setDeletes(Constant.DELETE); purchaseFoodBean.setDeletes(Constant.DELETE);
purchaseFoodBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); purchaseFoodBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseFoodBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); purchaseFoodBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
mModel.updateFood(RequestBody.create(MediaType.parse("application/json"), JsonUtils.toJson(purchaseFoodBean))) mModel.updateFood(RequestBody.create(MediaType.parse("application/json"), JsonUtils.toJson(purchaseFoodBean)))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("刪除中...")) .doOnSubscribe(disposable -> mRootView.showLoading("刪除中..."))
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/FoodUnitPagePresenter.java
...@@ -4,7 +4,7 @@ import android.app.Application; ...@@ -4,7 +4,7 @@ import android.app.Application;
import android.os.Bundle; import android.os.Bundle;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
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.BasicUnitBean; import com.gingersoft.supply_chain.mvp.bean.BasicUnitBean;
...@@ -89,14 +89,24 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -89,14 +89,24 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
deputyUnitBeans = (List<DeputyUnitBean>) arguments.getSerializable(FoodUnitPageFragment.DEPUTY_UNIT_KEY); deputyUnitBeans = (List<DeputyUnitBean>) arguments.getSerializable(FoodUnitPageFragment.DEPUTY_UNIT_KEY);
if (TextUtil.isNotEmptyOrNullOrUndefined(basicUnitName)) { if (TextUtil.isNotEmptyOrNullOrUndefined(basicUnitName)) {
isUpdate = true; isUpdate = true;
mRootView.initTopBar("編輯商品單位");
} else { } else {
isUpdate = false; isUpdate = false;
mRootView.initTopBar("填寫商品單位");
} }
getDeputyUnitList();
if (deputyUnitBeans == null) {
deputyUnitBeans = new ArrayList<>();
}
mRootView.loadDeputyUnitAdapter(deputyUnitBeans);
} }
} }
/**
* 獲取副單位 快捷輸入列表數據集合
*/
public void getDeputyUnitList() { public void getDeputyUnitList() {
mModel.getDeputyUnitList(ResturantInfoManager.newInstance().getBrandId(), ResturantInfoManager.newInstance().getRestaurantId()) mModel.getDeputyUnitList(RestaurantInfoManager.newInstance().getBrandId(), RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(GET_INFO_LOADING)) .doOnSubscribe(disposable -> mRootView.showLoading(GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread()) .subscribeOn(AndroidSchedulers.mainThread())
...@@ -121,6 +131,9 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -121,6 +131,9 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
}); });
} }
/**
* 添加副單位
*/
public void addDeputyUnit() { public void addDeputyUnit() {
if (deputyUnitBeans.size() > 0) { if (deputyUnitBeans.size() > 0) {
DeputyUnitBean basicUnitBean = deputyUnitBeans.get(deputyUnitBeans.size() - 1); DeputyUnitBean basicUnitBean = deputyUnitBeans.get(deputyUnitBeans.size() - 1);
...@@ -134,13 +147,4 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo ...@@ -134,13 +147,4 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
deputyUnitBeans.add(unitBean); deputyUnitBeans.add(unitBean);
mRootView.loadDeputyUnitAdapter(deputyUnitBeans); mRootView.loadDeputyUnitAdapter(deputyUnitBeans);
} }
public void loadDeputyUnit(List<DeputyUnitBean> unitBeans) {
if (unitBeans == null) {
deputyUnitBeans = new ArrayList<>();
} else {
deputyUnitBeans = unitBeans;
}
mRootView.loadDeputyUnitAdapter(deputyUnitBeans);
}
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/MeasurementUnitPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -75,8 +75,8 @@ public class MeasurementUnitPresenter extends BasePresenter<MeasurementUnitContr ...@@ -75,8 +75,8 @@ public class MeasurementUnitPresenter extends BasePresenter<MeasurementUnitContr
if (!TextUtil.isEmptyOrNullOrUndefined(unitContent)) { if (!TextUtil.isEmptyOrNullOrUndefined(unitContent)) {
map.put("unitContent", unitContent); map.put("unitContent", unitContent);
} }
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("pageIndex", pageIndex); map.put("pageIndex", pageIndex);
mModel.getMeasurementUnitList(map) mModel.getMeasurementUnitList(map)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodIngredientsPresenter.java
...@@ -6,7 +6,7 @@ import android.util.Log; ...@@ -6,7 +6,7 @@ import android.util.Log;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -17,7 +17,7 @@ import com.gingersoft.gsa.cloud.ui.adapter.bean.MultiSelectBean; ...@@ -17,7 +17,7 @@ import com.gingersoft.gsa.cloud.ui.adapter.bean.MultiSelectBean;
import com.gingersoft.gsa.cloud.ui.adapter.bean.UploadPicMultiBean; import com.gingersoft.gsa.cloud.ui.adapter.bean.UploadPicMultiBean;
import com.gingersoft.gsa.cloud.ui.bean.SectionCheckItem; import com.gingersoft.gsa.cloud.ui.bean.SectionCheckItem;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean; import com.gingersoft.supply_chain.mvp.bean.DeputyUnitBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract; import com.gingersoft.supply_chain.mvp.contract.NewFoodIngredientsContract;
...@@ -76,25 +76,41 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -76,25 +76,41 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
public int supplierIndex = 5; public int supplierIndex = 5;
public int foodNameIndex = 6; public int foodNameIndex = 6;
public int foodIngredientCategoryIndex = 7; public int foodIngredientCategoryIndex = 7;
/**
* 基本單位下標
*/
public int basicUnitIndex = 8; public int basicUnitIndex = 8;
public int packingDescriptionIndex = 9;//包裝說明 /**
public int foodNoIndex = 10;//食材編號 * 包裝說明下標
public int foodIngredientPriceIndex = 11;//單價 */
public int isAuditIndex = 14;//是否審核 public int packingDescriptionIndex = 9;
/**
* 食材編號下標
*/
public int foodNoIndex = 10;
/**
* 食材單價下標
*/
public int foodIngredientPriceIndex = 11;
/**
* 是否審核 下標
*/
public int isAuditIndex = 14;
public int mixInventoryIndex = 15;//最低庫存 public int mixInventoryIndex = 15;//最低庫存
public int shelfLifeIndex = 16;//保質期 public int shelfLifeIndex = 16;//保質期
public int shelfLifeWarningIndex = 17;//保質期預警 public int shelfLifeWarningIndex = 17;//保質期預警
public int remarkIndex = 20;//備註 public int remarkIndex = 20;//備註
/**
private SupplierInfoBean supplierInfoBean; * 副單位集合
private List<FoodPackingSpecificationBean> foodPackingSpecificationBeans; */
private List<SectionCheckItem> sectionCheckItems; private List<DeputyUnitBean> deputyUnitBeans;
private String categoryName = ""; private String categoryName = "";
private String picUrl; private String picUrl;
/** /**
* 如果是修改食材，則不為空 * 如果是修改食材，則不為空
*/ */
private PurchaseFoodBean purchaseFoodBean; private PurchaseFoodBean purchaseFoodBean;
@Inject @Inject
public NewFoodIngredientsPresenter(NewFoodIngredientsContract.Model model, NewFoodIngredientsContract.View rootView) { public NewFoodIngredientsPresenter(NewFoodIngredientsContract.Model model, NewFoodIngredientsContract.View rootView) {
super(model, rootView); super(model, rootView);
...@@ -120,10 +136,10 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -120,10 +136,10 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
infoMultiBeans.add(new UploadPicMultiBean(InfoMultiBean.EDIT_FOOD_ITEM_UPLOAD_PIC, "圖片上傳", R.drawable.png_upload_pic)); infoMultiBeans.add(new UploadPicMultiBean(InfoMultiBean.EDIT_FOOD_ITEM_UPLOAD_PIC, "圖片上傳", R.drawable.png_upload_pic));
infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_LINE)); infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_LINE));
infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_TITLE, "基本信息")); infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_TITLE, "基本信息"));
infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "所屬供應商", true, "請輸入/選擇供應商名稱", SELECT_SUPPLIER_RESULTCODE, SupplierListFragment.newInstance(true))); infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "所屬供應商", true, "請選擇供應商", SELECT_SUPPLIER_RESULTCODE, SupplierListFragment.newInstance(true)));
infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "食材名稱", true, "請輸入名稱")); infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "食材名稱", true, "請輸入名稱"));
infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "食材類別", false, "請輸入/選擇食材類別", SELECT_FOOD_CATEGORY_REQUEST_CODE, CategorySelectFragment.newInstance())); infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "食材類別", true, "請選擇食材類別", SELECT_FOOD_CATEGORY_REQUEST_CODE, CategorySelectFragment.newInstance()));
infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "基本單位", false, "請選擇食材單位", SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE, FoodUnitPageFragment.newInstance("",null))); infoMultiBeans.add(new MultiSelectBean(InfoMultiBean.EDIT_FOOD_ITEM_SELECT, "基本單位", false, "請選擇食材單位", SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE, FoodUnitPageFragment.newInstance("", null)));
infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "包裝說明", false, "請輸入包裝說明")); infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "包裝說明", false, "請輸入包裝說明"));
infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "食材編號", false, "請輸入食材編號")); infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "食材編號", false, "請輸入食材編號"));
infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "單價($)", false, "請輸入數字，保留2位小數", "0")); infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_TYPE_INPUT, "單價($)", false, "請輸入數字，保留2位小數", "0"));
...@@ -137,14 +153,33 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -137,14 +153,33 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_TITLE, "備註")); infoMultiBeans.add(new InfoMultiBean(InfoMultiBean.ITEM_TYPE_TITLE, "備註"));
infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_MULTIPLE_INPUT_REMARK, "", false, "請輸入備註")); infoMultiBeans.add(new MultiInputBean(InfoMultiBean.ITEM_MULTIPLE_INPUT_REMARK, "", false, "請輸入備註"));
if (purchaseFoodBean != null) { if (purchaseFoodBean != null) {
//供應商名稱
infoMultiBeans.get(supplierIndex).setShowValue(purchaseFoodBean.getSupplierName()); infoMultiBeans.get(supplierIndex).setShowValue(purchaseFoodBean.getSupplierName());
//食品名稱
infoMultiBeans.get(foodNameIndex).setShowValue(purchaseFoodBean.getName()); infoMultiBeans.get(foodNameIndex).setShowValue(purchaseFoodBean.getName());
//食品分類
infoMultiBeans.get(foodIngredientCategoryIndex).setShowValue(purchaseFoodBean.getFoodCategoryName());
//基本單位
infoMultiBeans.get(basicUnitIndex).setShowValue(purchaseFoodBean.getBasicUnitName());
//包裝描述
infoMultiBeans.get(packingDescriptionIndex).setShowValue(purchaseFoodBean.getPackingDescription()); infoMultiBeans.get(packingDescriptionIndex).setShowValue(purchaseFoodBean.getPackingDescription());
//食品編號
infoMultiBeans.get(foodNoIndex).setShowValue(purchaseFoodBean.getFoodNo()); infoMultiBeans.get(foodNoIndex).setShowValue(purchaseFoodBean.getFoodNo());
infoMultiBeans.get(foodIngredientCategoryIndex).setShowValue(purchaseFoodBean.getFoodCategoryName()); //單價
infoMultiBeans.get(foodIngredientPriceIndex).setShowValue(purchaseFoodBean.getUnitPrice() + ""); infoMultiBeans.get(foodIngredientPriceIndex).setShowValue(purchaseFoodBean.getUnitPrice() + "");
// infoMultiBeans.get(mixInventoryIndex).setShowValue(purchaseFoodListVosBean.get); //預警
PurchaseFoodBean.InventoryAlarm inventoryAlarm = purchaseFoodBean.getInventoryAlarm();
if (inventoryAlarm != null) {
infoMultiBeans.get(isAuditIndex).setChecked(inventoryAlarm.getReviews() == 1);
infoMultiBeans.get(mixInventoryIndex).setShowValue(inventoryAlarm.getMinimumInventory() + "");
infoMultiBeans.get(shelfLifeIndex).setShowValue(inventoryAlarm.getShelfLife() + "");
infoMultiBeans.get(shelfLifeWarningIndex).setShowValue(inventoryAlarm.getWarningDays() + "");
}
//副單位
infoMultiBeans.get(remarkIndex).setShowValue(purchaseFoodBean.getRemarks()); infoMultiBeans.get(remarkIndex).setShowValue(purchaseFoodBean.getRemarks());
//副單位
deputyUnitBeans = purchaseFoodBean.getFoodUnits();
//食材圖片
setPicUrl(infoMultiBeans, Collections.singletonList(purchaseFoodBean.getImages())); setPicUrl(infoMultiBeans, Collections.singletonList(purchaseFoodBean.getImages()));
} }
return infoMultiBeans; return infoMultiBeans;
...@@ -169,28 +204,26 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -169,28 +204,26 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
* @param infoMultiBeans * @param infoMultiBeans
*/ */
public void setSupplierInfo(SupplierInfoBean supplierInfoBean, List<InfoMultiBean> infoMultiBeans) { public void setSupplierInfo(SupplierInfoBean supplierInfoBean, List<InfoMultiBean> infoMultiBeans) {
this.supplierInfoBean = supplierInfoBean;
infoMultiBeans.get(supplierIndex).setShowValue(supplierInfoBean.getSupplierName()); infoMultiBeans.get(supplierIndex).setShowValue(supplierInfoBean.getSupplierName());
mRootView.refreshAdapterByPosition(supplierIndex); mRootView.refreshAdapterByPosition(supplierIndex);
} }
/** /**
* 設置包裝信息 * 設置單位
*
* @param foodPackingSpecificationBeans
*/ */
public void setPackingInfo(List<FoodPackingSpecificationBean> foodPackingSpecificationBeans, List<InfoMultiBean> infoMultiBeans) { public void setPackingInfo(String basicUnitName, List<DeputyUnitBean> deputyUnitBeans, List<InfoMultiBean> infoMultiBeans) {
this.foodPackingSpecificationBeans = foodPackingSpecificationBeans; infoMultiBeans.get(basicUnitIndex).setShowValue(basicUnitName);
if (foodPackingSpecificationBeans != null && foodPackingSpecificationBeans.size() > 1) { if (deputyUnitBeans != null) {
FoodPackingSpecificationBean foodPackingSpecificationBean = foodPackingSpecificationBeans.get(0); for (DeputyUnitBean deputyUnitBean : deputyUnitBeans) {
infoMultiBeans.get(packingDescriptionIndex).setShowValue(foodPackingSpecificationBean.getQuantityStarts() + "-" + foodPackingSpecificationBean.getQuantityEnd() + "/" + foodPackingSpecificationBean.getTypeName()); deputyUnitBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
mRootView.refreshAdapterByPosition(packingDescriptionIndex); deputyUnitBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
}
} }
this.deputyUnitBeans = deputyUnitBeans;
mRootView.refreshAdapterByPosition(basicUnitIndex);
} }
public void setCategoryInfo(List<SectionCheckItem> sectionCheckItems, List<InfoMultiBean> infoMultiBeans) { public void setCategoryInfo(List<SectionCheckItem> sectionCheckItems, List<InfoMultiBean> infoMultiBeans) {
this.sectionCheckItems = sectionCheckItems;
StringBuilder categoryName = new StringBuilder(); StringBuilder categoryName = new StringBuilder();
for (SectionCheckItem sectionCheckItem : sectionCheckItems) { for (SectionCheckItem sectionCheckItem : sectionCheckItems) {
categoryName.append(sectionCheckItem.getText()) categoryName.append(sectionCheckItem.getText())
...@@ -285,17 +318,13 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -285,17 +318,13 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
} }
}); });
} }
public String verificationData(List<InfoMultiBean> infoMultiBeans) { public String verificationData(List<InfoMultiBean> infoMultiBeans) {
String msg = null; String msg = null;
// if (TextUtil.isEmptyOrNullOrUndefined(picUrl)){
// msg = "請上傳圖片";
// } else
if (TextUtil.isEmptyOrNullOrUndefined(infoMultiBeans.get(supplierIndex).getShowValue())) { if (TextUtil.isEmptyOrNullOrUndefined(infoMultiBeans.get(supplierIndex).getShowValue())) {
msg = "請輸入供應商名稱"; msg = "請輸入供應商名稱";
} else if (TextUtil.isEmptyOrNullOrUndefined(infoMultiBeans.get(foodNameIndex).getShowValue())) { } else if (TextUtil.isEmptyOrNullOrUndefined(infoMultiBeans.get(foodNameIndex).getShowValue())) {
msg = "請輸入食材名稱"; msg = "請輸入食材名稱";
} else if (foodPackingSpecificationBeans == null) {
msg = "請選擇包裝規格";
} else if (TextUtil.isEmptyOrNullOrUndefined(categoryName)) { } else if (TextUtil.isEmptyOrNullOrUndefined(categoryName)) {
msg = "請選擇食材類別"; msg = "請選擇食材類別";
} }
...@@ -303,28 +332,63 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient ...@@ -303,28 +332,63 @@ public class NewFoodIngredientsPresenter extends BasePresenter<NewFoodIngredient
} }
public PurchaseFoodBean getFoodInfoByInfoMulti(List<InfoMultiBean> infoMultiBeans) { public PurchaseFoodBean getFoodInfoByInfoMulti(List<InfoMultiBean> infoMultiBeans) {
PurchaseFoodBean foodInfoBean = new PurchaseFoodBean(); if (purchaseFoodBean == null) {
foodInfoBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); purchaseFoodBean = new PurchaseFoodBean();
foodInfoBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); }
foodInfoBean.setFoodNo(infoMultiBeans.get(foodNoIndex).getShowValue()); //食材圖片
foodInfoBean.setName(infoMultiBeans.get(foodNameIndex).getShowValue());
if (TextUtil.isNotEmptyOrNullOrUndefined(picUrl)) { if (TextUtil.isNotEmptyOrNullOrUndefined(picUrl)) {
foodInfoBean.setImages(picUrl); purchaseFoodBean.setImages(picUrl);
} }
foodInfoBean.setSupplierName(infoMultiBeans.get(supplierIndex).getShowValue()); //食材所屬供應商
foodInfoBean.setFoodCategoryName(categoryName); purchaseFoodBean.setSupplierName(infoMultiBeans.get(supplierIndex).getShowValue());
foodInfoBean.setUnitPrice(Double.parseDouble(infoMultiBeans.get(foodIngredientPriceIndex).getShowValue())); //食材名稱
// foodInfoBean.setReviews("是否需要審核"); purchaseFoodBean.setName(infoMultiBeans.get(foodNameIndex).getShowValue());
foodInfoBean.setRemarks(infoMultiBeans.get(remarkIndex).getShowValue()); //食材類別名稱
purchaseFoodBean.setFoodCategoryName(categoryName);
//食材基本單位
purchaseFoodBean.setBasicUnitName(infoMultiBeans.get(basicUnitIndex).getShowValue());
//包裝描述
purchaseFoodBean.setPackingDescription(infoMultiBeans.get(packingDescriptionIndex).getShowValue());
//食材編號
purchaseFoodBean.setFoodNo(infoMultiBeans.get(foodNoIndex).getShowValue());
//單價
purchaseFoodBean.setUnitPrice(Double.parseDouble(infoMultiBeans.get(foodIngredientPriceIndex).getShowValue()));
//庫存預警
PurchaseFoodBean.InventoryAlarm inventoryAlarm = new PurchaseFoodBean.InventoryAlarm(); PurchaseFoodBean.InventoryAlarm inventoryAlarm = new PurchaseFoodBean.InventoryAlarm();
// inventoryAlarm.setFoodUnitId(); //庫存預警：是否審核
if (TextUtil.isNotEmptyOrNullOrUndefined(infoMultiBeans.get(mixInventoryIndex).getShowValue())) { inventoryAlarm.setReviews(infoMultiBeans.get(isAuditIndex).isChecked() ? 1 : 0);
// inventoryAlarm.setMinimumInventory(Integer.parseInt(infoMultiBeans.get(mixInventoryIndex).getShowValue())); //庫存預警：最低庫存
String mixInventory = infoMultiBeans.get(mixInventoryIndex).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(mixInventory)) {
inventoryAlarm.setMinimumInventory(Integer.parseInt(mixInventory));
} else {
inventoryAlarm.setMinimumInventory(0);
}
//庫存預警：保質期天數
String shelfLife = infoMultiBeans.get(shelfLifeIndex).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(shelfLife)) {
inventoryAlarm.setShelfLife(Integer.parseInt(shelfLife));
} else {
inventoryAlarm.setShelfLife(0);
}
//庫存預警：保質期預警天數（到期時間 小於等於 預警天數 預警提示用戶）
String shelfLifeWarning = infoMultiBeans.get(shelfLifeWarningIndex).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(shelfLifeWarning)) {
inventoryAlarm.setWarningDays(Integer.parseInt(shelfLifeWarning));
} else {
inventoryAlarm.setWarningDays(0);
} }
foodInfoBean.setInventoryAlarm(inventoryAlarm); purchaseFoodBean.setInventoryAlarm(inventoryAlarm);
// foodInfoBean.setFoodPackingSpecifications(foodPackingSpecificationBeans); //備註
return foodInfoBean; purchaseFoodBean.setRemarks(infoMultiBeans.get(remarkIndex).getShowValue());
//副單位
if (deputyUnitBeans != null && deputyUnitBeans.size() > 0) {
purchaseFoodBean.setFoodUnits(deputyUnitBeans);
}
//品牌id
purchaseFoodBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
//餐廳id
purchaseFoodBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
return purchaseFoodBean;
} }
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewFoodUnitPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -129,8 +129,8 @@ public class NewFoodUnitPresenter extends BasePresenter<NewFoodUnitContract.Mode ...@@ -129,8 +129,8 @@ public class NewFoodUnitPresenter extends BasePresenter<NewFoodUnitContract.Mode
if (foodUnit == null) { if (foodUnit == null) {
foodUnit = new MeasurementUnitBean.DataBean.Unit(); foodUnit = new MeasurementUnitBean.DataBean.Unit();
} }
foodUnit.setBrandId(ResturantInfoManager.newInstance().getBrandId()); foodUnit.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
foodUnit.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); foodUnit.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
List<InfoMultiBean> units = infoMultiBeans.get(0).getInfoMultiBeans(); List<InfoMultiBean> units = infoMultiBeans.get(0).getInfoMultiBeans();
for (int i = 0; i < units.size(); i++) { for (int i = 0; i < units.size(); i++) {
if (units.get(i).isChecked()) { if (units.get(i).isChecked()) {
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/NewSupplierPresenter.java
...@@ -7,7 +7,7 @@ import android.view.inputmethod.EditorInfo; ...@@ -7,7 +7,7 @@ import android.view.inputmethod.EditorInfo;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.MatchUtils; import com.gingersoft.gsa.cloud.common.utils.MatchUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils; import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils;
...@@ -20,7 +20,6 @@ import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider; ...@@ -20,7 +20,6 @@ import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract; import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
import com.google.gson.Gson;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader; import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -402,8 +401,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode ...@@ -402,8 +401,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
String telephone = infoMultiBeans.get(telephoneIndex).getShowValue(); String telephone = infoMultiBeans.get(telephoneIndex).getShowValue();
supplierInfoBean.setContactInformation(telephone); supplierInfoBean.setContactInformation(telephone);
supplierInfoBean.setAddress(infoMultiBeans.get(addressIndex).getShowValue()); supplierInfoBean.setAddress(infoMultiBeans.get(addressIndex).getShowValue());
supplierInfoBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); supplierInfoBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
supplierInfoBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); supplierInfoBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
String minimumAmount = infoMultiBeans.get(lowPurchaseAmount).getShowValue(); String minimumAmount = infoMultiBeans.get(lowPurchaseAmount).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(minimumAmount)) { if (TextUtil.isNotEmptyOrNullOrUndefined(minimumAmount)) {
supplierInfoBean.setMinimumAmount(Double.parseDouble(minimumAmount)); supplierInfoBean.setMinimumAmount(Double.parseDouble(minimumAmount));
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/OrderDetailsPresenter.java
...@@ -3,10 +3,11 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,10 +3,11 @@ package com.gingersoft.supply_chain.mvp.presenter;
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.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
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.DeputyUnitBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean;
import com.gingersoft.supply_chain.mvp.bean.OrderWareHouseBean; import com.gingersoft.supply_chain.mvp.bean.OrderWareHouseBean;
import com.jess.arms.integration.AppManager; import com.jess.arms.integration.AppManager;
...@@ -90,6 +91,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -90,6 +91,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
if (orderDetailsBean != null) { if (orderDetailsBean != null) {
OrderDetailsPresenter.this.orderId = orderId; OrderDetailsPresenter.this.orderId = orderId;
orderDetailsId = orderDetailsBean.getId(); orderDetailsId = orderDetailsBean.getId();
transformationWareHouse(orderDetailsBean);
mRootView.loadOrderDetails(orderDetailsBean); mRootView.loadOrderDetails(orderDetailsBean);
} else { } else {
mRootView.showMessage(GET_INFO_ERROR); mRootView.showMessage(GET_INFO_ERROR);
...@@ -100,6 +102,28 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -100,6 +102,28 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
mRootView.showMessage(GET_INFO_ERROR); mRootView.showMessage(GET_INFO_ERROR);
} }
} }
/**
* 將可編輯的商品單價和單位轉換成wareHouse實體類集合，方便之後取值
*/
private void transformationWareHouse(PurchaseOrderDetailsBean orderDetailsBean) {
List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean> purchaseOrderDetailsInfoVos = orderDetailsBean.getPurchaseOrderDetailsInfoVOS();
if (purchaseOrderDetailsInfoVos != null) {
//遍歷訂單商品
for (PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean purchaseOrderDetailsInfoVO : purchaseOrderDetailsInfoVos) {
//可編輯的商品單價和單位轉換成wareHouse實體類，方便之後取值
List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean> wareHouseBeans = new ArrayList<>();
wareHouseBeans.add(new PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean("單價(HKD)", purchaseOrderDetailsInfoVO.getFoodPrice() + ""));
wareHouseBeans.add(new PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean(purchaseOrderDetailsInfoVO.getBasicUnitName(), "1"));
if (purchaseOrderDetailsInfoVO.getFoodUnits() != null) {
List<DeputyUnitBean> foodUnits = purchaseOrderDetailsInfoVO.getFoodUnits();
for (DeputyUnitBean foodUnit : foodUnits) {
wareHouseBeans.add(new PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean(foodUnit.getDeputyUnit(), MoneyUtil.priceCalculation(Double.parseDouble(foodUnit.getConversionMultiple()), purchaseOrderDetailsInfoVO.getFoodQuantity()) + ""));
}
}
purchaseOrderDetailsInfoVO.setWareHouseBeans(wareHouseBeans);
}
}
}
}); });
} }
...@@ -141,8 +165,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo ...@@ -141,8 +165,8 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
orderWareHouseBean.setOrderId(orderId); orderWareHouseBean.setOrderId(orderId);
OrderWareHouseBean.PurchaseWarehousingOrder purchaseWarehousingOrder = new OrderWareHouseBean.PurchaseWarehousingOrder(); OrderWareHouseBean.PurchaseWarehousingOrder purchaseWarehousingOrder = new OrderWareHouseBean.PurchaseWarehousingOrder();
purchaseWarehousingOrder.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); purchaseWarehousingOrder.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseWarehousingOrder.setBrandId(ResturantInfoManager.newInstance().getBrandId()); purchaseWarehousingOrder.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
purchaseWarehousingOrder.setFiles(files); purchaseWarehousingOrder.setFiles(files);
purchaseWarehousingOrder.setRemarks(remark); purchaseWarehousingOrder.setRemarks(remark);
purchaseWarehousingOrder.setTotalPrice(totalAmount); purchaseWarehousingOrder.setTotalPrice(totalAmount);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/ShoppingCatPresenter.java
...@@ -5,7 +5,7 @@ import android.app.Application; ...@@ -5,7 +5,7 @@ import android.app.Application;
import android.widget.CheckBox; import android.widget.CheckBox;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
...@@ -123,8 +123,8 @@ public class ShoppingCatPresenter extends BasePresenter<ShoppingCatContract.Mode ...@@ -123,8 +123,8 @@ public class ShoppingCatPresenter extends BasePresenter<ShoppingCatContract.Mode
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
public void addNewPurchaseOrder(List<PurchaseFoodBean> purchaseFoodBeans, String remarks) { public void addNewPurchaseOrder(List<PurchaseFoodBean> purchaseFoodBeans, String remarks) {
NewPurchaseOrderBean newPurchaseOrderBean = new NewPurchaseOrderBean(); NewPurchaseOrderBean newPurchaseOrderBean = new NewPurchaseOrderBean();
newPurchaseOrderBean.setBrandId(ResturantInfoManager.newInstance().getBrandId()); newPurchaseOrderBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
newPurchaseOrderBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); newPurchaseOrderBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
double totalAmount = 0; double totalAmount = 0;
for (PurchaseFoodBean purchaseFoodBean : purchaseFoodBeans) { for (PurchaseFoodBean purchaseFoodBean : purchaseFoodBeans) {
totalAmount = MoneyUtil.sum(totalAmount, MoneyUtil.priceCalculation(purchaseFoodBean.getUnitPrice(), purchaseFoodBean.getFoodQuantity())); totalAmount = MoneyUtil.sum(totalAmount, MoneyUtil.priceCalculation(purchaseFoodBean.getUnitPrice(), purchaseFoodBean.getFoodQuantity()));
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/StorageListPresenter.java
...@@ -3,10 +3,9 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -3,10 +3,9 @@ package com.gingersoft.supply_chain.mvp.presenter;
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.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
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.SupplierResultBean;
import com.gingersoft.supply_chain.mvp.bean.WareHousingOrderBean; import com.gingersoft.supply_chain.mvp.bean.WareHousingOrderBean;
import com.gingersoft.supply_chain.mvp.contract.StorageListContract; import com.gingersoft.supply_chain.mvp.contract.StorageListContract;
import com.jess.arms.di.scope.FragmentScope; import com.jess.arms.di.scope.FragmentScope;
...@@ -15,7 +14,6 @@ import com.jess.arms.integration.AppManager; ...@@ -15,7 +14,6 @@ import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils; import com.jess.arms.utils.RxLifecycleUtils;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -72,8 +70,8 @@ public class StorageListPresenter extends BasePresenter<StorageListContract.Mode ...@@ -72,8 +70,8 @@ public class StorageListPresenter extends BasePresenter<StorageListContract.Mode
Map<String, Object> map = new HashMap<>(6); Map<String, Object> map = new HashMap<>(6);
map.put("pageSize", 10); map.put("pageSize", 10);
map.put("pageIndex", pageIndex); map.put("pageIndex", pageIndex);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
map.put("status", status); map.put("status", status);
if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) { if (TextUtil.isNotEmptyOrNullOrUndefined(orderNo)) {
map.put("orderNo", orderNo); map.put("orderNo", orderNo);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/presenter/SupplierListPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter; ...@@ -2,7 +2,7 @@ package com.gingersoft.supply_chain.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -75,8 +75,8 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo ...@@ -75,8 +75,8 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo
Map<String, Object> map = new HashMap<>(5); Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", Constant.PAGE_SIZE); map.put("pageSize", Constant.PAGE_SIZE);
map.put("pageIndex", pageIndex * Constant.PAGE_SIZE); map.put("pageIndex", pageIndex * Constant.PAGE_SIZE);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId()); map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId()); map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(content)) { if (!TextUtil.isEmptyOrNullOrUndefined(content)) {
map.put("content", content); map.put("content", content);
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/DeputyUnitAdapter.java
...@@ -35,7 +35,7 @@ public class DeputyUnitAdapter extends BaseQuickAdapter<DeputyUnitBean, BaseView ...@@ -35,7 +35,7 @@ public class DeputyUnitAdapter extends BaseQuickAdapter<DeputyUnitBean, BaseView
protected void convert(@NotNull BaseViewHolder viewHolder, DeputyUnitBean item) { protected void convert(@NotNull BaseViewHolder viewHolder, DeputyUnitBean item) {
EditText edDeputyUnitName = viewHolder.getView(R.id.ed_deputy_unit_name); EditText edDeputyUnitName = viewHolder.getView(R.id.ed_deputy_unit_name);
EditText edConversionMultiple = viewHolder.getView(R.id.ed_deputy_unit_conversion_multiple); EditText edConversionMultiple = viewHolder.getView(R.id.ed_deputy_unit_conversion_multiple);
viewHolder.setText(R.id.tv_deputy_unit_title, "副單位" + viewHolder.getAdapterPosition() + 1); viewHolder.setText(R.id.tv_deputy_unit_title, "副單位" + (viewHolder.getAdapterPosition() + 1));
viewHolder.setText(R.id.ed_deputy_unit_name, item.getDeputyUnit()); viewHolder.setText(R.id.ed_deputy_unit_name, item.getDeputyUnit());
viewHolder.setText(R.id.ed_deputy_unit_conversion_multiple, item.getConversionMultiple()); viewHolder.setText(R.id.ed_deputy_unit_conversion_multiple, item.getConversionMultiple());
if (TextUtil.isEmptyOrNullOrUndefined(item.getDeputyUnit())) { if (TextUtil.isEmptyOrNullOrUndefined(item.getDeputyUnit())) {
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/OrderDetailsFoodAdapter.java
package com.gingersoft.supply_chain.mvp.ui.adapter; package com.gingersoft.supply_chain.mvp.ui.adapter;
import android.content.Context; import android.content.Context;
import android.view.View;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.viewholder.BaseViewHolder; import com.chad.library.adapter.base.viewholder.BaseViewHolder;
...@@ -33,18 +37,33 @@ public class OrderDetailsFoodAdapter extends BaseQuickAdapter<PurchaseOrderDetai ...@@ -33,18 +37,33 @@ public class OrderDetailsFoodAdapter extends BaseQuickAdapter<PurchaseOrderDetai
protected void convert(@NotNull BaseViewHolder viewHolder, PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean item) { protected void convert(@NotNull BaseViewHolder viewHolder, PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean item) {
viewHolder.setText(R.id.tv_order_details_item_food_name, item.getName()); viewHolder.setText(R.id.tv_order_details_item_food_name, item.getName());
viewHolder.setText(R.id.tv_order_details_item_purchasing_unit, item.getUnit_content()); viewHolder.setText(R.id.tv_order_details_item_purchasing_unit, item.getUnit_content());
viewHolder.setText(R.id.tv_order_details_item_purchasing_unit_price, String.valueOf(item.getFoodPrice())); viewHolder.setText(R.id.tv_order_details_item_purchasing_unit_price, "$" + item.getFoodPrice());
viewHolder.setText(R.id.tv_order_details_item_num, String.valueOf(item.getFoodQuantity())); viewHolder.setText(R.id.tv_order_details_item_num, String.valueOf(item.getFoodQuantity()));
//保存下來總價，用於計算所有食品的總價 //保存下來總價，用於計算所有食品的總價
item.setTotalAmount(MoneyUtil.priceCalculation(item.getFoodPrice(), item.getFoodQuantity())); item.setTotalAmount(MoneyUtil.priceCalculation(item.getFoodPrice(), item.getFoodQuantity()));
viewHolder.setText(R.id.tv_order_details_item_purchasing_total_amount, String.valueOf(item.getTotalAmount())); viewHolder.setText(R.id.tv_order_details_item_purchasing_total_amount, "$" + item.getTotalAmount());
//入庫單價 //入庫單價
// viewHolder.setText(R.id.tv_order_details_item_warehouse_total_amount, item.get); RecyclerView rvWarehouseUnit = viewHolder.getView(R.id.rv_warehouse_unit);
if (item.getWareHouseBeans() != null) {
rvWarehouseUnit.setVisibility(View.VISIBLE);
rvWarehouseUnit.setLayoutManager(new GridLayoutManager(context, 3));
WareHouseUnitAdapter wareHouseUnitAdapter = new WareHouseUnitAdapter(item.getWareHouseBeans());
rvWarehouseUnit.setAdapter(wareHouseUnitAdapter);
} else {
rvWarehouseUnit.setVisibility(View.GONE);
}
viewHolder.setBackgroundResource(R.id.iv_order_details_item_food_select, item.isChecked() ? R.drawable.ic_checkbox_checked : R.drawable.ic_checkbox_uncheck);
}
// LinearLayout warehouseUnitLayout = viewHolder.getView(R.id.layout_warehouse_unit); private static class WareHouseUnitAdapter extends BaseQuickAdapter<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean, BaseViewHolder> {
// View view = View.inflate(context, R.layout.item_order_details_food, null); public WareHouseUnitAdapter(List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean> wareHouseBeans) {
// warehouseUnitLayout.addView(view); super(R.layout.item_receiving_unit, wareHouseBeans);
}
viewHolder.setBackgroundResource(R.id.iv_order_details_item_food_select, item.isChecked() ? R.drawable.ic_checkbox_checked : R.drawable.ic_checkbox_uncheck); @Override
protected void convert(@NotNull BaseViewHolder viewHolder, PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean wareHouseBean) {
viewHolder.setText(R.id.tv_receiving_unit_title, wareHouseBean.getTitle());
viewHolder.setText(R.id.ed_receiving_unit_value, wareHouseBean.getValue());
}
} }
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/FoodUnitPageFragment.java
...@@ -13,9 +13,7 @@ import androidx.fragment.app.FragmentActivity; ...@@ -13,9 +13,7 @@ import androidx.fragment.app.FragmentActivity;
import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.chad.library.adapter.base.listener.OnItemChildClickListener;
import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerFoodUnitPageComponent; import com.gingersoft.supply_chain.di.component.DaggerFoodUnitPageComponent;
...@@ -31,6 +29,7 @@ import com.qmuiteam.qmui.alpha.QMUIAlphaTextView; ...@@ -31,6 +29,7 @@ import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import java.io.Serializable; import java.io.Serializable;
import java.util.Iterator;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
...@@ -91,20 +90,39 @@ public class FoodUnitPageFragment extends BaseSupplyChainFragment<FoodUnitPagePr ...@@ -91,20 +90,39 @@ public class FoodUnitPageFragment extends BaseSupplyChainFragment<FoodUnitPagePr
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.initData(getArguments()); mPresenter.initData(getArguments());
// if(arguments != null){
// arguments.getSerializable(DEPUTY_UNIT_KEY);
// }
// initTopBar(topBar, "填寫商品單位");
// mPresenter.getDeputyUnitList();
// mPresenter.loadDeputyUnit(null);
} }
@OnClick({R2.id.tv_add_deputy}) @OnClick({R2.id.tv_add_deputy, R2.id.tv_food_unit_complete})
public void onClick(View view) { public void onClick(View view) {
int viewId = view.getId(); int viewId = view.getId();
if (viewId == R.id.tv_add_deputy) { if (viewId == R.id.tv_add_deputy) {
//添加副單位 //添加副單位
mPresenter.addDeputyUnit(); mPresenter.addDeputyUnit();
} else if (viewId == R.id.tv_food_unit_complete) {
//添加單位完成，將副單位列表和主單位名稱傳回去
//拿到主單位
String basicUnit = edBasicUnit.getText() + "";
if (TextUtil.isEmptyOrNullOrUndefined(basicUnit)) {
showMessage("請輸入基本單位");
edBasicUnit.setError("請輸入基本單位");
return;
}
//拿到副單位集合
Bundle result = new Bundle();
result.putString(BASIC_UNIT_KEY, basicUnit);
if (deputyUnitAdapter != null) {
List<DeputyUnitBean> data = deputyUnitAdapter.getData();
Iterator<DeputyUnitBean> iterator = data.iterator();
while (iterator.hasNext()){
if(TextUtil.isEmptyOrNullOrUndefined(iterator.next().getDeputyUnit())){
//單位為空，移除掉
iterator.remove();
}
}
result.putSerializable(DEPUTY_UNIT_KEY, (Serializable) data);
}
setFragmentResult(RESULT_OK, result);
killMyself();
} }
} }
...@@ -145,4 +163,9 @@ public class FoodUnitPageFragment extends BaseSupplyChainFragment<FoodUnitPagePr ...@@ -145,4 +163,9 @@ public class FoodUnitPageFragment extends BaseSupplyChainFragment<FoodUnitPagePr
deputyUnitAdapter.setList(deputyUnitBeans); deputyUnitAdapter.setList(deputyUnitBeans);
} }
} }
@Override
public void initTopBar(String title) {
initTopBar(topBar, title);
}
} }
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/food/NewFoodIngredientsFragment.java
...@@ -35,6 +35,7 @@ import com.gingersoft.gsa.cloud.ui.utils.AppDialog; ...@@ -35,6 +35,7 @@ import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerNewFoodIngredientsComponent; import com.gingersoft.supply_chain.di.component.DaggerNewFoodIngredientsComponent;
import com.gingersoft.supply_chain.mvp.bean.DeputyUnitBean;
import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean; import com.gingersoft.supply_chain.mvp.bean.FoodPackingSpecificationBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseFoodBean;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean; import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
...@@ -61,6 +62,8 @@ import butterknife.OnClick; ...@@ -61,6 +62,8 @@ import butterknife.OnClick;
import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST; import static com.gingersoft.gsa.cloud.ui.recylcler.decorator.DividerItemDecoration.VERTICAL_LIST;
import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_CATEGORY_DATA_KEY; import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_CATEGORY_DATA_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.category.CategorySelectFragment.SELECT_FOOD_CATEGORY_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodUnitPageFragment.BASIC_UNIT_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.food.FoodUnitPageFragment.DEPUTY_UNIT_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.FOOD_PACKING_SPECIFICATION_DATA_KEY; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.FOOD_PACKING_SPECIFICATION_DATA_KEY;
import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE;
import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_RESULT_CODE; import static com.gingersoft.supply_chain.mvp.ui.fragment.food.PackageSpecificationFragment.SELECT_PACKAGE_SPECIFICATION_RESULT_CODE;
...@@ -148,13 +151,13 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -148,13 +151,13 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
isUpdate = false; isUpdate = false;
initTopBar(topbarNewFoodIngredients, "新增食材"); initTopBar(topbarNewFoodIngredients, "新增食材");
purchaseFoodBean = new PurchaseFoodBean(); purchaseFoodBean = new PurchaseFoodBean();
purchaseFoodBean.setFoodCategoryName(arguments.getString(CATEGORY_NAME_KEY));
purchaseFoodBean.setSupplierName(arguments.getString(SUPPLIER_NAME_KEY));
} else { } else {
isUpdate = true; isUpdate = true;
mPresenter.setPurchaseFoodBean(purchaseFoodBean); mPresenter.setPurchaseFoodBean(purchaseFoodBean);
initTopBar(topbarNewFoodIngredients, "編輯食材"); initTopBar(topbarNewFoodIngredients, "編輯食材");
} }
purchaseFoodBean.setFoodCategoryName(arguments.getString(CATEGORY_NAME_KEY));
purchaseFoodBean.setSupplierName(arguments.getString(SUPPLIER_NAME_KEY));
} }
infoMultiAdapter = new InfoMultiAdapter(mContext, mPresenter.getFragmentInfo()); infoMultiAdapter = new InfoMultiAdapter(mContext, mPresenter.getFragmentInfo());
rvNewFoodIngredients.addItemDecoration(new DividerItemDecoration(mContext, VERTICAL_LIST)); rvNewFoodIngredients.addItemDecoration(new DividerItemDecoration(mContext, VERTICAL_LIST));
...@@ -262,10 +265,11 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -262,10 +265,11 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
if (supplierInfoBean != null) { if (supplierInfoBean != null) {
mPresenter.setSupplierInfo(supplierInfoBean, infoMultiAdapter.getData()); mPresenter.setSupplierInfo(supplierInfoBean, infoMultiAdapter.getData());
} }
} else if (requestCode == SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE && resultCode == SELECT_PACKAGE_SPECIFICATION_RESULT_CODE) { } else if (requestCode == SELECT_PACKAGE_SPECIFICATION_REQUEST_CODE && resultCode == RESULT_OK) {
//選擇包裝規格 //基本單位和副單位
List<FoodPackingSpecificationBean> foodPackingSpecifications = (List<FoodPackingSpecificationBean>) data.get(FOOD_PACKING_SPECIFICATION_DATA_KEY); String basicUnitName = data.getString(BASIC_UNIT_KEY);
mPresenter.setPackingInfo(foodPackingSpecifications, infoMultiAdapter.getData()); List<DeputyUnitBean> deputyUnitBeans = (List<DeputyUnitBean>) data.getSerializable(DEPUTY_UNIT_KEY);
mPresenter.setPackingInfo(basicUnitName, deputyUnitBeans, infoMultiAdapter.getData());
} else if (requestCode == SELECT_FOOD_CATEGORY_REQUEST_CODE) { } else if (requestCode == SELECT_FOOD_CATEGORY_REQUEST_CODE) {
//選擇食材類別 //選擇食材類別
List<SectionCheckItem> sectionCheckItems = (List<SectionCheckItem>) data.get(SELECT_CATEGORY_DATA_KEY); List<SectionCheckItem> sectionCheckItems = (List<SectionCheckItem>) data.get(SELECT_CATEGORY_DATA_KEY);
...@@ -280,7 +284,7 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -280,7 +284,7 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
if (requestCode == CHOOSE_PHOTO && resultCode == RESULT_OK) { if (requestCode == CHOOSE_PHOTO && resultCode == RESULT_OK) {
//從相冊選取完圖片之後， //從相冊選取完圖片之後
if (data != null) { if (data != null) {
Uri uri = data.getData(); Uri uri = data.getData();
if (uri != null) { if (uri != null) {
...@@ -294,7 +298,6 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -294,7 +298,6 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
crop(mCameraUri); crop(mCameraUri);
} else if (requestCode == REQUEST_CROP && resultCode == RESULT_OK && data != null) { } else if (requestCode == REQUEST_CROP && resultCode == RESULT_OK && data != null) {
final Uri resultUri = UCrop.getOutput(data); final Uri resultUri = UCrop.getOutput(data);
Log.e("eee", "路徑：" + resultUri);
if (resultUri != null) { if (resultUri != null) {
String filePath = FileUtils.getFilePathByUri(mContext, resultUri); String filePath = FileUtils.getFilePathByUri(mContext, resultUri);
if (!TextUtils.isEmpty(filePath)) { if (!TextUtils.isEmpty(filePath)) {
...@@ -317,141 +320,56 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -317,141 +320,56 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
} }
/** /**
* Try to return the absolute file path from the given Uri * uri轉換為文件路徑，適配android Q
* *
* @param context * @param uri 私有uri
* @param uri * @return 轉換到沙盒文件的文件
* @return the file path or null
*/ */
public static String getRealFilePath(final Context context, final Uri uri) {
if (null == uri) {
return null;
}
final String scheme = uri.getScheme();
String data = null;
if (scheme == null) {
data = uri.getPath();
} else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
data = uri.getPath();
} else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
Cursor cursor = context.getContentResolver().query(uri, new String[]{MediaStore.Images.ImageColumns.DATA}, null, null, null);
if (null != cursor) {
if (cursor.moveToFirst()) {
int index = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
if (index > -1) {
data = cursor.getString(index);
}
}
cursor.close();
}
}
return data;
}
public File uriToFileApiQ(Uri uri) { public File uriToFileApiQ(Uri uri) {
File file = null; File file = null;
//android10以上转换 //android10以上转换
if (uri.getScheme().equals(ContentResolver.SCHEME_FILE)) { String scheme = uri.getScheme();
file = new File(uri.getPath()); if (scheme != null) {
} else if (uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) { if (scheme.equals(ContentResolver.SCHEME_FILE)) {
//把文件复制到沙盒目录 String path = uri.getPath();
ContentResolver contentResolver = mContext.getContentResolver(); if (path != null) {
Cursor cursor = contentResolver.query(uri, null, null, null, null); file = new File(path);
if (cursor.moveToFirst()) {
String displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
try {
InputStream is = contentResolver.openInputStream(uri);
File cache = new File(mContext.getExternalCacheDir().getAbsolutePath(), Math.round((Math.random() + 1) * 1000) + displayName);
FileOutputStream fos = new FileOutputStream(cache);
android.os.FileUtils.copy(is, fos);
file = cache;
fos.close();
is.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return file;
}
//用于保存拍照图片的uri
private Uri mCameraUri;
// 用于保存图片的文件路径，Android 10以下使用图片路径访问图片
private String mCameraImagePath;
// 是否是Android 10以上手机
private boolean isAndroidQ = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
/**
* 调起相机拍照
*/
private void openCamera() {
Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
// 判断是否有相机
if (captureIntent.resolveActivity(mContext.getPackageManager()) != null) {
File photoFile = null;
Uri photoUri = null;
if (isAndroidQ) {
// 适配android 10
photoUri = createImageUri();
} else {
try {
photoFile = createImageFile();
} catch (IOException e) {
e.printStackTrace();
} }
} else if (uri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
if (photoFile != null) { //把文件复制到沙盒目录
mCameraImagePath = photoFile.getAbsolutePath(); ContentResolver contentResolver = mContext.getContentResolver();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { Cursor cursor = contentResolver.query(uri, null, null, null, null);
//适配Android 7.0文件权限，通过FileProvider创建一个content类型的Uri if (cursor != null && cursor.moveToFirst()) {
photoUri = FileProvider.getUriForFile(mContext, mContext.getPackageName() + ".fileprovider", photoFile); String displayName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
} else { try {
photoUri = Uri.fromFile(photoFile); InputStream is = contentResolver.openInputStream(uri);
File externalCacheDir = mContext.getExternalCacheDir();
if (externalCacheDir != null) {
File cache = new File(mContext.getExternalCacheDir().getAbsolutePath(), Math.round((Math.random() + 1) * 1000) + displayName);
FileOutputStream fos = new FileOutputStream(cache);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && is != null) {
android.os.FileUtils.copy(is, fos);
}
file = cache;
fos.close();
}
if (is != null) {
is.close();
}
cursor.close();
} catch (IOException e) {
e.printStackTrace();
} }
} }
} }
mCameraUri = photoUri;
if (photoUri != null) {
captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, photoUri);
captureIntent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
startActivityForResult(captureIntent, TAKE_PHOTO);
}
} }
return file;
} }
/** /**
* 创建图片地址uri,用于保存拍照后的照片 Android 10以后使用这种方法 * 用于保存拍照图片的uri
*/ */
private Uri createImageUri() { private Uri mCameraUri;
String status = Environment.getExternalStorageState();
// 判断是否有SD卡,优先使用SD卡存储,当没有SD卡时使用手机存储
if (status.equals(Environment.MEDIA_MOUNTED)) {
return mContext.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, new ContentValues());
} else {
return mContext.getContentResolver().insert(MediaStore.Images.Media.INTERNAL_CONTENT_URI, new ContentValues());
}
}
// /**
// * 创建保存图片的文件
// */
// private File createImageFile() throws IOException {
// String imageName = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date());
// File storageDir = mContext.getExternalFilesDir(Environment.DIRECTORY_PICTURES);
// if (!storageDir.exists()) {
// storageDir.mkdir();
// }
// File tempFile = new File(storageDir, imageName);
// if (!Environment.MEDIA_MOUNTED.equals(EnvironmentCompat.getStorageState(tempFile))) {
// return null;
// }
// return tempFile;
// }
@Override @Override
public void refreshAdapterByPosition(int position) { public void refreshAdapterByPosition(int position) {
...@@ -462,13 +380,6 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI ...@@ -462,13 +380,6 @@ public class NewFoodIngredientsFragment extends BaseSupplyChainFragment<NewFoodI
@Override @Override
public void uploadPicSuccess(List<String> picUrl) { public void uploadPicSuccess(List<String> picUrl) {
// List<InfoMultiBean> data = infoMultiAdapter.getData();
// InfoMultiBean infoMultiBean = data.get(mPresenter.picIndex);
// if (infoMultiBean instanceof UploadPicMultiBean) {
// UploadPicMultiBean uploadPicMultiBean = (UploadPicMultiBean) infoMultiBean;
// uploadPicMultiBean.setPicUrl(picUrl);
// refreshAdapterByPosition(mPresenter.picIndex);
// }
mPresenter.setPicUrl(infoMultiAdapter.getData(), picUrl); mPresenter.setPicUrl(infoMultiAdapter.getData(), picUrl);
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/OrderDetailsFragment.java
...@@ -17,6 +17,7 @@ import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; ...@@ -17,6 +17,7 @@ import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerOrderDetailsComponent; import com.gingersoft.supply_chain.di.component.DaggerOrderDetailsComponent;
import com.gingersoft.supply_chain.mvp.bean.DeputyUnitBean;
import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean; import com.gingersoft.supply_chain.mvp.bean.PurchaseOrderDetailsBean;
import com.gingersoft.supply_chain.mvp.contract.OrderDetailsContract; import com.gingersoft.supply_chain.mvp.contract.OrderDetailsContract;
import com.gingersoft.supply_chain.mvp.presenter.OrderDetailsPresenter; import com.gingersoft.supply_chain.mvp.presenter.OrderDetailsPresenter;
...@@ -26,6 +27,9 @@ import com.jess.arms.di.component.AppComponent; ...@@ -26,6 +27,9 @@ import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView; import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar; import com.qmuiteam.qmui.widget.QMUITopBar;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
...@@ -100,7 +104,6 @@ public class OrderDetailsFragment extends BaseSupplyChainFragment<OrderDetailsPr ...@@ -100,7 +104,6 @@ public class OrderDetailsFragment extends BaseSupplyChainFragment<OrderDetailsPr
supplyTopBar.addRightImageButton(R.drawable.ic_white_delete, R.id.qmui_delete_order).setOnClickListener(v -> { supplyTopBar.addRightImageButton(R.drawable.ic_white_delete, R.id.qmui_delete_order).setOnClickListener(v -> {
//刪除訂單 //刪除訂單
}); });
Bundle arguments = getArguments(); Bundle arguments = getArguments();
if (arguments != null) { if (arguments != null) {
int orderId = arguments.getInt(ORDER_DETAILS_ORDER_ID, 0); int orderId = arguments.getInt(ORDER_DETAILS_ORDER_ID, 0);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/PurchaseListFragment.java
...@@ -235,6 +235,8 @@ public class PurchaseListFragment extends BaseSupplyChainFragment<PurchaseListPr ...@@ -235,6 +235,8 @@ public class PurchaseListFragment extends BaseSupplyChainFragment<PurchaseListPr
@Override @Override
public void loadOrderList(List<OrderBean> list) { public void loadOrderList(List<OrderBean> list) {
refreshPurchaseList.finishRefresh();
refreshPurchaseList.finishLoadMore();
loadService.showCallback(SuccessCallback.class); loadService.showCallback(SuccessCallback.class);
purchaseOrderAdapter.setList(list); purchaseOrderAdapter.setList(list);
} }
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/fragment/order/ShoppingCatFragment.java
package com.gingersoft.supply_chain.mvp.ui.fragment.order; package com.gingersoft.supply_chain.mvp.ui.fragment.order;
import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -13,6 +14,7 @@ import androidx.annotation.Nullable; ...@@ -13,6 +14,7 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
import com.gingersoft.supply_chain.R; import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2; import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerShoppingCatComponent; import com.gingersoft.supply_chain.di.component.DaggerShoppingCatComponent;
...@@ -121,7 +123,10 @@ public class ShoppingCatFragment extends BaseSupplyChainFragment<ShoppingCatPres ...@@ -121,7 +123,10 @@ public class ShoppingCatFragment extends BaseSupplyChainFragment<ShoppingCatPres
} }
if (isHasChecked) { if (isHasChecked) {
//關閉選擇食材的頁面 //關閉選擇食材的頁面
mPresenter.addPurchaseOrder(); AppDialog.getInstance().showWaringDialog(mContext, "確認創建採購單？", (view, dialog) -> {
dialog.dismiss();
mPresenter.addPurchaseOrder();
});
} else { } else {
showMessage("請選擇食品"); showMessage("請選擇食品");
} }
......
component-supply-chain/src/main/res/layout/fragment_purchase_list.xml
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5" android:layout_marginRight="@dimen/dp_5"
android:maxLines="1"
android:maxLength="20"
android:background="@null" android:background="@null"
android:hint="訂單編號" android:hint="訂單編號"
android:maxLength="20"
android:maxLines="1"
android:textColor="@color/theme_333_color" android:textColor="@color/theme_333_color"
android:textColorHint="@color/hint_color" android:textColorHint="@color/hint_color"
android:textSize="@dimen/dp_16" /> android:textSize="@dimen/dp_16" />
...@@ -106,7 +106,10 @@ ...@@ -106,7 +106,10 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout <com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_purchase_list" android:id="@+id/srl_purchase_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
app:srlAccentColor="@color/theme_333_color"
app:srlEnablePreviewInEditMode="true"
app:srlPrimaryColor="@color/trans">
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/contentViewPager" android:id="@+id/contentViewPager"
......
component-supply-chain/src/main/res/layout/item_order_details_food.xml
...@@ -143,11 +143,10 @@ ...@@ -143,11 +143,10 @@
tools:text="$100.00" /> tools:text="$100.00" />
</LinearLayout> </LinearLayout>
<LinearLayout <androidx.recyclerview.widget.RecyclerView
android:id="@+id/layout_warehouse_unit" android:id="@+id/rv_warehouse_unit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:orientation="horizontal" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
component-supply-chain/src/main/res/layout/item_receiving_unit.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_5"
android:orientation="vertical">
<TextView
android:id="@+id/tv_receiving_unit_title"
style="@style/TextStyle_3C_16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textStyle="bold"
tools:text="單價(HKD)" />
<EditText
android:id="@+id/ed_receiving_unit_value"
style="@style/AppEditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/shape_border_no_corner_bg"
android:gravity="center"
android:inputType="number"
android:maxLength="9"
android:maxLines="1"
android:paddingTop="@dimen/dp_7"
android:paddingBottom="@dimen/dp_7"
android:textColor="@color/color_3c"
android:textStyle="bold"
tools:text="100" />
</LinearLayout>
\ No newline at end of file
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/table/action/PrintSkyorderAction.java
...@@ -8,7 +8,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult; ...@@ -8,7 +8,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans; import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.print.bean.PrintQRCodeContent; import com.gingersoft.gsa.cloud.print.bean.PrintQRCodeContent;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
...@@ -89,7 +89,7 @@ public class PrintSkyorderAction extends TableAction { ...@@ -89,7 +89,7 @@ public class PrintSkyorderAction extends TableAction {
@Override @Override
public void onPrint(FoodSummary foodSummary, int person, String endTime) { public void onPrint(FoodSummary foodSummary, int person, String endTime) {
mTablePresenter.addScan(ResturantInfoManager.newInstance().getGsPosShopId(), tableBean.getId(), tableBean.getTableNumber(), tableBean.getTableName(), mTablePresenter.addScan(RestaurantInfoManager.newInstance().getGsPosShopId(), tableBean.getId(), tableBean.getTableNumber(), tableBean.getTableName(),
person, UserContext.newInstance().getMemberName(), endTime, foodSummary.getId(), new OnNetworkCallbackListener<BaseResult>() { person, UserContext.newInstance().getMemberName(), endTime, foodSummary.getId(), new OnNetworkCallbackListener<BaseResult>() {
@Override @Override
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/BaseOrderPresenter.java
...@@ -8,7 +8,7 @@ import com.billy.cc.core.component.CC; ...@@ -8,7 +8,7 @@ import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant; import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
...@@ -959,7 +959,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex ...@@ -959,7 +959,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
TableBean.DataBean tableBean = mDoshokuOrder.getOpenTableInfo(); TableBean.DataBean tableBean = mDoshokuOrder.getOpenTableInfo();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
CreateOrderRequest request = new CreateOrderRequest(); CreateOrderRequest request = new CreateOrderRequest();
request.setTableNumber(tableBean.getTableNumber()); request.setTableNumber(tableBean.getTableNumber());
request.setOrderDetails(orderDetailBeanToFoodRequest(newFoodList)); request.setOrderDetails(orderDetailBeanToFoodRequest(newFoodList));
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java
...@@ -12,7 +12,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; ...@@ -12,7 +12,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.MealConstant; import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
...@@ -742,7 +742,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -742,7 +742,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
public void getCurrentSoldoutFood() { public void getCurrentSoldoutFood() {
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId)) .add("restaurantId", String.valueOf(restaurantId))
.build(); .build();
...@@ -1004,8 +1004,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod ...@@ -1004,8 +1004,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
} }
public void getRestaurantFoodReason() { public void getRestaurantFoodReason() {
int brandId = ResturantInfoManager.newInstance().getBrandId(); int brandId = RestaurantInfoManager.newInstance().getBrandId();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
int type = 1; int type = 1;
mModel.getRestaurantFoodReason(brandId, restaurantId, type) mModel.getRestaurantFoodReason(brandId, restaurantId, type)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -13,7 +13,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; ...@@ -13,7 +13,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants; import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans; import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.common.core.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.table.TableExtBean; import com.gingersoft.gsa.cloud.common.core.table.TableExtBean;
...@@ -535,7 +535,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra ...@@ -535,7 +535,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
} }
public void getTables(boolean show, RefreshLayout refreshLayout) { public void getTables(boolean show, RefreshLayout refreshLayout) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getTables(restaurantId) mModel.getTables(restaurantId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
...@@ -7,7 +7,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult; ...@@ -7,7 +7,7 @@ import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans; import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
...@@ -102,8 +102,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model ...@@ -102,8 +102,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
} }
public void getPayMethods() { public void getPayMethods() {
int brandId = ResturantInfoManager.newInstance().getBrandId(); int brandId = RestaurantInfoManager.newInstance().getBrandId();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getPayMethods(brandId, restaurantId, FoodSummaryConstans.RESTAURANT_MODE) mModel.getPayMethods(brandId, restaurantId, FoodSummaryConstans.RESTAURANT_MODE)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/SoldoutCtrlPresenter.java
...@@ -4,7 +4,7 @@ import android.app.Application; ...@@ -4,7 +4,7 @@ import android.app.Application;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.MealConstant; import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
...@@ -517,7 +517,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode ...@@ -517,7 +517,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
} }
public void getCurrentSoldoutFood() { public void getCurrentSoldoutFood() {
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId)) .add("restaurantId", String.valueOf(restaurantId))
.build(); .build();
...@@ -793,7 +793,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode ...@@ -793,7 +793,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
// RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request)); // RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
// String json = GsonUtils.GsonString(request); // String json = GsonUtils.GsonString(request);
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId)) .add("restaurantId", String.valueOf(restaurantId))
.build(); .build();
...@@ -873,8 +873,8 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode ...@@ -873,8 +873,8 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
private SoldoutRequest.Insert getInsertSoldoutRequest(Long foodId, Long modifierId, int remainingNumber) { private SoldoutRequest.Insert getInsertSoldoutRequest(Long foodId, Long modifierId, int remainingNumber) {
SoldoutRequest.Insert request = new SoldoutRequest.Insert(); SoldoutRequest.Insert request = new SoldoutRequest.Insert();
request.setBrandId(ResturantInfoManager.newInstance().getBrandId()); request.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
request.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId()); request.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
if (foodId != null) { if (foodId != null) {
request.setFoodId(foodId); request.setFoodId(foodId);
} }
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
...@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.app.GsaCloudApplication; ...@@ -9,7 +9,7 @@ import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants; import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.table.TableExtBean; import com.gingersoft.gsa.cloud.common.core.table.TableExtBean;
import com.gingersoft.gsa.cloud.common.function.XFunctionManager; import com.gingersoft.gsa.cloud.common.function.XFunctionManager;
...@@ -233,7 +233,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -233,7 +233,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
public void getTables(boolean show, RefreshLayout refreshLayout) { public void getTables(boolean show, RefreshLayout refreshLayout) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId() != 0 ? ResturantInfoManager.newInstance().getRestaurantId() : 26; int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId() != 0 ? RestaurantInfoManager.newInstance().getRestaurantId() : 26;
mModel.getTables(restaurantId) mModel.getTables(restaurantId)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> { .doOnSubscribe(disposable -> {
...@@ -769,7 +769,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont ...@@ -769,7 +769,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
} }
public void getFoodSummarys(OnNetworkCallbackListener networkCallBackListener) { public void getFoodSummarys(OnNetworkCallbackListener networkCallBackListener) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
byte businessType = FoodSummary.BUSINESS_TYPE_SKYORDER; byte businessType = FoodSummary.BUSINESS_TYPE_SKYORDER;
mModel.getFoodSummarys(restaurantId, false, businessType) mModel.getFoodSummarys(restaurantId, false, businessType)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/orderManager/OrderCenterPresenter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.table.mvp.presenter.orderManager;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.bean.BaseResult; import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
...@@ -80,7 +80,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -80,7 +80,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
* @param isLoadMore * @param isLoadMore
*/ */
public void loadOrderList(String orderType, int pageIndex, int pageSize, RefreshLayout refreshLayout, boolean isLoadMore) { public void loadOrderList(String orderType, int pageIndex, int pageSize, RefreshLayout refreshLayout, boolean isLoadMore) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (pageIndex != 0) { if (pageIndex != 0) {
//根據數據庫下標分頁 //根據數據庫下標分頁
pageIndex = pageIndex * pageSize; pageIndex = pageIndex * pageSize;
...@@ -167,7 +167,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode ...@@ -167,7 +167,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
* @param orderId * @param orderId
*/ */
public void cancelOrder(long orderId, String orderType) { public void cancelOrder(long orderId, String orderType) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId(); int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.cancelOrder(orderId, restaurantId, orderType) mModel.cancelOrder(orderId, restaurantId, orderType)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(null)) .doOnSubscribe(disposable -> mRootView.showLoading(null))
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
...@@ -39,7 +39,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; ...@@ -39,7 +39,7 @@ import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants; import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.constans.MealConstant; import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.core.member.MemberInfo; import com.gingersoft.gsa.cloud.common.core.member.MemberInfo;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.scan.ScanHelper; import com.gingersoft.gsa.cloud.common.scan.ScanHelper;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils; import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
...@@ -462,7 +462,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -462,7 +462,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override @Override
public int getRestaurantId() { public int getRestaurantId() {
return ResturantInfoManager.newInstance().getRestaurantId(); return RestaurantInfoManager.newInstance().getRestaurantId();
} }
@Override @Override
...@@ -612,7 +612,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -612,7 +612,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override @Override
public void onInputPhone(UseMemberDialog dialog, String phone) { public void onInputPhone(UseMemberDialog dialog, String phone) {
TableBean.DataBean dataBean = DoshokuOrder.getInstance().getOpenTableInfo(); TableBean.DataBean dataBean = DoshokuOrder.getInstance().getOpenTableInfo();
mPresenter.queryMember(2, phone, ResturantInfoManager.newInstance().getGsPosShopId(), dataBean.getId(), dataBean.getTableNumber()); mPresenter.queryMember(2, phone, RestaurantInfoManager.newInstance().getGsPosShopId(), dataBean.getId(), dataBean.getTableNumber());
} }
@Override @Override
...@@ -1335,7 +1335,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> ...@@ -1335,7 +1335,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
return; return;
} }
TableBean.DataBean dataBean = DoshokuOrder.getInstance().getOpenTableInfo(); TableBean.DataBean dataBean = DoshokuOrder.getInstance().getOpenTableInfo();
mPresenter.queryMember(1, qrCodeResult, ResturantInfoManager.newInstance().getGsPosShopId(), dataBean.getId(), dataBean.getTableNumber()); mPresenter.queryMember(1, qrCodeResult, RestaurantInfoManager.newInstance().getGsPosShopId(), dataBean.getId(), dataBean.getTableNumber());
} }
} }
......
component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/OrderContentActivity.java
...@@ -26,7 +26,7 @@ import androidx.viewpager.widget.ViewPager; ...@@ -26,7 +26,7 @@ import androidx.viewpager.widget.ViewPager;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans; import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.table.TableBean; import com.gingersoft.gsa.cloud.common.core.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.scan.ScanHelper; import com.gingersoft.gsa.cloud.common.scan.ScanHelper;
...@@ -621,7 +621,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese ...@@ -621,7 +621,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
return; return;
} }
} }
mPresenter.queryCoupon(memberId, couponMemberId, qrCodeContent[1], ResturantInfoManager.newInstance().getRestaurantId()); mPresenter.queryCoupon(memberId, couponMemberId, qrCodeContent[1], RestaurantInfoManager.newInstance().getRestaurantId());
} }
} }
} catch (Exception e) { } catch (Exception e) {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/restaurant/ResturantInfoManager.java → library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/restaurant/RestaurantInfoManager.java
...@@ -11,9 +11,9 @@ import com.gingersoft.gsa.cloud.common.utils.other.SPUtils; ...@@ -11,9 +11,9 @@ import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
* @update date: 2020-11-21 * @update date: 2020-11-21
* @description:品牌餐廳信息管理lei * @description:品牌餐廳信息管理lei
*/ */
public class ResturantInfoManager { public class RestaurantInfoManager {
private static ResturantInfoManager sResturantInfoManager = null; private static RestaurantInfoManager sRestaurantInfoManager = null;
/** /**
* 品牌信息 * 品牌信息
...@@ -24,7 +24,7 @@ public class ResturantInfoManager { ...@@ -24,7 +24,7 @@ public class ResturantInfoManager {
*/ */
private RestaurantInfo restaurantInfo; private RestaurantInfo restaurantInfo;
private ResturantInfoManager() { private RestaurantInfoManager() {
if (brandInfo == null) { if (brandInfo == null) {
brandInfo = new BrandInfo(); brandInfo = new BrandInfo();
} }
...@@ -38,15 +38,15 @@ public class ResturantInfoManager { ...@@ -38,15 +38,15 @@ public class ResturantInfoManager {
restaurantInfo.setRestaurantName((String) SPUtils.get(UserConstans.restaurantName, "")); restaurantInfo.setRestaurantName((String) SPUtils.get(UserConstans.restaurantName, ""));
} }
public static ResturantInfoManager newInstance() { public static RestaurantInfoManager newInstance() {
if (sResturantInfoManager == null) { if (sRestaurantInfoManager == null) {
synchronized (ResturantInfoManager.class) { synchronized (RestaurantInfoManager.class) {
if (sResturantInfoManager == null) { if (sRestaurantInfoManager == null) {
sResturantInfoManager = new ResturantInfoManager(); sRestaurantInfoManager = new RestaurantInfoManager();
} }
} }
} }
return sResturantInfoManager; return sRestaurantInfoManager;
} }
public int getRestaurantId() { public int getRestaurantId() {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/restaurant/utils/RestaurantInfoUtils.java
...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.common.core.restaurant.utils; ...@@ -3,7 +3,7 @@ package com.gingersoft.gsa.cloud.common.core.restaurant.utils;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils; import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean; import com.gingersoft.gsa.cloud.common.core.restaurant.bean.BrandsBean;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -18,7 +18,7 @@ import java.util.List; ...@@ -18,7 +18,7 @@ import java.util.List;
public class RestaurantInfoUtils { public class RestaurantInfoUtils {
public static List<BrandsBean.BrandsData> getBrandList() { public static List<BrandsBean.BrandsData> getBrandList() {
String brandRestaurantInfos = ResturantInfoManager.getBrandRestaurantInfos(); String brandRestaurantInfos = RestaurantInfoManager.getBrandRestaurantInfos();
if (!TextUtils.isEmpty(brandRestaurantInfos)) { if (!TextUtils.isEmpty(brandRestaurantInfos)) {
List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class); List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class);
return brandsBeans; return brandsBeans;
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/user/UserContext.java
package com.gingersoft.gsa.cloud.common.core.user; package com.gingersoft.gsa.cloud.common.core.user;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.info.UserInfo; import com.gingersoft.gsa.cloud.common.core.user.info.UserInfo;
import com.gingersoft.gsa.cloud.common.core.user.state.LoginedState; import com.gingersoft.gsa.cloud.common.core.user.state.LoginedState;
import com.gingersoft.gsa.cloud.common.core.user.state.LogoutState; import com.gingersoft.gsa.cloud.common.core.user.state.LogoutState;
...@@ -109,8 +109,8 @@ public class UserContext { ...@@ -109,8 +109,8 @@ public class UserContext {
SPUtils.remove(UserConstans.memberId); SPUtils.remove(UserConstans.memberId);
SPUtils.remove(UserConstans.memberName); SPUtils.remove(UserConstans.memberName);
//刪除用戶信息的同時 將品牌，餐廳信息一起刪除 //刪除用戶信息的同時 將品牌，餐廳信息一起刪除
ResturantInfoManager.newInstance().removeBrandInfo(); RestaurantInfoManager.newInstance().removeBrandInfo();
ResturantInfoManager.newInstance().removeResturantInfo(); RestaurantInfoManager.newInstance().removeResturantInfo();
} }
} }
library-common/src/main/java/com/gingersoft/gsa/cloud/common/service/GetInfoUpdateService.kt
...@@ -21,7 +21,7 @@ import androidx.core.app.NotificationCompat ...@@ -21,7 +21,7 @@ import androidx.core.app.NotificationCompat
import com.gingersoft.gsa.cloud.common.R import com.gingersoft.gsa.cloud.common.R
import com.gingersoft.gsa.cloud.common.constans.AppConstans import com.gingersoft.gsa.cloud.common.constans.AppConstans
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans import com.gingersoft.gsa.cloud.common.constans.HttpsConstans
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager
import com.gingersoft.gsa.cloud.common.core.user.UserContext import com.gingersoft.gsa.cloud.common.core.user.UserContext
import com.gingersoft.gsa.cloud.common.utils.SoundPoolUtils import com.gingersoft.gsa.cloud.common.utils.SoundPoolUtils
import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils
...@@ -65,7 +65,7 @@ class GetInfoUpdateService : Service() { ...@@ -65,7 +65,7 @@ class GetInfoUpdateService : Service() {
} }
val restaurantId by lazy { val restaurantId by lazy {
ResturantInfoManager.newInstance().getRestaurantId() RestaurantInfoManager.newInstance().getRestaurantId()
} }
override fun onBind(intent: Intent?): IBinder? { override fun onBind(intent: Intent?): IBinder? {
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/okhttpUtils/OkHttp3Utils.java
package com.gingersoft.gsa.cloud.common.utils.okhttpUtils; package com.gingersoft.gsa.cloud.common.utils.okhttpUtils;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.user.UserContext; import com.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
...@@ -228,14 +228,14 @@ public class OkHttp3Utils { ...@@ -228,14 +228,14 @@ public class OkHttp3Utils {
String restaurantInfo = DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()) + "|" + DeviceUtils.getVersionCode(GsaCloudApplication.getAppContext()) + String restaurantInfo = DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()) + "|" + DeviceUtils.getVersionCode(GsaCloudApplication.getAppContext()) +
"--" + TimeUtils.getCurrentDate(TimeUtils.DEFAULT_DATE_FORMAT) + "--" + TimeUtils.getCurrentDate(TimeUtils.DEFAULT_DATE_FORMAT) +
"--CODE：" + errCode + "--CODE：" + errCode +
"--餐廳:" + ResturantInfoManager.newInstance().getBrandName() + "--餐廳:" + RestaurantInfoManager.newInstance().getBrandName() +
"--" + ResturantInfoManager.newInstance().getRestaurantName() + "--" + RestaurantInfoManager.newInstance().getRestaurantName() +
"--ID：" + ResturantInfoManager.newInstance().getRestaurantId() + "--ID：" + RestaurantInfoManager.newInstance().getRestaurantId() +
"--用戶：" + UserContext.newInstance().getMemberName() + "|" + UserContext.newInstance().getMemberId() + "--用戶：" + UserContext.newInstance().getMemberName() + "|" + UserContext.newInstance().getMemberId() +
"--原因：" + pushContent; "--原因：" + pushContent;
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("code", errCode)//錯誤碼 .add("code", errCode)//錯誤碼
.add("shopId", ResturantInfoManager.newInstance().getGsPosShopId()) .add("shopId", RestaurantInfoManager.newInstance().getGsPosShopId())
.add("source", GsaCloudApplication.getAppName() + "")//錯誤來源 .add("source", GsaCloudApplication.getAppName() + "")//錯誤來源
.add("pushContent", restaurantInfo)//推送內容 .add("pushContent", restaurantInfo)//推送內容
.add("version", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()))//系統版本 .add("version", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()))//系統版本
......
library-common/src/main/res/values/styles.xml
...@@ -409,6 +409,7 @@ ...@@ -409,6 +409,7 @@
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/dp_14</item> <item name="android:textSize">@dimen/dp_14</item>
</style> </style>
<style name="AppEditTextStyle"> <style name="AppEditTextStyle">
<item name="android:textColorHint">@color/color_c9</item> <item name="android:textColorHint">@color/color_c9</item>
<item name="android:textSize">@dimen/dp_16</item> <item name="android:textSize">@dimen/dp_16</item>
...@@ -416,6 +417,7 @@ ...@@ -416,6 +417,7 @@
<item name="android:textColor">@color/color_3c</item> <item name="android:textColor">@color/color_3c</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
</style> </style>
<style name="otherOrder_delivery_setting_layout_style"> <style name="otherOrder_delivery_setting_layout_style">
<item name="android:paddingRight">@dimen/dp_20</item> <item name="android:paddingRight">@dimen/dp_20</item>
</style> </style>
...@@ -474,6 +476,11 @@ ...@@ -474,6 +476,11 @@
<item name="android:textSize">@dimen/dp_16</item> <item name="android:textSize">@dimen/dp_16</item>
</style> </style>
<style name="TextStyle_3C_16">
<item name="android:textColor">@color/color_3c</item>
<item name="android:textSize">@dimen/dp_16</item>
</style>
<style name="Base_Btn_Style"> <style name="Base_Btn_Style">
<item name="android:paddingTop">@dimen/dp_10</item> <item name="android:paddingTop">@dimen/dp_10</item>
<item name="android:paddingBottom">@dimen/dp_10</item> <item name="android:paddingBottom">@dimen/dp_10</item>
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/bean/adapter/PrintContentAdapter.java
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.print.bean.adapter; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.cloud.print.bean.adapter;
import com.gingersoft.gsa.cloud.common.constans.AppConstans; import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails; import com.gingersoft.gsa.cloud.common.core.delivery.OrderDetails;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager; import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport; import com.gingersoft.gsa.cloud.common.core.settlement.SettlementReport;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil; import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil; import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
...@@ -85,8 +85,8 @@ public class PrintContentAdapter implements AdaptationContent { ...@@ -85,8 +85,8 @@ public class PrintContentAdapter implements AdaptationContent {
} else { } else {
takeawayPrintContent = new PrintTakeawayFormContent(); takeawayPrintContent = new PrintTakeawayFormContent();
} }
takeawayPrintContent.setBrand(ResturantInfoManager.newInstance().getBrandName()); takeawayPrintContent.setBrand(RestaurantInfoManager.newInstance().getBrandName());
takeawayPrintContent.setResturantName(ResturantInfoManager.newInstance().getRestaurantName()); takeawayPrintContent.setResturantName(RestaurantInfoManager.newInstance().getRestaurantName());
if (data.getOrder_type() == 2) { if (data.getOrder_type() == 2) {
takeawayPrintContent.setOrderType("外送"); takeawayPrintContent.setOrderType("外送");
} else { } else {
......
library-ui/src/main/java/com/gingersoft/gsa/cloud/ui/utils/TimePickerUtils.java
...@@ -18,7 +18,35 @@ import java.util.Calendar; ...@@ -18,7 +18,35 @@ import java.util.Calendar;
* 時間選擇工具類 * 時間選擇工具類
*/ */
public class TimePickerUtils { public class TimePickerUtils {
/**
* 顯示開始時間到今天的時間
*/
public static TimePickerView showStartToTodayPicker(Context mContext, Calendar startTime, OnTimeSelectListener onTimeSelectListener) {
//獲取今年第一天的日期設置為結束時間和默認選中時間
Calendar cal = Calendar.getInstance();
cal.set(Calendar.DAY_OF_YEAR, cal.getActualMinimum(Calendar.DAY_OF_YEAR));
//打開時間選擇器
TimePickerView pvTime = new TimePickerBuilder(mContext, onTimeSelectListener)
.setType(new boolean[]{true, true, true, false, false, false})//默认全部显示
.setCancelText("取消")//取消按钮文字
.setSubmitText("確認")//确认按钮文字
.setContentTextSize(20)//滚轮文字大小
.setTitleSize(20)//标题文字大小
.setOutSideCancelable(true)//点击屏幕，点在控件外部范围时，是否取消显示
.isCyclic(false)//是否循环滚动
.setTextColorCenter(Color.BLACK)//设置选中项的颜色
.setTitleColor(Color.BLACK)//标题文字颜色
.setSubmitColor(Color.BLUE)//确定按钮文字颜色
.setCancelColor(Color.BLUE)//取消按钮文字颜色
.setRangDate(startTime, cal)//時間是今年第一天到今天
.setLabel("", "", "", "", "", "")
.isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
.build();
//設置默認選中時間
pvTime.setDate(cal);//注：根据需求来决定是否使用该方法（一般是精确到秒的情况），此项可以在弹出选择器的时候重新设置当前时间，避免在初始化之后由于时间已经设定，导致选中时间与当前时间不匹配的问题。
pvTime.show();
return pvTime;
}
/** /**
* 顯示報表頁面時間選擇樣式 * 顯示報表頁面時間選擇樣式
* *
...@@ -59,6 +87,13 @@ public class TimePickerUtils { ...@@ -59,6 +87,13 @@ public class TimePickerUtils {
} }
/** /**
* 默認選中結束時間
*/
public static TimePickerView showReportTimePicker(Context mContext, Calendar startTime, Calendar endTime, OnTimeSelectListener onTimeSelectListener) {
return showReportTimePicker(mContext, startTime, endTime, endTime, onTimeSelectListener);
}
/**
* @param mContext * @param mContext
* @param startTime 開始時間 * @param startTime 開始時間
* @param endTime 結束時間 * @param endTime 結束時間
...@@ -67,10 +102,6 @@ public class TimePickerUtils { ...@@ -67,10 +102,6 @@ public class TimePickerUtils {
* @return * @return
*/ */
public static TimePickerView showReportTimePicker(Context mContext, Calendar startTime, Calendar endTime, Calendar defaultTime, OnTimeSelectListener onTimeSelectListener) { public static TimePickerView showReportTimePicker(Context mContext, Calendar startTime, Calendar endTime, Calendar defaultTime, OnTimeSelectListener onTimeSelectListener) {
//獲取今年第一天的日期
Calendar cal = Calendar.getInstance();
cal.set(Calendar.DAY_OF_YEAR, cal.getActualMinimum(Calendar.DAY_OF_YEAR));
//打開時間選擇器 //打開時間選擇器
TimePickerView pvTime = new TimePickerBuilder(mContext, onTimeSelectListener) TimePickerView pvTime = new TimePickerBuilder(mContext, onTimeSelectListener)
.setType(new boolean[]{true, true, true, false, false, false}) .setType(new boolean[]{true, true, true, false, false, false})
......
library-ui/src/main/java/com/gingersoft/gsa/cloud/ui/view/NoSoftKeyboardEditText.java 0 → 100644
package com.gingersoft.gsa.cloud.ui.view;
import android.content.Context;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.widget.EditText;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatEditText;
import java.lang.reflect.Method;
/**
* @author 宇航.
* User: admin
* Date: 2021/1/5
* Time: 16:28
* Use: 不會彈出軟鍵盤的輸入框
*/
public class NoSoftKeyboardEditText extends AppCompatEditText {
public NoSoftKeyboardEditText(@NonNull Context context) {
super(context);
init();
}
public NoSoftKeyboardEditText(@NonNull Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
init();
}
public NoSoftKeyboardEditText(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public void init() {
Class<EditText> cls = EditText.class;
Method method;
try {
method = cls.getMethod("setShowSoftInputOnFocus", boolean.class);
method.setAccessible(true);
method.invoke(this, false);
} catch (Exception e) {
e.printStackTrace();
}
addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
setSelection(s.length());
}
});
}
}
library-ui/src/main/res/layout/item_multi_select.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<include layout="@layout/item_multi_title_layout" /> <include layout="@layout/item_multi_title_layout" />
<EditText <TextView
android:id="@+id/ed_multi_value" android:id="@+id/ed_multi_value"
style="@style/Multi_Input_editStyle" style="@style/Multi_Input_editStyle"
android:layout_width="0dp" android:layout_width="0dp"
......
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