Skip to content

S
supplier
Commit 7db7fc6d by Wyh Committed by 宁斌
Options

6.05 自取單問題，添加配送優化

parent 61371513
Showing with 62 additions and 61 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
......@@ -73,7 +73,7 @@ public class HttpsConstans {
* 4=世维
* 5=石书
*/
public static int isFormal = 2;
public static int isFormal = 1;
//沽清控制地址
......@@ -95,7 +95,7 @@ public class HttpsConstans {
public static String WECHAR_REPORT_SERVER_ADDRESS;// = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
public static void init(Context context,boolean isSwitchServer) {
isFormal = (int) SPUtils.get(context, "isFormal", 2);
isFormal = (int) SPUtils.get(context, "isFormal", 1);
if (!BuildConfig.DEBUG && !isSwitchServer) {
isFormal = 1;
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/DeliveryViewModel.kt
package com.gingersoft.gsa.other_order_mode.model.viewModel
import android.util.Log
import androidx.lifecycle.MutableLiveData
import com.gingersoft.gsa.other_order_mode.data.DeliveryRepository
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryAddSuccessConfig
import com.gingersoft.gsa.other_order_mode.data.model.bean.DeliveryConfig
......@@ -8,13 +8,15 @@ import com.gingersoft.gsa.other_order_mode.data.model.bean.MessageBean
class DeliveryViewModel(private val repository: DeliveryRepository) : BaseViewModel() {
fun queryDeliveryList(restaurantId: String, listenter: (DeliveryConfig?) -> Unit) {
var otherInfo = MutableLiveData<DeliveryConfig>()
fun queryDeliveryList(restaurantId: String) {
launch({
repository.queryDeliveryList(restaurantId).apply {
listenter.invoke(this)
otherInfo.postValue(this)
}
}, {
listenter.invoke(null)
otherInfo.value = null
})
}
......@@ -29,6 +31,7 @@ class DeliveryViewModel(private val repository: DeliveryRepository) : BaseViewMo
0, "", "", restaurantId, "", "", lackPrice.toDouble(),
type, createBy)).apply {
listenter.invoke(this)
queryDeliveryList(restaurantId.toString())
}
}, {
listenter.invoke(null)
......@@ -38,12 +41,13 @@ class DeliveryViewModel(private val repository: DeliveryRepository) : BaseViewMo
fun updateDeliveryConfig(distributionFeeMin: String, distributionFeeMax: String,
distributionFee: String, deliveryCost: String,
distributionType: String, type: Int,
desc: String, id: Int,
desc: String, id: Int, restaurantId: Int,
createBy: Int, lackPrice: String, deletes: Int, listenter: (MessageBean?) -> Unit) {
launch({
repository.updateDelivery(distributionFeeMin, distributionFeeMax, distributionFee, deliveryCost,
distributionType, type.toString(), desc, id.toString(), createBy.toString(), deletes, lackPrice).apply {
listenter.invoke(this)
queryDeliveryList(restaurantId.toString())
}
}, {
listenter.invoke(null)
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
......@@ -319,7 +319,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
4 -> 0
else -> 2
}
if (data.order_type == 2) {
// if (data.order_type == 2) {
// 是外賣
if (status == 3) {
if (orderDetails.data!![0].isDelete != 0) {
......@@ -380,12 +380,12 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
updateOrderAndPrint(data, status, isPush, orderDetails, context, listener)
}
}
} else {
// 自取的確認訂單
repository.updateSelfOrderStatus(data.Id.toString(), status.toString(), GsaCloudApplication.getRestaurantId(context).toString()).apply {
listener.invoke(success)
}
}
// } else {
// // 自取的確認訂單
// repository.updateSelfOrderStatus(data.Id.toString(), status.toString(), GsaCloudApplication.getRestaurantId(context).toString()).apply {
// listener.invoke(success)
// }
// }
}, {
})
......@@ -623,5 +623,6 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
override fun onCleared() {
super.onCleared()
cancelDialogForLoading()
}
}
\ No newline at end of file
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/DeliverySettingActivity.kt
......@@ -17,7 +17,7 @@ class DeliverySettingActivity : BaseActivity() {
setContentView(R.layout.activity_delivery)
deliverylist_fragment = supportFragmentManager.findFragmentById(R.id.deliverylist_fragment) as DeliveryFragment
top_bar_delivery.setTitle("備送設置")
top_bar_delivery.setTitle("配送設置")
top_bar_delivery.setBackgroundColor(resources.getColor(R.color.theme_color))
top_bar_delivery.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { finish() }
top_bar_delivery.addRightImageButton(R.drawable.ic_add, R.id.topbar_right_change_button).setOnClickListener { v ->
......@@ -25,13 +25,7 @@ class DeliverySettingActivity : BaseActivity() {
}
}
fun editDelivery(info: DeliveryConfig.Data.DeliveryInfo) {
supportFragmentManager.beginTransaction().replace(R.id.fl_delivery, UpdateDeliveryFragment.newInstance(info)).addToBackStack(null).commit()
fun editDelivery(info: DeliveryConfig.Data.DeliveryInfo?) {
supportFragmentManager.beginTransaction().add(R.id.fl_delivery, UpdateDeliveryFragment.newInstance(info)).addToBackStack(null).commit()
}
fun queryList() {
deliverylist_fragment.queryList()
}
}
\ No newline at end of file
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/DeliveryListAdapter.kt
......@@ -35,7 +35,7 @@ class DeliveryListAdapter(val context: Context, data: List<DeliveryConfig.Data.D
// deliveryType = it.distributionType
deliveryExpenses = "${it.distributionFeeMin}-${it.distributionFeeMax}"
deliveryFee = it.deliveryCost.toString()
deliveryMethod = if (it.type == 1) "物流備送" else "本店備送"
deliveryMethod = if (it.type == 1) "物流配送" else "本店配送"
deliveryDifference = it.lackPrice.toString()
}
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/adapter/TextAdapter.kt
package com.gingersoft.gsa.other_order_mode.ui.adapter
import android.widget.TextView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.gingersoft.gsa.other_order_mode.R
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView
class TextAdapter(list: List<String>) : BaseQuickAdapter<String, BaseViewHolder>(R.layout.item_textview, list) {
override fun convert(helper: BaseViewHolder?, item: String?) {
helper?.setText(R.id.tv_item, item)
helper?.itemView!!.setOnClickListener {
helper?.getView<TextView>(R.id.tv_item)!!.setOnClickListener {
if (onItemClickListener != null) {
onItemClickListener.onItemClick(this, it, helper.adapterPosition)
}
......
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/DeliveryFragment.kt
......@@ -6,6 +6,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
......@@ -37,12 +38,10 @@ class DeliveryFragment : BaseFragment() {
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(activity?.viewModelStore!!, InjectorUtil.getDeliveryFactory())[DeliveryViewModel::class.java]
queryList()
}
fun queryList() {
viewModel.queryDeliveryList(GsaCloudApplication.getRestaurantId(activity!!).toString()) { it ->
tv_add_delivery.setOnClickListener{
(activity as DeliverySettingActivity).editDelivery(null)
}
viewModel.otherInfo.observe(viewLifecycleOwner, Observer { it ->
if (it?.data?.list != null && it.data.list.isNotEmpty()) {
if (deliveryListAdapter == null) {
deliveryListAdapter = DeliveryListAdapter(context!!, it.data.list)
......@@ -54,13 +53,12 @@ class DeliveryFragment : BaseFragment() {
deliveryListAdapter!!.setOnItemChildClickListener { adapter, view, position ->
when (view.id) {
R.id.iv_delete -> {
AppDialog.showWaringDialog(context, "是否確認刪除") { view, dialog ->
AppDialog.showWaringDialog(context, "是否確認刪除") { _, dialog ->
showLoading()
it.data.list[position].apply {
viewModel.updateDeliveryConfig(distributionFeeMin.toString(), distributionFeeMax.toString(), distributionFee.toString(), deliveryCost.toString(), distributionType, type, desc, id, GsaCloudApplication.getMemberId(context), lackPrice.toString(), 1) {
viewModel.updateDeliveryConfig(distributionFeeMin.toString(), distributionFeeMax.toString(), distributionFee.toString(), deliveryCost.toString(), distributionType, type, desc, id, GsaCloudApplication.getRestaurantId(context), GsaCloudApplication.getMemberId(context), lackPrice.toString(), 1) {
dialog.dismiss()
cancelDialogForLoading()
queryList()
}
}
}
......@@ -78,7 +76,9 @@ class DeliveryFragment : BaseFragment() {
it.visibility = View.GONE
}
}
}
})
viewModel.queryDeliveryList(GsaCloudApplication.getRestaurantId(activity!!).toString())
}
}
other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/UpdateDeliveryFragment.kt
......@@ -50,7 +50,7 @@ class UpdateDeliveryFragment : BaseFragment() {
var pop: QMUIPopup? = null
var deliveryType = arrayListOf("短途送", "中途送", "長途送")
var deliveryMethod = arrayListOf("本店備送", "第三方")
var deliveryMethod = arrayListOf("本店配送", "第三方")
var deliveryTypeTag = arrayListOf("SHORT_RANGE", "STANDARD", "LONG_DISTANCE")
var selectDeliveryType = deliveryTypeTag[0]//用戶當前選中的配送類型
......@@ -60,7 +60,7 @@ class UpdateDeliveryFragment : BaseFragment() {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(activity?.viewModelStore!!, InjectorUtil.getDeliveryFactory())[DeliveryViewModel::class.java]
top_bar_update_delivery.setTitle("備送設置")
top_bar_update_delivery.setTitle("配送設置")
top_bar_update_delivery.setBackgroundColor(resources.getColor(R.color.theme_color))
top_bar_update_delivery.addLeftImageButton(R.drawable.icon_return, R.id.iv_left_back).setOnClickListener { activity?.let { it.onBackPressed() } }
......@@ -85,7 +85,7 @@ class UpdateDeliveryFragment : BaseFragment() {
selectDeliveryType = it.distributionType
//備送方式
tv_delivery_method.text = when (it.type) {
0 -> "本店備送"
0 -> "本店配送"
1 -> "第三方"
else -> ""
}
......@@ -113,11 +113,11 @@ class UpdateDeliveryFragment : BaseFragment() {
return@setOnClickListener
}
if (ed_delivery_fee.text.isEmpty()) {
ToastUtils.show(context, "請輸入配送費")
ToastUtils.show(context, "請輸入運費")
return@setOnClickListener
}
if (ed_start_delivery_fee.text.isEmpty()) {
ToastUtils.show(context, "請輸入起送費")
ToastUtils.show(context, "請輸入最低消費")
return@setOnClickListener
}
showLoading()
......@@ -128,10 +128,7 @@ class UpdateDeliveryFragment : BaseFragment() {
cancelDialogForLoading()
if (it != null && it.success) {
ToastUtils.show(context, "保存成功")
(activity as DeliverySettingActivity).let {
it.queryList()
it.onBackPressed()
}
(activity as DeliverySettingActivity).onBackPressed()
} else {
ToastUtils.show(context, "保存失敗")
}
......@@ -139,14 +136,11 @@ class UpdateDeliveryFragment : BaseFragment() {
} 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, GsaCloudApplication.getMemberId(context), ed_difference_fee.text.toString(), 0) { it ->
ed_desc.text.toString(), deliveryConfig!!.id, GsaCloudApplication.getRestaurantId(context), GsaCloudApplication.getMemberId(context), ed_difference_fee.text.toString(), 0) { it ->
cancelDialogForLoading()
if (it != null && it.success) {
ToastUtils.show(context, "修改成功")
(activity as DeliverySettingActivity).let {
it.queryList()
it.onBackPressed()
}
(activity as DeliverySettingActivity).onBackPressed()
} else {
ToastUtils.show(context, "修改失敗")
}
......
other_order_mode/src/main/res/drawable/shape_black_border.xml
......@@ -4,4 +4,5 @@
<stroke
android:width="@dimen/dp_1"
android:color="@color/black" />
</shape>
\ No newline at end of file
other_order_mode/src/main/res/layout/fragment_delivery_list.xml
......@@ -15,7 +15,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_border_bg"
android:text="添加備送方式"
android:text="添加配送方式"
android:padding="@dimen/dp_10"
android:textColor="@color/theme_color" />
</LinearLayout>
\ No newline at end of file
other_order_mode/src/main/res/layout/item_textview.xml
......@@ -8,8 +8,9 @@
android:id="@+id/tv_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20"
android:background="@drawable/selector_item_background"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:text="短途送"
......
other_order_mode/src/main/res/layout/layout_more_popup.xml
......@@ -13,7 +13,7 @@
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_10"
android:text="備送設置"
android:text="配送設置"
android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" />
......
other_order_mode/src/main/res/layout/update_delivery_fragment.xml
......@@ -36,8 +36,9 @@
<EditText
android:id="@+id/et_min_delivery_fee"
style="@style/otherOrderInfoDialogTextStyle"
android:layout_width="@dimen/dp_50"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:minWidth="@dimen/dp_50"
android:background="@drawable/shape_black_border"
android:gravity="right|center_vertical"
android:paddingLeft="@dimen/dp_10"
......@@ -56,7 +57,8 @@
<EditText
android:id="@+id/et_max_delivery_fee"
style="@style/otherOrderInfoDialogTextStyle"
android:layout_width="@dimen/dp_50"
android:layout_width="wrap_content"
android:minWidth="@dimen/dp_50"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_20"
android:paddingLeft="@dimen/dp_10"
......@@ -81,7 +83,7 @@
style="@style/otherOrderInfoDialogTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="配送費：" />
android:text="運費：" />
<EditText
android:id="@+id/ed_delivery_fee"
......@@ -108,7 +110,7 @@
style="@style/otherOrderInfoDialogTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="起送費：" />
android:text="最低消費：" />
<EditText
android:id="@+id/ed_start_delivery_fee"
......@@ -138,7 +140,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="備送類型：" />
android:text="配送類型：" />
<TextView
android:id="@+id/tv_delivery_type"
......@@ -169,7 +171,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="備送方式：" />
android:text="配送方式：" />
<TextView
android:id="@+id/tv_delivery_method"
......@@ -177,7 +179,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_10"
android:text="本店備送" />
android:text="本店配送" />
<ImageView
android:layout_width="wrap_content"
......
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