Skip to content

S
supplier
Commit 0cb22cb8 by 宁斌
Options

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

parents 367cd0b3 36307038
Showing with 467 additions and 329 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;
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.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.restaurant.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
......@@ -132,7 +132,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
}
public void getBalance() {
mModel.getBalance(ResturantInfoManager.newInstance().getBrandId() + "")
mModel.getBalance(RestaurantInfoManager.newInstance().getBrandId() + "")
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> {
})
......@@ -182,7 +182,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
public void updateExpandInfo(String settingName, String[] valueType, String[] value) {
FormBody.Builder builder = new FormBody.Builder()
.add("id", RestaurantExpandInfoUtils.getId(settingName) + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("settingName", settingName);
for (int i = 0; i < valueType.length; i++) {
builder.add(valueType[i], value[i]);
......@@ -306,7 +306,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
thirdDelivery(info.getData().get(0));
} else {
if (errorCount < maxErrorCount) {
startToBeConfirmedOrderList(ResturantInfoManager.newInstance().getRestaurantId());
startToBeConfirmedOrderList(RestaurantInfoManager.newInstance().getRestaurantId());
errorCount++;
}
}
......@@ -416,7 +416,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
findOrderDetails(ids.get(0));
ids.remove(0);
} else {
startToBeConfirmedOrderList(ResturantInfoManager.newInstance().getRestaurantId());
startToBeConfirmedOrderList(RestaurantInfoManager.newInstance().getRestaurantId());
}
}
});
......@@ -443,7 +443,7 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
}
RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString())
.build();
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;
import com.gingersoft.coldchain_module.mvp.model.bean.UpdateOrderStatusBean;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
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.utils.FileUtils;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
......@@ -281,7 +281,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
}
RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString())
.build();
mModel.addPrj(requestBody);
......@@ -410,7 +410,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
public void cancelLogistics(int orderId, boolean isCancelOrder) {
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderId", orderId + "")
.add("reasonId", "")
.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;
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.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.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -314,7 +314,7 @@ public class OrderListPresenter extends BasePresenter<OrderListContract.Model, O
}
RequestBody requestBody = new FormBody.Builder()
.add("orderId", dataBean.getID() + "")
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString())
.build();
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;
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.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.utils.other.TextUtil;
import com.jess.arms.di.scope.ActivityScope;
......@@ -126,7 +126,7 @@ public class SupplementOrderPresenter extends BasePresenter<SupplementOrderContr
JSONObject json;
json = new JSONObject();
try {
json.put("shopId", ResturantInfoManager.newInstance().getRestaurantId());
json.put("shopId", RestaurantInfoManager.newInstance().getRestaurantId());
json.put("phone", phone);
json.put("replenishmentType", "1");
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;
import com.gingersoft.gsa.cloud.common.constans.AppConstans;
import com.gingersoft.gsa.cloud.common.constans.DeliveryPickConstans;
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.service.GetInfoUpdateService;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -144,7 +144,7 @@ public class ColdChainMainActivity extends BaseFragmentActivity<ColdChainMainPre
public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.getBalance();
restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
fragments = new ArrayList<>();
List<String> titles = Arrays.asList("全部", "待確認", "待提交", "派送中");
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;
import com.gingersoft.coldchain_module.mvp.contract.SupplementOrderContract;
import com.gingersoft.coldchain_module.mvp.model.bean.SupplementInfoBean;
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.ui.widget.dialog.LoadingDialog;
import com.jess.arms.base.BaseActivity;
......@@ -68,7 +68,7 @@ public class SupplementOrderActivity extends BaseActivity<SupplementOrderPresent
@Override
public void initData(@Nullable Bundle savedInstanceState) {
restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
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;
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.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.jess.arms.base.BaseFragment;
import com.jess.arms.di.component.AppComponent;
......@@ -83,7 +83,7 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
@Override
public void initData(@Nullable Bundle savedInstanceState) {
mRefreshLayout.setPrimaryColorsId(android.R.color.transparent, android.R.color.black);
restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
Bundle arguments = getArguments();
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
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
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.toast.ToastUtils
import com.gingersoft.gsa.cloud.component.ComponentName
......@@ -36,7 +36,7 @@ class HistoryOrderViewModel(private val historyOrderRepository: HistoryOrderRepo
} else {
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 {
if (it.size > 0) {
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
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.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.service.GetInfoUpdateService
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils
......@@ -61,7 +61,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
val ErrorCode = 1011//報錯提示
}
val restaurantId by lazy { ResturantInfoManager.newInstance().getRestaurantId() }
val restaurantId by lazy { RestaurantInfoManager.newInstance().getRestaurantId() }
var mOrderNum = arrayListOf<MutableLiveData<Int>>()
var mOrderList = arrayListOf<MutableLiveData<ArrayList<OrderList.DataBeanX.DataBean>>>()
......@@ -768,7 +768,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
*/
fun selectorDelivery(context: Context, dataBean: OrderDetails.DataBean, status: Int, listener: (Int, Boolean) -> Unit) {
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
if (this.data.isEmpty()) {
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;
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.delivery_pick_mode.mvp.bean.PrjQueryBean;
import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.PrjQueryContract;
......@@ -52,7 +52,7 @@ public class PrjQueryModel extends BaseModel implements PrjQueryContract.Model {
@Override
public Observable<PrjQueryBean> getKitchenPrint(String orderId) {
return mRepositoryManager.obtainRetrofitService(PrjQueryServer.class).
getKitchenPrint(orderId, ResturantInfoManager.newInstance().getRestaurantId() + "");
getKitchenPrint(orderId, RestaurantInfoManager.newInstance().getRestaurantId() + "");
}
@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;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
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.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.order.order.TakeawayOrder;
......@@ -188,7 +188,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
}
RequestBody requestBody = new FormBody.Builder()
.add("orderId", orderId)
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.add("orderDetailsIds", ids.toString())
.build();
mModel.addPrj(requestBody)
......@@ -226,7 +226,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
JSONObject json;
json = new JSONObject();
try {
json.put("shopId", ResturantInfoManager.newInstance().getRestaurantId());
json.put("shopId", RestaurantInfoManager.newInstance().getRestaurantId());
json.put("phone", phone);
json.put("appointmentType", 0);
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
import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager
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.restaurant.utils.RestaurantExpandInfoUtils
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils
......@@ -57,7 +57,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
private val pageViewModel by lazy { ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] }
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 ints = arrayOf(
......@@ -207,7 +207,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
override fun onStart() {
super.onStart()
pageViewModel.getBanlance(ResturantInfoManager.newInstance().getBrandId())
pageViewModel.getBanlance(RestaurantInfoManager.newInstance().getBrandId())
}
override fun onResume() {
......@@ -461,7 +461,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
}
}
//刷新餘額
pageViewModel.getBanlance(ResturantInfoManager.newInstance().getBrandId())
pageViewModel.getBanlance(RestaurantInfoManager.newInstance().getBrandId())
}
})
it.execute {
......@@ -540,7 +540,7 @@ class DeliveryOrderMainActivity : BaseActivity<IPresenter>(), View.OnClickListen
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() }
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>() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_history_order)
// type = CCUtil.getNavigateParam(this, , )
tv_start_time.text = TimeUtils.getOldDate(0)
tv_end_time.text = TimeUtils.getOldDate(0)
......@@ -88,42 +85,23 @@ class HistoryOrderActivity : BaseActivity<IPresenter>() {
when (v!!.id) {
R.id.iv_start_time_triangle, R.id.tv_start_time -> {
iv_start_time_triangle.toggle()
val cal = Calendar.getInstance()
val startTime = Calendar.getInstance()
startTime.set(2019, 0, 1)
val defaultTime = Calendar.getInstance()
try {
//設置默認時間為當前的起止時間
TimeUtils.DATE_FORMAT_DATE.parse(tv_start_time.text.toString())?.let {
cal.time = it
defaultTime.time = it
}
} catch (e: ParseException) {
e.printStackTrace()
}
TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, cal) { date, _ ->
// tv_start_time.text = TimeUtils.DATE_FORMAT_DATE.format(date)
// time = TimeUtils.DATE_FORMAT_DATE.format(date)
TimePickerUtils.showReportTimePicker(this@HistoryOrderActivity, startTime, Calendar.getInstance(), defaultTime) { date, _ ->
mViewModel.historyTime.postValue(TimeUtils.DATE_FORMAT_DATE.format(date))
// pageIndex = 1
// getHistoryInfo()
}.setOnDismissListener {
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
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.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.function.FunctionManager
import com.gingersoft.gsa.cloud.common.ui.utils.BtnBuilder
......@@ -92,7 +92,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
.color(R.color.white)
.show()
restaurantId = ResturantInfoManager.newInstance().getRestaurantId()
restaurantId = RestaurantInfoManager.newInstance().getRestaurantId()
orderId = intent.getStringExtra("orderId")!!//訂單id
orderType = intent.getIntExtra("orderType", 0)//訂單類型
orderPayType = intent.getIntExtra("orderPayType", 0)//訂單支付方式
......@@ -113,7 +113,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
}
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.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color))
}
......@@ -628,7 +628,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
private fun PageViewModel.cancelOrder(orderDetails: OrderDetails.DataBean) {
//獲取取消原因讓用戶選擇
showLoading()
getCancelReason(ResturantInfoManager.newInstance().getBrandId(), restaurantId, 3) { cancelReson ->
getCancelReason(RestaurantInfoManager.newInstance().getBrandId(), restaurantId, 3) { cancelReson ->
cancelDialogForLoading()
if (cancelReson != null && cancelReson.data.isNotEmpty()) {
//如果有配置取消原因
......@@ -686,7 +686,7 @@ class OrderDetailsActivity : BaseActivity<IPresenter>() {
private fun PageViewModel.cancelLogistics(orderDetails: OrderDetails.DataBean) {
//獲取取消原因讓用戶選擇
showLoading()
getCancelReason(ResturantInfoManager.newInstance().getBrandId(), restaurantId, 2) { cancelReson ->
getCancelReason(RestaurantInfoManager.newInstance().getBrandId(), restaurantId, 2) { cancelReson ->
cancelDialogForLoading()
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
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.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.toast.ToastUtils
import com.gingersoft.gsa.cloud.pay.bean.PayMethod
......@@ -67,7 +67,7 @@ class PayActivity : BaseActivity<IPresenter>() {
}
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 {
//獲取支付方式
// 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
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
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.ui.utils.AppDialog
import com.gingersoft.gsa.delivery_pick_mode.R
......@@ -58,7 +58,7 @@ class DeliveryFragment : BaseFragment() {
AppDialog().showWaringDialog(context, "是否確認刪除") { _, dialog ->
showLoading()
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()
cancelDialogForLoading()
}
......@@ -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
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
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.utils.other.TextUtil
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils
......@@ -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 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 lateinit var adapter: OtherOrdersAdapter
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
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
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.utils.toast.ToastUtils
import com.gingersoft.gsa.delivery_pick_mode.R
......@@ -113,7 +113,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) {
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,
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()
if (it != null && it.success) {
ToastUtils.show(context, "保存成功")
......@@ -125,7 +125,7 @@ class UpdateDeliveryFragment : BaseFragment(R.layout.update_delivery_fragment) {
} 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,
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()
if (it != null && it.success) {
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;
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.gingersoft.gsa.cloud.common.core.user.UserContext;
import com.gingersoft.gsa.cloud.common.Api;
......@@ -152,7 +152,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
setDownAverageRatio();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
List<DownloadRequest> requests = getDownloadRequests(getDownloadUrls(restaurantId), restaurantId);
......@@ -263,7 +263,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downFoodList(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodList(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -316,7 +316,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downModifier(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downModifier(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -369,7 +369,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downFoodCombo(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodCombo(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -423,7 +423,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downComboItem(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downComboItem(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -475,7 +475,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downFoodModifier(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downFoodModifier(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -526,7 +526,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downDiscount(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downDiscount(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -580,7 +580,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downExpandInfo(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downExpandInfo(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView))
......@@ -635,7 +635,7 @@ public class DownloadPresenter extends BasePresenter<DownloadContract.Model, Dow
}
public void downPrinterList(int downTag) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.downPrinterList(restaurantId)
.observeOn(AndroidSchedulers.mainThread())
.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;
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.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.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserConstans;
......@@ -47,14 +47,14 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
int restaurantSize = 0;
List<BrandsBean.BrandsData> brandsBeans = new ArrayList<>();
if (brands != null) {
ResturantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
RestaurantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands);
brandsBeans.addAll(brands);
}
boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
if (autoLogin && UserContext.newInstance().isLogin()) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (restaurantId != 0) {
//上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數
mPresenter.getLoginLimit(restaurantId, false);
......@@ -108,7 +108,7 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
// mPresenter.getRestaurantList();
boolean autoLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
if (autoLogin) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
if (restaurantId != 0) {
//上一次進入app有選擇餐廳，通過餐廳ID獲取允許的最大登陸數
// mPresenter.getLoginLimit(restaurantId, false);
......@@ -137,12 +137,12 @@ public abstract class LoginInterfaceImpl<P extends BaseLoginPresenter> extends B
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.setBrandName(mContext, brandName);
if (restaurantsBean != null) {
ResturantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
,restaurantsBean.getGsPosShopId()));
// GsaCloudApplication.setRestaurantId(mContext, restaurantsBean.getRestaurantId());
// 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;
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.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.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserContext;
......@@ -176,7 +176,7 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
// String brandRestaurantInfos = JsonUtils.toJson(brands);
// GsaCloudApplication.setBrandRestaurantInfos(mContext, brandRestaurantInfos);
ResturantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
RestaurantInfoManager.putBrandRestaurantInfos(JsonUtils.toJson(brands));
brandsBeans.addAll(brands);
// restaurantSize = RestaurantInfoUtils.getRestaurantSize(brands);
......@@ -208,9 +208,9 @@ public class ChooseRestaurantActivity extends BaseActivity<ChooseRestaurantPrese
}
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) {
ResturantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
RestaurantInfoManager.newInstance().setResturantInfo(new RestaurantInfo(restaurantsBean.getRestaurantId(),restaurantsBean.getRestaurantName()
,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;
import androidx.viewpager2.widget.ViewPager2;
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.UserContext;
import com.gingersoft.gsa.cloud.common.utils.encryption.Aes;
......@@ -108,7 +108,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
boolean isLogin = (boolean) SPUtils.get(UserConstans.AUTO_LOGIN, false);
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, ""));
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;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.EditFoodContract;
......@@ -118,7 +118,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi
* 獲取時段列表
*/
private void getPeriodList() {
mModel.getPeriodList(ResturantInfoManager.newInstance().getBrandId())
mModel.getPeriodList(RestaurantInfoManager.newInstance().getBrandId())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("獲取時段信息中..."))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -152,7 +152,7 @@ public class EditFoodPresenter extends BasePresenter<EditFoodContract.Model, Edi
* 獲取餐種
*/
private void getSummaryList() {
mModel.getSummaryList(ResturantInfoManager.newInstance().getRestaurantId())
mModel.getSummaryList(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("獲取餐種信息中..."))
.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;
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.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.utils.CollectionUtils;
......@@ -61,7 +61,7 @@ public class ExpandListPresenter extends BasePresenter<ExpandListContract.Model,
}
public void getExpandInfoList() {
mModel.getExpandList(ResturantInfoManager.newInstance().getRestaurantId())
mModel.getExpandList(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(""))
.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;
import android.text.TextUtils;
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.webview.WebviewHelper;
import com.gingersoft.gsa.cloud.component.ComponentName;
......@@ -73,7 +73,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
}
public void syncRestaurantExtendedConfiguration() {
mModel.syncRestaurantExtendedConfiguration(ResturantInfoManager.newInstance().getRestaurantId())
mModel.syncRestaurantExtendedConfiguration(RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
......@@ -160,7 +160,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
public void clearHeartbeat(){
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", ResturantInfoManager.newInstance().getRestaurantId() + "")
.add("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId() + "")
.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;
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.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -121,8 +121,8 @@ public class NewlyAddedPresenter extends BasePresenter<NewlyAddedContract.Model,
return;
}
Observable<BaseResult> baseResultObservable;
timePeriodBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
timePeriodBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
timePeriodBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
timePeriodBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(timePeriodBean));
if (isUpdate) {
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;
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.model.bean.RestaurantQrBean;
import com.jess.arms.di.scope.ActivityScope;
......@@ -46,7 +46,7 @@ public class QrCodePresenter extends BasePresenter<QrCodeContract.Model, QrCodeC
}
public void getRestaurantQrCode() {
mModel.getRestaurantQrCode(ResturantInfoManager.newInstance().getRestaurantId() + "")
mModel.getRestaurantQrCode(RestaurantInfoManager.newInstance().getRestaurantId() + "")
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading("加載中..."))
.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;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.mvp.contract.SettlementContract;
......@@ -60,7 +60,7 @@ public class SettlementPresenter extends BasePresenter<SettlementContract.Model,
}
public void getSettlementReport() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getSettlementReport(restaurantId)
.subscribeOn(Schedulers.io())
.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;
import android.app.Application;
import android.text.TextUtils;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.main.R;
......@@ -113,7 +113,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
}
public void sendSettlement(int type) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody;
if (type != 0) {
requestBody = new FormBody.Builder()
......@@ -210,7 +210,7 @@ public class SettlementReportPresenter extends BasePresenter<SettlementReportCon
}
public void getSettlementReport() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getSettlementReport(restaurantId)
.subscribeOn(Schedulers.io())
.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;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
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.main.R;
import com.gingersoft.gsa.cloud.main.R2;
......@@ -82,7 +82,7 @@ public class LanguageActivity extends BaseActivity<LanguagePresenter> implements
initAdapter();
initItemListener();
mPresenter.getLanguageByBrandId(ResturantInfoManager.newInstance().getBrandId());
mPresenter.getLanguageByBrandId(RestaurantInfoManager.newInstance().getBrandId());
}
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
import androidx.recyclerview.widget.LinearLayoutManager
import com.chad.library.adapter.base.BaseQuickAdapter
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.main.R
import kotlinx.android.synthetic.main.activity_look_log.*
......@@ -21,7 +21,7 @@ class LookLogActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
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.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;
import com.billy.cc.core.component.CC;
import com.gingersoft.gsa.cloud.common.constans.AppConstans;
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.utils.RestaurantInfoUtils;
import com.gingersoft.gsa.cloud.common.core.user.UserContext;
......@@ -166,7 +166,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
FragmentManager fragmentManager = getSupportFragmentManager();
mainTopFragment = (MainTopFragment) fragmentManager.findFragmentById(R.id.main_top_fragment);
tvStoreName.setText(ResturantInfoManager.newInstance().getRestaurantName());
tvStoreName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
refresh.setOnRefreshListener(refreshLayout -> {
if (mainTopFragment != null) {
Message msg = new Message();
......@@ -210,7 +210,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
@Override
protected void onRestart() {
super.onRestart();
String restaurantName = ResturantInfoManager.newInstance().getRestaurantName();
String restaurantName = RestaurantInfoManager.newInstance().getRestaurantName();
tvStoreName.setText(restaurantName);
tvRestaurantName.setText(restaurantName);
}
......@@ -441,7 +441,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
}
private void updateTitleInfo() {
String restaurantName = ResturantInfoManager.newInstance().getRestaurantName();
String restaurantName = RestaurantInfoManager.newInstance().getRestaurantName();
String memberName = UserContext.newInstance().getMemberName();
if (!TextUtils.isEmpty(restaurantName)) {
if (RestaurantInfoUtils.getRestaurantSize(this) > 1) {
......@@ -459,7 +459,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
}
private void showChooseRestaurantDialog() {
String brandRestaurantInfos = ResturantInfoManager.getBrandRestaurantInfos();
String brandRestaurantInfos = RestaurantInfoManager.getBrandRestaurantInfos();
if (!TextUtils.isEmpty(brandRestaurantInfos)) {
List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class);
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;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
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.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
......@@ -239,8 +239,8 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
@Override
public void initLanguage() {
String brandName = "品牌名稱: " + ResturantInfoManager.newInstance().getBrandName();
String restaurantName = "店鋪名稱: " + ResturantInfoManager.newInstance().getRestaurantName();
String brandName = "品牌名稱: " + RestaurantInfoManager.newInstance().getBrandName();
String restaurantName = "店鋪名稱: " + RestaurantInfoManager.newInstance().getRestaurantName();
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;
import android.content.Context;
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.SummaryBean;
import com.gingersoft.gsa.cloud.main.mvp.model.bean.TimePeriodBean;
......@@ -182,7 +182,7 @@ public class FoodMenuAdapter extends BaseProviderMultiAdapter<FoodMenuEditBean>
if(summaryBean == null){
summaryBean = new SummaryBean();
}
summaryBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
summaryBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
summaryBean.setName(data.get(0).getShowValue());
summaryBean.setValid(data.get(1).isShowState() ? 1 : 0);
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;
import com.billy.cc.core.component.CC;
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.time.TimeUtils;
import com.gingersoft.gsa.cloud.component.ComponentName;
......@@ -132,7 +132,7 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
@Override
public void initData(@Nullable Bundle savedInstanceState) {
restaurantId = String.valueOf(ResturantInfoManager.newInstance().getRestaurantId());
restaurantId = String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId());
//獲取一段時間內的營業信息，默認獲取七天的數據
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;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
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.component.ComponentName;
import com.gingersoft.gsa.cloud.main.R;
......@@ -103,7 +103,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements HomeCon
@Override
public void initData(@Nullable Bundle savedInstanceState) {
mPresenter.getRestaurantReport(ResturantInfoManager.newInstance().getRestaurantId() + "");
mPresenter.getRestaurantReport(RestaurantInfoManager.newInstance().getRestaurantId() + "");
// mPresenter.getRestaurantFunList("26");
initTopBar();
initStickyLayout();
......
component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/MainTopFragment.java
......@@ -13,7 +13,7 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
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.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
......@@ -124,8 +124,8 @@ public class MainTopFragment extends BaseFragment<MainTopPresenter> implements M
}
private void getInfo() {
mPresenter.getOrderInfoChart(ResturantInfoManager.newInstance().getRestaurantId() + "");
mPresenter.getRestaurantReport(ResturantInfoManager.newInstance().getRestaurantId() + "");//ResturantInfoManager.newInstance().getRestaurantId() 獲取餐廳營業信息
mPresenter.getOrderInfoChart(RestaurantInfoManager.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;
import androidx.recyclerview.widget.GridLayoutManager;
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.main.R;
import com.gingersoft.gsa.cloud.main.R2;
......@@ -114,7 +114,7 @@ public class PaymentMethodReportFragment extends BaseFragment<PaymentMethodRepor
private void getPayMenthInfo() {
String startTime = TimeUtils.getDatebyDate(mTvStartTime.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;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
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.time.TimeUtils;
import com.gingersoft.gsa.cloud.main.R;
......@@ -540,14 +540,14 @@ public class SalesFragment extends BaseFragment<SalesPresenter> implements Sales
private void getSaleReport() {
String startTime = TimeUtils.getDatebyDate(mTvStartTime.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(){
String startTime = TimeUtils.getDatebyDate(startEndTimePickerView.getStartTime(), -1);
String endTime = TimeUtils.getDatebyDate(startEndTimePickerView.getEndTime(), 1);
mPresenter.getDeliveryOrderCurveInfo(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
mPresenter.getDeliveryPersonnelReport(ResturantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
mPresenter.getDeliveryOrderCurveInfo(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
mPresenter.getDeliveryPersonnelReport(RestaurantInfoManager.newInstance().getRestaurantId() + "", startTime, endTime);
}
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;
import androidx.recyclerview.widget.GridLayoutManager;
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.mvp.model.bean.BusinessBean;
import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter;
......@@ -62,7 +62,7 @@ public class DailyBusinessView extends BaseReloadView {
TextView tvRestaurantName = contentView.findViewById(R.id.tv_restaurant_name);
View horizontalLine = contentView.findViewById(R.id.horizontal_dividing_line);
mBusinessDetails = contentView.findViewById(R.id.rv_business_details);
tvRestaurantName.setText(ResturantInfoManager.newInstance().getRestaurantName());
tvRestaurantName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
if (isPrint) {
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;
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.manager.mvp.model.service.TableManageService;
import com.google.gson.Gson;
......@@ -98,7 +98,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M
@Override
public Observable<BaseResult> queryAreas() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
return mRepositoryManager.obtainRetrofitService(TableManageService.class)
.queryArea(restaurantId);
}
......@@ -150,7 +150,7 @@ public class TableManageModel extends BaseModel implements TableManageContract.M
@Override
public Observable<BaseResult> queryTables() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
return mRepositoryManager.obtainRetrofitService(TableManageService.class)
.queryTable(restaurantId);
}
......
component-manager/src/main/java/com/gingersoft/gsa/cloud/manager/mvp/presenter/TableManagePresenter.java
......@@ -4,7 +4,7 @@ import android.app.Application;
import android.os.CountDownTimer;
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.core.table.TableArea;
import com.gingersoft.gsa.cloud.common.core.table.TableManagerItem;
......@@ -458,7 +458,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void changeAreaSort(String ids) {
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(ResturantInfoManager.newInstance().getRestaurantId()))
.add("restaurantId", String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId()))
.add("ids", ids)
.build();
LogUtil.d(TAG, "changeAreaSort " + " ids:" + ids);
......@@ -509,7 +509,7 @@ public class TableManagePresenter extends BasePresenter<TableManageContract.Mode
public void changeTableSort(String ids) {
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(ResturantInfoManager.newInstance().getRestaurantId()))
.add("restaurantId", String.valueOf(RestaurantInfoManager.newInstance().getRestaurantId()))
.add("ids", ids)
.build();
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;
import androidx.annotation.Nullable;
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.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
......@@ -235,7 +235,7 @@ public class AddAreaFragment extends BaseFragment<AddAreaPresenter> implements A
public AreaRequest.Add createAddAreaRequest() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
AreaRequest.Add areaRequest = new AreaRequest.Add();
areaRequest.setRestaurantId(restaurantId);
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;
import androidx.annotation.Nullable;
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.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
......@@ -431,7 +431,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
public TableRequest.Add createAddTableRequest() {
TableRequest.Add addTableRequest = new TableRequest.Add();
addTableRequest.setRegionId(currentAreaId);
addTableRequest.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
addTableRequest.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
addTableRequest.setTableName(tableNameEditText.getText().toString());
if (!TextUtils.isEmpty(serverchargeEditText.getText().toString())) {
addTableRequest.setServiceCharge(Double.parseDouble(serverchargeEditText.getText().toString()));
......@@ -453,7 +453,7 @@ public class AddTableFragment extends BaseFragment<AddTablePresenter> implements
TableRequest.Update update = new TableRequest.Update();
update.setId(id);
update.setRegionId(currentAreaId);
update.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
update.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
update.setTableName(tableNameEditText.getText().toString());
if (!TextUtils.isEmpty(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;
import androidx.recyclerview.widget.LinearLayoutManager;
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.manager.R;
import com.gingersoft.gsa.cloud.manager.R2;
......@@ -453,7 +453,7 @@ public class AreaListFragment extends BaseFragment<AreaListPresenter> implements
}
public AreaRequest.Add createAddAreaRequest() {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
AreaRequest.Add areaRequest = new AreaRequest.Add();
areaRequest.setRestaurantId(restaurantId);
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;
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.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -336,8 +336,8 @@ public class PrintInfoBean {
if (data == null) {
return null;
}
printInfoBeans.add(new PrintInfoBean(new String[]{ResturantInfoManager.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().getBrandName()}, 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}));
......
component-print/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java
......@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.view.View;
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.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.MoneyUtil;
......@@ -115,8 +115,8 @@ public class PrintCleanMachine extends PrinterRoot<PrintCleanMachineContent> {
List<String> items = new ArrayList<>();
items.add("上次清機時間:" + mCleanMachineContent.getRestaurantOperationTime());
items.add("品牌名稱:" + ResturantInfoManager.newInstance().getBrandName());
items.add("店鋪名稱:" + ResturantInfoManager.newInstance().getRestaurantName());
items.add("品牌名稱:" + RestaurantInfoManager.newInstance().getBrandName());
items.add("店鋪名稱:" + RestaurantInfoManager.newInstance().getRestaurantName());
items.add("每日營業報表");
items.add("由營業日期:" + mCleanMachineContent.getStartTime());
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;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
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.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
......@@ -91,9 +91,9 @@ public class PrintOtherOrderClosing extends PrinterRoot<PrintTakeawayCheckoutCon
TextView tvBillNumber = view.findViewById(R.id.tv_bill_number);
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());
......
component-print/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
......@@ -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.PrintConstans;
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.table.TableBean;
import com.gingersoft.gsa.cloud.common.utils.AidlUtil;
......@@ -527,8 +527,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
View view = View.inflate(mContext, R.layout.print_model_header, null);
TextView tvBrandName = view.findViewById(R.id.print_brand_name);
TextView tvRestaurantName = view.findViewById(R.id.print_restaurant_name);
tvBrandName.setText(ResturantInfoManager.newInstance().getBrandName());
tvRestaurantName.setText(ResturantInfoManager.newInstance().getRestaurantName());
tvBrandName.setText(RestaurantInfoManager.newInstance().getBrandName());
tvRestaurantName.setText(RestaurantInfoManager.newInstance().getRestaurantName());
return view;
}
......@@ -879,8 +879,8 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
protected String getHtmlPrintHeadInfo() {
return getPLable(ResturantInfoManager.newInstance().getBrandName(), HTML_PRINT_GRAVITY_CENTER) +
getPLable(ResturantInfoManager.newInstance().getRestaurantName(), HTML_PRINT_GRAVITY_CENTER);
return getPLable(RestaurantInfoManager.newInstance().getBrandName(), HTML_PRINT_GRAVITY_CENTER) +
getPLable(RestaurantInfoManager.newInstance().getRestaurantName(), HTML_PRINT_GRAVITY_CENTER);
}
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;
import com.epson.epos2.printer.Printer;
import com.epson.epos2.printer.PrinterStatusInfo;
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.utils.threadPool.ThreadPoolManager;
import com.gingersoft.gsa.cloud.common.utils.AidlUtil;
......@@ -188,7 +188,7 @@ public class PrjService extends Service implements ReceiveListener {
* 請求prj數據
*/
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线程進行網絡請求
.observeOn(Schedulers.io())//切換到io线程處理請求結果
.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;
import android.content.Context;
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.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils;
......@@ -145,11 +145,11 @@ public class MyPrintUtils {
}
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) {
return getNormalTextView(context, ResturantInfoManager.newInstance().getRestaurantName(), HEADER_TEXTSIZE);
return getNormalTextView(context, RestaurantInfoManager.newInstance().getRestaurantName(), HEADER_TEXTSIZE);
}
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;
import androidx.annotation.NonNull;
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.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
......@@ -190,7 +190,7 @@ public class PrintAddCurrencyActivity extends BaseActivity<PrintAddCurrencyPrese
private void addCurrencyPrinter() {
if (printCurrencyBean == null) {
printCurrencyBean = new PrintCurrencyBean();
printCurrencyBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
printCurrencyBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
}
printCurrencyBean.setUid(UserContext.newInstance().getMemberId());
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;
import com.billy.cc.core.component.CC;
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.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
......@@ -596,7 +596,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
hideKeyBoard();
printerDeviceBean.setName(mEdPrintName.getText().toString().trim());
printerDeviceBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
printerDeviceBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
//飛單打印機
if (oneFailPosition != -1) {
......@@ -645,7 +645,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
mPresenter.updatePrinterInfo(printerDeviceBean);
} else {
printerDeviceBean.setUid(null);
printerDeviceBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
printerDeviceBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
mPresenter.addPrinter(printerDeviceBean);
}
} 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;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
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.utils.PrinterDeviceDaoUtils;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
......@@ -73,13 +73,13 @@ public class IpPrintListActivityFragment extends BaseFragment<IpPrintListActivit
@Override
public void initData(@Nullable Bundle savedInstanceState) {
mTvAddPrint.setText("+添加打印機");
mPresenter.getModelList(ResturantInfoManager.newInstance().getRestaurantId());
mPresenter.getModelList(RestaurantInfoManager.newInstance().getRestaurantId());
}
@Override
public void 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;
import androidx.annotation.NonNull;
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.utils.PrintCurrencyDaoUtils;
import com.gingersoft.gsa.cloud.ui.utils.AppDialog;
......@@ -64,7 +64,7 @@ public class LocalPrintFragment extends BaseFragment<LocalPrintPresenter> implem
@Override
public void onResume() {
super.onResume();
mPresenter.getPrinterCurrencyList(ResturantInfoManager.newInstance().getRestaurantId());
mPresenter.getPrinterCurrencyList(RestaurantInfoManager.newInstance().getRestaurantId());
}
@Override
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/ConfirmOrderBean.java
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.time.TimeUtils;
......@@ -42,8 +42,8 @@ public class ConfirmOrderBean {
PurchaseOrder purchaseOrder = new PurchaseOrder();
purchaseOrder.setSupplierId(cartFood.getSupplierId());
purchaseOrder.setSupplierName(cartFood.getSupplierName());
purchaseOrder.setBrandId(ResturantInfoManager.newInstance().getBrandId());
purchaseOrder.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
purchaseOrder.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
purchaseOrder.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseOrder.setInitialShippingTime(TimeUtils.getNextDayLong(1));
purchaseOrder.setTotalAmount(MoneyUtil.priceCalculation(cartFood.getUnitPrice(), cartFood.getFoodQuantity()));
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 {
/**
* 品牌id
*/
private Long brandId;
private int brandId;
/**
* 餐廳id
*/
private Long restaurantId;
private int restaurantId;
/**
* 食材id，沒有時傳0
*/
......@@ -30,6 +30,10 @@ public class DeputyUnitBean implements Serializable {
*/
private String deputyUnit;
/**
* 食材id
*/
private int purchaseFoodId;
/**
* 換算倍數
*/
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 {
*/
private double minimumAmount;
/**
* 基本單位類型
*/
private String basicUnitName;
/**
* 採購商地址
*/
private String address;
......@@ -95,7 +99,7 @@ public class PurchaseFoodBean implements Serializable {
/**
* 副單位
*/
private List<DeputyUnitBean> deputyUnitBeans;
private List<DeputyUnitBean> foodUnits;
public boolean isChecked() {
return isChecked;
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/bean/PurchaseOrderDetailsBean.java
......@@ -75,12 +75,23 @@ public class PurchaseOrderDetailsBean {
* unit_content : ML
*/
private int id;
/**
* 食品數量
*/
private int foodQuantity;
private int foodPrice;
private int status;
private int purchaseFoodId;
private String images;
private String foodNo;
/**
* 基本單位
*/
private String basicUnitName;
/**
* 包裝描述
*/
private String packingDescription;
private int quantityStarts;
private int quantityEnd;
private int type;
......@@ -90,5 +101,20 @@ public class PurchaseOrderDetailsBean {
private double totalAmount;
//是否被選中
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;
import com.gingersoft.gsa.cloud.common.core.restaurant.ResturantInfoManager;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
import java.util.Map;
......@@ -28,11 +28,11 @@ public class Constant {
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) {
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
}
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 {
void loadBasicUnitAdapter(List<BasicUnitBean> basicUnitBeans);
void loadDeputyUnitAdapter(List<DeputyUnitBean> deputyUnitBeans);
void initTopBar(String title);
}
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel {
/**
* 獲取基本單位集合
* @param brandId 品牌id
*
* @param brandId 品牌id
* @param restaurantId 餐廳ID
* @return
*/
......@@ -44,6 +47,7 @@ public interface FoodUnitPageContract {
/**
* 批量修改副單位
*
* @return
*/
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;
import android.app.Application;
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.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
......@@ -81,8 +81,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
map.put("pageSize", 1000);
map.put("pageIndex", 0);
map.put("parentId", parentId);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(name)) {
map.put("name", name);
}
......@@ -192,8 +192,8 @@ public class CategoryPresenter extends BasePresenter<CategoryContract.Model, Cat
public FoodCategoryResultBean.DataBean.FoodCategoryBean toFoodCategoryBean(int parentId, String categoryName, int id) {
FoodCategoryResultBean.DataBean.FoodCategoryBean foodCategoryBean = new FoodCategoryResultBean.DataBean.FoodCategoryBean();
foodCategoryBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
foodCategoryBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
foodCategoryBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
foodCategoryBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
foodCategoryBean.setName(categoryName);
foodCategoryBean.setParentId(parentId);
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;
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.ui.bean.SectionCheckItem;
import com.gingersoft.supply_chain.mvp.bean.FoodCategoryResultBean;
......@@ -75,8 +75,8 @@ public class CategorySelectPresenter extends BasePresenter<CategorySelectContrac
map.put("pageSize", 1000);
map.put("pageIndex", 0);
map.put("parentId", parentId);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(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;
import android.app.Application;
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.other.TextUtil;
import com.gingersoft.gsa.cloud.ui.bean.view.CategoryBean;
......@@ -92,8 +92,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000);
map.put("pageIndex", 0);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (supplierId != -1) {
map.put("supplierId", supplierId);
}
......@@ -166,8 +166,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", 1000);
map.put("pageIndex", 0);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (supplierId != -1) {
map.put("supplierId", supplierId);
}
......@@ -235,8 +235,8 @@ public class FoodIngredientsPresenter extends BasePresenter<FoodIngredientsContr
*/
public void deleteFood(PurchaseFoodBean purchaseFoodBean, int position) {
purchaseFoodBean.setDeletes(Constant.DELETE);
purchaseFoodBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
purchaseFoodBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
purchaseFoodBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseFoodBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
mModel.updateFood(RequestBody.create(MediaType.parse("application/json"), JsonUtils.toJson(purchaseFoodBean)))
.subscribeOn(Schedulers.io())
.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;
import android.os.Bundle;
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.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.BasicUnitBean;
......@@ -89,14 +89,24 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
deputyUnitBeans = (List<DeputyUnitBean>) arguments.getSerializable(FoodUnitPageFragment.DEPUTY_UNIT_KEY);
if (TextUtil.isNotEmptyOrNullOrUndefined(basicUnitName)) {
isUpdate = true;
mRootView.initTopBar("編輯商品單位");
} else {
isUpdate = false;
mRootView.initTopBar("填寫商品單位");
}
getDeputyUnitList();
if (deputyUnitBeans == null) {
deputyUnitBeans = new ArrayList<>();
}
mRootView.loadDeputyUnitAdapter(deputyUnitBeans);
}
}
/**
* 獲取副單位 快捷輸入列表數據集合
*/
public void getDeputyUnitList() {
mModel.getDeputyUnitList(ResturantInfoManager.newInstance().getBrandId(), ResturantInfoManager.newInstance().getRestaurantId())
mModel.getDeputyUnitList(RestaurantInfoManager.newInstance().getBrandId(), RestaurantInfoManager.newInstance().getRestaurantId())
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> mRootView.showLoading(GET_INFO_LOADING))
.subscribeOn(AndroidSchedulers.mainThread())
......@@ -121,6 +131,9 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
});
}
/**
* 添加副單位
*/
public void addDeputyUnit() {
if (deputyUnitBeans.size() > 0) {
DeputyUnitBean basicUnitBean = deputyUnitBeans.get(deputyUnitBeans.size() - 1);
......@@ -134,13 +147,4 @@ public class FoodUnitPagePresenter extends BasePresenter<FoodUnitPageContract.Mo
deputyUnitBeans.add(unitBean);
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;
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.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -75,8 +75,8 @@ public class MeasurementUnitPresenter extends BasePresenter<MeasurementUnitContr
if (!TextUtil.isEmptyOrNullOrUndefined(unitContent)) {
map.put("unitContent", unitContent);
}
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("pageIndex", pageIndex);
mModel.getMeasurementUnitList(map)
.subscribeOn(Schedulers.io())
......
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;
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.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -129,8 +129,8 @@ public class NewFoodUnitPresenter extends BasePresenter<NewFoodUnitContract.Mode
if (foodUnit == null) {
foodUnit = new MeasurementUnitBean.DataBean.Unit();
}
foodUnit.setBrandId(ResturantInfoManager.newInstance().getBrandId());
foodUnit.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
foodUnit.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
foodUnit.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
List<InfoMultiBean> units = infoMultiBeans.get(0).getInfoMultiBeans();
for (int i = 0; i < units.size(); i++) {
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;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
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.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.inputFilter.InputFilterUtils;
......@@ -20,7 +20,6 @@ import com.gingersoft.gsa.cloud.ui.adapter.multi.RemarkProvider;
import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.mvp.bean.SupplierInfoBean;
import com.gingersoft.supply_chain.mvp.contract.NewSupplierContract;
import com.google.gson.Gson;
import com.jess.arms.di.scope.FragmentScope;
import com.jess.arms.http.imageloader.ImageLoader;
import com.jess.arms.integration.AppManager;
......@@ -402,8 +401,8 @@ public class NewSupplierPresenter extends BasePresenter<NewSupplierContract.Mode
String telephone = infoMultiBeans.get(telephoneIndex).getShowValue();
supplierInfoBean.setContactInformation(telephone);
supplierInfoBean.setAddress(infoMultiBeans.get(addressIndex).getShowValue());
supplierInfoBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
supplierInfoBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
supplierInfoBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
supplierInfoBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
String minimumAmount = infoMultiBeans.get(lowPurchaseAmount).getShowValue();
if (TextUtil.isNotEmptyOrNullOrUndefined(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;
import android.app.Application;
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.gson.GsonUtils;
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.OrderWareHouseBean;
import com.jess.arms.integration.AppManager;
......@@ -90,6 +91,7 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
if (orderDetailsBean != null) {
OrderDetailsPresenter.this.orderId = orderId;
orderDetailsId = orderDetailsBean.getId();
transformationWareHouse(orderDetailsBean);
mRootView.loadOrderDetails(orderDetailsBean);
} else {
mRootView.showMessage(GET_INFO_ERROR);
......@@ -100,6 +102,28 @@ public class OrderDetailsPresenter extends BasePresenter<OrderDetailsContract.Mo
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
orderWareHouseBean.setOrderId(orderId);
OrderWareHouseBean.PurchaseWarehousingOrder purchaseWarehousingOrder = new OrderWareHouseBean.PurchaseWarehousingOrder();
purchaseWarehousingOrder.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
purchaseWarehousingOrder.setBrandId(ResturantInfoManager.newInstance().getBrandId());
purchaseWarehousingOrder.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
purchaseWarehousingOrder.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
purchaseWarehousingOrder.setFiles(files);
purchaseWarehousingOrder.setRemarks(remark);
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;
import android.widget.CheckBox;
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.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
......@@ -123,8 +123,8 @@ public class ShoppingCatPresenter extends BasePresenter<ShoppingCatContract.Mode
@SuppressLint("CheckResult")
public void addNewPurchaseOrder(List<PurchaseFoodBean> purchaseFoodBeans, String remarks) {
NewPurchaseOrderBean newPurchaseOrderBean = new NewPurchaseOrderBean();
newPurchaseOrderBean.setBrandId(ResturantInfoManager.newInstance().getBrandId());
newPurchaseOrderBean.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
newPurchaseOrderBean.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
newPurchaseOrderBean.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
double totalAmount = 0;
for (PurchaseFoodBean purchaseFoodBean : purchaseFoodBeans) {
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;
import android.app.Application;
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.other.TextUtil;
import com.gingersoft.supply_chain.mvp.bean.SupplierResultBean;
import com.gingersoft.supply_chain.mvp.bean.WareHousingOrderBean;
import com.gingersoft.supply_chain.mvp.contract.StorageListContract;
import com.jess.arms.di.scope.FragmentScope;
......@@ -15,7 +14,6 @@ import com.jess.arms.integration.AppManager;
import com.jess.arms.mvp.BasePresenter;
import com.jess.arms.utils.RxLifecycleUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
......@@ -72,8 +70,8 @@ public class StorageListPresenter extends BasePresenter<StorageListContract.Mode
Map<String, Object> map = new HashMap<>(6);
map.put("pageSize", 10);
map.put("pageIndex", pageIndex);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
map.put("status", status);
if (TextUtil.isNotEmptyOrNullOrUndefined(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;
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.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -75,8 +75,8 @@ public class SupplierListPresenter extends BasePresenter<SupplierListContract.Mo
Map<String, Object> map = new HashMap<>(5);
map.put("pageSize", Constant.PAGE_SIZE);
map.put("pageIndex", pageIndex * Constant.PAGE_SIZE);
map.put("restaurantId", ResturantInfoManager.newInstance().getRestaurantId());
map.put("brandId", ResturantInfoManager.newInstance().getBrandId());
map.put("restaurantId", RestaurantInfoManager.newInstance().getRestaurantId());
map.put("brandId", RestaurantInfoManager.newInstance().getBrandId());
if (!TextUtil.isEmptyOrNullOrUndefined(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
protected void convert(@NotNull BaseViewHolder viewHolder, DeputyUnitBean item) {
EditText edDeputyUnitName = viewHolder.getView(R.id.ed_deputy_unit_name);
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_conversion_multiple, item.getConversionMultiple());
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;
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.viewholder.BaseViewHolder;
......@@ -33,18 +37,33 @@ public class OrderDetailsFoodAdapter extends BaseQuickAdapter<PurchaseOrderDetai
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_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()));
//保存下來總價，用於計算所有食品的總價
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);
// View view = View.inflate(context, R.layout.item_order_details_food, null);
// warehouseUnitLayout.addView(view);
private static class WareHouseUnitAdapter extends BaseQuickAdapter<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean, BaseViewHolder> {
public WareHouseUnitAdapter(List<PurchaseOrderDetailsBean.PurchaseOrderDetailsInfoVosBean.WareHouseBean> wareHouseBeans) {
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;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemChildClickListener;
import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2;
import com.gingersoft.supply_chain.di.component.DaggerFoodUnitPageComponent;
......@@ -31,6 +29,7 @@ import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar;
import java.io.Serializable;
import java.util.Iterator;
import java.util.List;
import butterknife.BindView;
......@@ -91,20 +90,39 @@ public class FoodUnitPageFragment extends BaseSupplyChainFragment<FoodUnitPagePr
@Override
public void initData(@Nullable Bundle savedInstanceState) {
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) {
int viewId = view.getId();
if (viewId == R.id.tv_add_deputy) {
//添加副單位
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
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/order/OrderDetailsFragment.java
......@@ -17,6 +17,7 @@ import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
import com.gingersoft.supply_chain.R;
import com.gingersoft.supply_chain.R2;
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.contract.OrderDetailsContract;
import com.gingersoft.supply_chain.mvp.presenter.OrderDetailsPresenter;
......@@ -26,6 +27,9 @@ import com.jess.arms.di.component.AppComponent;
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
import com.qmuiteam.qmui.widget.QMUITopBar;
import java.util.ArrayList;
import java.util.List;
import butterknife.BindView;
import butterknife.OnClick;
......@@ -100,7 +104,6 @@ public class OrderDetailsFragment extends BaseSupplyChainFragment<OrderDetailsPr
supplyTopBar.addRightImageButton(R.drawable.ic_white_delete, R.id.qmui_delete_order).setOnClickListener(v -> {
//刪除訂單
});
Bundle arguments = getArguments();
if (arguments != null) {
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
@Override
public void loadOrderList(List<OrderBean> list) {
refreshPurchaseList.finishRefresh();
refreshPurchaseList.finishLoadMore();
loadService.showCallback(SuccessCallback.class);
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;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
......@@ -13,6 +14,7 @@ import androidx.annotation.Nullable;
import androidx.recyclerview.widget.RecyclerView;
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.R2;
import com.gingersoft.supply_chain.di.component.DaggerShoppingCatComponent;
......@@ -121,7 +123,10 @@ public class ShoppingCatFragment extends BaseSupplyChainFragment<ShoppingCatPres
}
if (isHasChecked) {
//關閉選擇食材的頁面
mPresenter.addPurchaseOrder();
AppDialog.getInstance().showWaringDialog(mContext, "確認創建採購單？", (view, dialog) -> {
dialog.dismiss();
mPresenter.addPurchaseOrder();
});
} else {
showMessage("請選擇食品");
}
......
component-supply-chain/src/main/res/layout/fragment_purchase_list.xml
......@@ -43,10 +43,10 @@
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_5"
android:maxLines="1"
android:maxLength="20"
android:background="@null"
android:hint="訂單編號"
android:maxLength="20"
android:maxLines="1"
android:textColor="@color/theme_333_color"
android:textColorHint="@color/hint_color"
android:textSize="@dimen/dp_16" />
......@@ -106,7 +106,10 @@
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/srl_purchase_list"
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
android:id="@+id/contentViewPager"
......
component-supply-chain/src/main/res/layout/item_order_details_food.xml
......@@ -143,11 +143,10 @@
tools:text="$100.00" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_warehouse_unit"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_warehouse_unit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />
android:layout_height="wrap_content" />
<LinearLayout
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;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
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.user.UserContext;
import com.gingersoft.gsa.cloud.common.utils.JsonUtils;
......@@ -89,7 +89,7 @@ public class PrintSkyorderAction extends TableAction {
@Override
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>() {
@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;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.ExpandConstant;
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.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.user.UserContext;
......@@ -959,7 +959,7 @@ public abstract class BaseOrderPresenter<M extends BaseOrderContract.Model, V ex
TableBean.DataBean tableBean = mDoshokuOrder.getOpenTableInfo();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
CreateOrderRequest request = new CreateOrderRequest();
request.setTableNumber(tableBean.getTableNumber());
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;
import com.gingersoft.gsa.cloud.common.constans.MealConstant;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
......@@ -742,7 +742,7 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
public void getCurrentSoldoutFood() {
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId))
.build();
......@@ -1004,8 +1004,8 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
}
public void getRestaurantFoodReason() {
int brandId = ResturantInfoManager.newInstance().getBrandId();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int brandId = RestaurantInfoManager.newInstance().getBrandId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
int type = 1;
mModel.getRestaurantFoodReason(brandId, restaurantId, type)
.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;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
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.table.TableBean;
import com.gingersoft.gsa.cloud.common.core.table.TableExtBean;
......@@ -535,7 +535,7 @@ public class OrderContentPresenter extends BaseOrderPresenter<OrderContentContra
}
public void getTables(boolean show, RefreshLayout refreshLayout) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getTables(restaurantId)
.subscribeOn(Schedulers.io())
.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;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
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.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
......@@ -102,8 +102,8 @@ public class OrderPayPresenter extends BaseOrderPresenter<OrderPayContract.Model
}
public void getPayMethods() {
int brandId = ResturantInfoManager.newInstance().getBrandId();
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int brandId = RestaurantInfoManager.newInstance().getBrandId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.getPayMethods(brandId, restaurantId, FoodSummaryConstans.RESTAURANT_MODE)
.subscribeOn(Schedulers.io())
.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;
import android.text.TextUtils;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
......@@ -517,7 +517,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
}
public void getCurrentSoldoutFood() {
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId))
.build();
......@@ -793,7 +793,7 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
// RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
// String json = GsonUtils.GsonString(request);
long restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
long restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
RequestBody requestBody = new FormBody.Builder()
.add("restaurantId", String.valueOf(restaurantId))
.build();
......@@ -873,8 +873,8 @@ public class SoldoutCtrlPresenter extends BasePresenter<SoldoutCtrlContract.Mode
private SoldoutRequest.Insert getInsertSoldoutRequest(Long foodId, Long modifierId, int remainingNumber) {
SoldoutRequest.Insert request = new SoldoutRequest.Insert();
request.setBrandId(ResturantInfoManager.newInstance().getBrandId());
request.setRestaurantId(ResturantInfoManager.newInstance().getRestaurantId());
request.setBrandId(RestaurantInfoManager.newInstance().getBrandId());
request.setRestaurantId(RestaurantInfoManager.newInstance().getRestaurantId());
if (foodId != null) {
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;
import com.gingersoft.gsa.cloud.common.bean.BaseResult;
import com.gingersoft.gsa.cloud.common.constans.FoodSummaryConstans;
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.TableExtBean;
import com.gingersoft.gsa.cloud.common.function.XFunctionManager;
......@@ -233,7 +233,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
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)
.subscribeOn(Schedulers.io())
.doOnSubscribe(disposable -> {
......@@ -769,7 +769,7 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
}
public void getFoodSummarys(OnNetworkCallbackListener networkCallBackListener) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
byte businessType = FoodSummary.BUSINESS_TYPE_SKYORDER;
mModel.getFoodSummarys(restaurantId, false, businessType)
.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;
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.utils.JsonUtils;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderCenterContract;
......@@ -80,7 +80,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
* @param 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) {
//根據數據庫下標分頁
pageIndex = pageIndex * pageSize;
......@@ -167,7 +167,7 @@ public class OrderCenterPresenter extends BasePresenter<OrderCenterContract.Mode
* @param orderId
*/
public void cancelOrder(long orderId, String orderType) {
int restaurantId = ResturantInfoManager.newInstance().getRestaurantId();
int restaurantId = RestaurantInfoManager.newInstance().getRestaurantId();
mModel.cancelOrder(orderId, restaurantId, orderType)
.subscribeOn(Schedulers.io())
.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;
import com.gingersoft.gsa.cloud.common.constans.GoldConstants;
import com.gingersoft.gsa.cloud.common.constans.MealConstant;
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.scan.ScanHelper;
import com.gingersoft.gsa.cloud.common.utils.LanguageUtils;
......@@ -462,7 +462,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override
public int getRestaurantId() {
return ResturantInfoManager.newInstance().getRestaurantId();
return RestaurantInfoManager.newInstance().getRestaurantId();
}
@Override
......@@ -612,7 +612,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
@Override
public void onInputPhone(UseMemberDialog dialog, String phone) {
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
......@@ -1335,7 +1335,7 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter>
return;
}
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;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
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.user.UserContext;
import com.gingersoft.gsa.cloud.common.scan.ScanHelper;
......@@ -621,7 +621,7 @@ public class OrderContentActivity extends BaseFragmentActivity<OrderContentPrese
return;
}
}
mPresenter.queryCoupon(memberId, couponMemberId, qrCodeContent[1], ResturantInfoManager.newInstance().getRestaurantId());
mPresenter.queryCoupon(memberId, couponMemberId, qrCodeContent[1], RestaurantInfoManager.newInstance().getRestaurantId());
}
}
} 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;
* @update date: 2020-11-21
* @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 {
*/
private RestaurantInfo restaurantInfo;
private ResturantInfoManager() {
private RestaurantInfoManager() {
if (brandInfo == null) {
brandInfo = new BrandInfo();
}
......@@ -38,15 +38,15 @@ public class ResturantInfoManager {
restaurantInfo.setRestaurantName((String) SPUtils.get(UserConstans.restaurantName, ""));
}
public static ResturantInfoManager newInstance() {
if (sResturantInfoManager == null) {
synchronized (ResturantInfoManager.class) {
if (sResturantInfoManager == null) {
sResturantInfoManager = new ResturantInfoManager();
public static RestaurantInfoManager newInstance() {
if (sRestaurantInfoManager == null) {
synchronized (RestaurantInfoManager.class) {
if (sRestaurantInfoManager == null) {
sRestaurantInfoManager = new RestaurantInfoManager();
}
}
}
return sResturantInfoManager;
return sRestaurantInfoManager;
}
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;
import android.content.Context;
import android.text.TextUtils;
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 java.util.ArrayList;
import java.util.List;
......@@ -18,7 +18,7 @@ import java.util.List;
public class RestaurantInfoUtils {
public static List<BrandsBean.BrandsData> getBrandList() {
String brandRestaurantInfos = ResturantInfoManager.getBrandRestaurantInfos();
String brandRestaurantInfos = RestaurantInfoManager.getBrandRestaurantInfos();
if (!TextUtils.isEmpty(brandRestaurantInfos)) {
List<BrandsBean.BrandsData> brandsBeans = JsonUtils.parseArray(brandRestaurantInfos, BrandsBean.BrandsData.class);
return brandsBeans;
......
library-common/src/main/java/com/gingersoft/gsa/cloud/common/core/user/UserContext.java
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.state.LoginedState;
import com.gingersoft.gsa.cloud.common.core.user.state.LogoutState;
......@@ -109,8 +109,8 @@ public class UserContext {
SPUtils.remove(UserConstans.memberId);
SPUtils.remove(UserConstans.memberName);
//刪除用戶信息的同時 將品牌，餐廳信息一起刪除
ResturantInfoManager.newInstance().removeBrandInfo();
ResturantInfoManager.newInstance().removeResturantInfo();
RestaurantInfoManager.newInstance().removeBrandInfo();
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
import com.gingersoft.gsa.cloud.common.R
import com.gingersoft.gsa.cloud.common.constans.AppConstans
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.utils.SoundPoolUtils
import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils
......@@ -65,7 +65,7 @@ class GetInfoUpdateService : Service() {
}
val restaurantId by lazy {
ResturantInfoManager.newInstance().getRestaurantId()
RestaurantInfoManager.newInstance().getRestaurantId()
}
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;
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.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
......@@ -228,14 +228,14 @@ public class OkHttp3Utils {
String restaurantInfo = DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()) + "|" + DeviceUtils.getVersionCode(GsaCloudApplication.getAppContext()) +
"--" + TimeUtils.getCurrentDate(TimeUtils.DEFAULT_DATE_FORMAT) +
"--CODE：" + errCode +
"--餐廳:" + ResturantInfoManager.newInstance().getBrandName() +
"--" + ResturantInfoManager.newInstance().getRestaurantName() +
"--ID：" + ResturantInfoManager.newInstance().getRestaurantId() +
"--餐廳:" + RestaurantInfoManager.newInstance().getBrandName() +
"--" + RestaurantInfoManager.newInstance().getRestaurantName() +
"--ID：" + RestaurantInfoManager.newInstance().getRestaurantId() +
"--用戶：" + UserContext.newInstance().getMemberName() + "|" + UserContext.newInstance().getMemberId() +
"--原因：" + pushContent;
RequestBody requestBody = new FormBody.Builder()
.add("code", errCode)//錯誤碼
.add("shopId", ResturantInfoManager.newInstance().getGsPosShopId())
.add("shopId", RestaurantInfoManager.newInstance().getGsPosShopId())
.add("source", GsaCloudApplication.getAppName() + "")//錯誤來源
.add("pushContent", restaurantInfo)//推送內容
.add("version", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()))//系統版本
......
library-common/src/main/res/values/styles.xml
......@@ -409,6 +409,7 @@
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/dp_14</item>
</style>
<style name="AppEditTextStyle">
<item name="android:textColorHint">@color/color_c9</item>
<item name="android:textSize">@dimen/dp_16</item>
......@@ -416,6 +417,7 @@
<item name="android:textColor">@color/color_3c</item>
<item name="android:background">@null</item>
</style>
<style name="otherOrder_delivery_setting_layout_style">
<item name="android:paddingRight">@dimen/dp_20</item>
</style>
......@@ -474,6 +476,11 @@
<item name="android:textSize">@dimen/dp_16</item>
</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">
<item name="android:paddingTop">@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;
import com.gingersoft.gsa.cloud.common.constans.AppConstans;
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.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
......@@ -85,8 +85,8 @@ public class PrintContentAdapter implements AdaptationContent {
} else {
takeawayPrintContent = new PrintTakeawayFormContent();
}
takeawayPrintContent.setBrand(ResturantInfoManager.newInstance().getBrandName());
takeawayPrintContent.setResturantName(ResturantInfoManager.newInstance().getRestaurantName());
takeawayPrintContent.setBrand(RestaurantInfoManager.newInstance().getBrandName());
takeawayPrintContent.setResturantName(RestaurantInfoManager.newInstance().getRestaurantName());
if (data.getOrder_type() == 2) {
takeawayPrintContent.setOrderType("外送");
} else {
......
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