Skip to content

S
supplier
Commit 7b53780d by Wyh
Options

新訂單 

Signed-off-by: Wyh <1239658231>
parent 8919d4f9
Showing with 194 additions and 81 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
...@@ -73,6 +73,7 @@ class OrderDetails { ...@@ -73,6 +73,7 @@ class OrderDetails {
var billNo: String? = null var billNo: String? = null
var RECEIVER: String? = null var RECEIVER: String? = null
var TOTAL_AMOUNT: String? = null var TOTAL_AMOUNT: String? = null
//後台不會返回 //後台不會返回
var order_type: Int = 0 var order_type: Int = 0
var orderPayType: Int = 0//0店內支付，1為貨到付款，2是在線支付 var orderPayType: Int = 0//0店內支付，1為貨到付款，2是在線支付
...@@ -99,6 +100,7 @@ class OrderDetails { ...@@ -99,6 +100,7 @@ class OrderDetails {
var nowPoints: Double = 0.toDouble()//現在有多少積分 var nowPoints: Double = 0.toDouble()//現在有多少積分
var deliveryAmount: Double = 0.toDouble()//當前運輸工具金額 var deliveryAmount: Double = 0.toDouble()//當前運輸工具金額
var curStat: Int = 0//訂單已創建 1 var curStat: Int = 0//訂單已創建 1
// * * Order Assigned To Delivery Man - 配送員已接單 2 // * * Order Assigned To Delivery Man - 配送員已接單 2
// * * Delivery Man Reached Pickup Point Nearby - 配送員已到達店鋪附近 3 // * * Delivery Man Reached Pickup Point Nearby - 配送員已到達店鋪附近 3
// * * Delivery Man Reached Pickup Point - 配送员已到店 4 // * * Delivery Man Reached Pickup Point - 配送员已到店 4
...@@ -129,15 +131,17 @@ class OrderDetails { ...@@ -129,15 +131,17 @@ class OrderDetails {
var child: List<ChildBeanX>? = null var child: List<ChildBeanX>? = null
var printseting: String? = null var printseting: String? = null
var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是 var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印 //0食品清单打印 账单打印
//1食品清单不打印 账单不打印 //1食品清单不打印 账单不打印
//2食品清单打印 账单不打印 //2食品清单打印 账单不打印
//3食品清单不打印 账单打印 //3食品清单不打印 账单打印
var printTo: Int = 0 var printTo: Int = 0
var lunchboxPrice: Double = 0.0
class ChildBeanX : Serializable { class ChildBeanX : Serializable {
/** /**
* odsId : 1654482 * odsId : 1654487
* PRICE : 0.0 * PRICE : 0.0
* num : 2 * num : 2
* pid : 1654481 * pid : 1654481
...@@ -151,7 +155,9 @@ class OrderDetails { ...@@ -151,7 +155,9 @@ class OrderDetails {
var PRODUCT_NAME: String? = null var PRODUCT_NAME: String? = null
var child: List<ChildBean>? = null var child: List<ChildBean>? = null
var printseting: String? = null var printseting: String? = null
var lunchboxPrice: Double = 0.0
var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是 var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印 //0食品清单打印 账单打印
//1食品清单不打印 账单不打印 //1食品清单不打印 账单不打印
//2食品清单打印 账单不打印 //2食品清单打印 账单不打印
...@@ -171,6 +177,7 @@ class OrderDetails { ...@@ -171,6 +177,7 @@ class OrderDetails {
var pid: String? = null var pid: String? = null
var PRODUCT_NAME: String? = null var PRODUCT_NAME: String? = null
var printseting: String? = null var printseting: String? = null
var lunchboxPrice: Double = 0.0
var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是 var printToBill: Int = 1 //當金額=0時，是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印 //0食品清单打印 账单打印
//1食品清单不打印 账单不打印 //1食品清单不打印 账单不打印
......
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/WiseposBean.java → base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/WiseposBean.java
package com.gingersoft.gsa.cloud.bean; package com.gingersoft.gsa.cloud.print.bean;
public class WiseposBean { public class WiseposBean {
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
...@@ -3,10 +3,10 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.presenter; ...@@ -3,10 +3,10 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.presenter;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean; import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract; import com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract;
import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean; import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
...@@ -19,6 +19,7 @@ import org.json.JSONArray; ...@@ -19,6 +19,7 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -56,6 +57,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -56,6 +57,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
ImageLoader mImageLoader; ImageLoader mImageLoader;
@Inject @Inject
AppManager mAppManager; AppManager mAppManager;
public List<OrderDetails.DataBean.PRODUCTNAMEBean> productnameBeans = new ArrayList<>();
@Inject @Inject
public SendOrderPresenter(SendOrderContract.Model model, SendOrderContract.View rootView) { public SendOrderPresenter(SendOrderContract.Model model, SendOrderContract.View rootView) {
...@@ -144,6 +146,8 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -144,6 +146,8 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
public void onNext(@NonNull RiceponAddOrderBean info) { public void onNext(@NonNull RiceponAddOrderBean info) {
if (info.getCode().equals("1")) { if (info.getCode().equals("1")) {
mRootView.killMyself(); mRootView.killMyself();
} else if(TextUtil.isNotEmptyOrNullOrUndefined(info.getErrorMsg())){
mRootView.showMessage(info.getErrorMsg());
} }
} }
...@@ -174,69 +178,75 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -174,69 +178,75 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
//实际总价 //实际总价
json.put("totalPrice", MyOrderManage.getInstance().getTotalAmount()); json.put("totalPrice", MyOrderManage.getInstance().getTotalAmount());
json.put("waimaiSendTime", waimaiSendTime);//送单时间 json.put("waimaiSendTime", waimaiSendTime);//送单时间
JSONArray array = new JSONArray(); JSONArray foodArray = new JSONArray();
List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList(); for (OrderDetails.DataBean.PRODUCTNAMEBean productnameBean : productnameBeans) {
for (int i = 0; i < orderDetails.size(); i++) { JSONObject food = getFoodJson(productnameBean);
OrderDetail orderDetail = orderDetails.get(i); if (productnameBean.getChild() != null) {
JSONObject food = getFoodJson(orderDetail); JSONArray secondJsonArray = new JSONArray();
if (i + 1 < orderDetails.size() && orderDetails.get(i + 1).getParentId() == orderDetail.getProductId() for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBeanX : productnameBean.getChild()) {
&& orderDetails.get(i + 1).getItemType() != 0) { JSONObject secondJsonObj = getFoodJson(childBeanX);
//如果下一個食品的父級id是當前食品的id if (childBeanX.getChild() != null) {
JSONArray foodArray = new JSONArray(); JSONArray thirdJsonArray = new JSONArray();
long foodId = orderDetail.getProductId(); for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean : childBeanX.getChild()) {
for (int j = i + 1; j < orderDetails.size(); j++) { thirdJsonArray.put(getFoodJson(childBean));
OrderDetail secondOrderDetail = orderDetails.get(j);
JSONObject secondFood = getFoodJson(secondOrderDetail);
JSONArray secondArray = new JSONArray();
if (orderDetails.get(j).getParentId() == foodId) {
secondArray.put(secondFood);
long secondFoodId = secondOrderDetail.getProductId();
if (j + 1 < orderDetails.size() && orderDetails.get(j + 1).getParentId() == secondOrderDetail.getProductId()) {
for (int k = j + 1; k < orderDetails.size(); k++) {
JSONObject thirdFood = getFoodJson(secondOrderDetail);
JSONArray thirdArray = new JSONArray();
if (orderDetails.get(k).getParentId() == secondFoodId) {
thirdArray.put(getFoodJson(orderDetails.get(k)));
} else {
thirdFood.put("itemDetail", thirdArray);
secondArray.put(thirdFood);
i = k;
break;
}
}
} }
} else { secondJsonObj.put("itemDetail", thirdJsonArray);
secondFood.put("itemDetail", secondArray);
foodArray.put(secondFood);
i = j;
break;
} }
secondJsonArray.put(secondJsonObj);
food.put("itemDetail", secondJsonArray);
} }
} else {
array.put(food);
} }
foodArray.put(food);
} }
json.put("foods", array); json.put("foods", foodArray);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }
return json.toString(); return json.toString();
} }
private JSONObject getFoodJson(OrderDetail orderDetail) { private JSONObject getFoodJson(OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean) {
JSONObject object = new JSONObject();
try {
object.put("posFid", childBean.getPid());
object.put("productId", childBean.getOdsId());
object.put("productName", childBean.getPRODUCT_NAME());
object.put("number", childBean.getNum());
object.put("price", childBean.getPRICE());
object.put("lunchboxPrice", childBean.getLunchboxPrice());
} catch (JSONException e) {
e.printStackTrace();
}
return object;
}
private JSONObject getFoodJson(OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBean) {
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
try { try {
object.put("posFid", orderDetail.getParentId()); object.put("posFid", childBean.getPid());
object.put("productId", orderDetail.getProductId()); object.put("productId", childBean.getOdsId());
object.put("productName", orderDetail.getProductName()); object.put("productName", childBean.getPRODUCT_NAME());
object.put("number", orderDetail.getNumber()); object.put("number", childBean.getNum());
object.put("price", orderDetail.getPrice()); object.put("price", childBean.getPRICE());
object.put("lunchboxPrice", orderDetail.getLunchboxPrice()); object.put("lunchboxPrice", childBean.getLunchboxPrice());
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }
return object; return object;
} }
private JSONObject getFoodJson(OrderDetails.DataBean.PRODUCTNAMEBean productnameBean) {
JSONObject object = new JSONObject();
try {
object.put("posFid", productnameBean.getPid());
object.put("productId", productnameBean.getOdsId());
object.put("productName", productnameBean.getPRODUCT_NAME());
object.put("number", productnameBean.getNum());
object.put("price", productnameBean.getPRICE());
object.put("lunchboxPrice", productnameBean.getLunchboxPrice());
} catch (JSONException e) {
e.printStackTrace();
}
return object;
}
} }
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
...@@ -128,13 +128,61 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -128,13 +128,61 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
sendTime = deliveryTimes.get(0); sendTime = deliveryTimes.get(0);
List<OrderDetails.DataBean.PRODUCTNAMEBean> productnameBeans = new ArrayList<>(); List<OrderDetails.DataBean.PRODUCTNAMEBean> productnameBeans = mPresenter.productnameBeans;
List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList(); List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList();
for (OrderDetail orderDetail : orderDetails) { for (int i = 0; i < orderDetails.size(); i++) {
OrderDetails.DataBean.PRODUCTNAMEBean productnameBean = new OrderDetails.DataBean.PRODUCTNAMEBean(); OrderDetail orderDetail = orderDetails.get(i);
productnameBean.setPRODUCT_NAME(orderDetail.getProductName()); long foodId = orderDetail.getProductId();
productnameBean.setNum(orderDetail.getNumber() + ""); OrderDetails.DataBean.PRODUCTNAMEBean productnameBean = orderDetailTranProductnameBean(orderDetail);
productnameBean.setPRICE(orderDetail.getPrice() + ""); if (i + 1 < orderDetails.size() && orderDetails.get(i + 1).getItemType() != 1
&& orderDetails.get(i + 1).getParentId() == orderDetail.getProductId()) {
List<OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX> childBeanXList = new ArrayList<>();
OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBeanX = new OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX();
//如果下一個食品的父級id是當前食品的id
for (int j = i + 1; j < orderDetails.size(); j++) {
OrderDetail secondOrderDetail = orderDetails.get(j);
if (secondOrderDetail.getParentId() == foodId) {
long secondFoodId = secondOrderDetail.getProductId();
//當前食品是orderDetail的子食品，遍歷後面的食品是不是當前食品的子食品（三級子食品）
if (j + 1 < orderDetails.size() && orderDetails.get(j + 1).getItemType() != 1
&& orderDetails.get(j + 1).getItemType() != 2
&& orderDetails.get(j + 1).getParentId() == secondFoodId) {
List<OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean> childBeans = new ArrayList<>();
OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean = new OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean();
for (int k = 0; k < orderDetails.size(); k++) {
OrderDetail thirdOrderDetail = orderDetails.get(j);
if (thirdOrderDetail.getParentId() == secondFoodId) {
childBean.setPRODUCT_NAME(thirdOrderDetail.getProductName());
childBean.setNum(thirdOrderDetail.getNumber() + "");
childBean.setOdsId(thirdOrderDetail.getProductId() + "");
childBean.setPid(thirdOrderDetail.getParentId() + "");
childBean.setPRICE(thirdOrderDetail.getPrice() + "");
childBean.setLunchboxPrice(thirdOrderDetail.getLunchboxPrice());
childBeans.add(childBean);
j = k;
} else {
j = k - 1;
break;
}
}
childBeanX.setChild(childBeans);
} else {
childBeanX.setPRODUCT_NAME(secondOrderDetail.getProductName());
childBeanX.setNum(secondOrderDetail.getNumber() + "");
childBeanX.setPRICE(secondOrderDetail.getPrice() + "");
childBeanX.setOdsId(secondOrderDetail.getProductId() + "");
childBeanX.setPid(secondOrderDetail.getParentId() + "");
childBeanX.setLunchboxPrice(secondOrderDetail.getLunchboxPrice());
childBeanXList.add(childBeanX);
i = j;
}
} else {
i = j - 1;
break;
}
}
productnameBean.setChild(childBeanXList);
}
productnameBeans.add(productnameBean); productnameBeans.add(productnameBean);
} }
FoodListAdapter adapter = new FoodListAdapter(mContext, productnameBeans); FoodListAdapter adapter = new FoodListAdapter(mContext, productnameBeans);
...@@ -156,6 +204,14 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -156,6 +204,14 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
rvSendOrderBills.setLayoutManager(new LinearLayoutManager(mContext)); rvSendOrderBills.setLayoutManager(new LinearLayoutManager(mContext));
} }
private OrderDetails.DataBean.PRODUCTNAMEBean orderDetailTranProductnameBean(OrderDetail orderDetail) {
OrderDetails.DataBean.PRODUCTNAMEBean productnameBean = new OrderDetails.DataBean.PRODUCTNAMEBean();
productnameBean.setPRODUCT_NAME(orderDetail.getProductName());
productnameBean.setNum(orderDetail.getNumber() + "");
productnameBean.setPRICE(orderDetail.getPrice() + "");
return productnameBean;
}
@Override @Override
public void initIntent() { public void initIntent() {
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
...@@ -38,6 +38,7 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.SectionsPagerAdapter ...@@ -38,6 +38,7 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.SectionsPagerAdapter
import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.delivery_pick_mode.util.getmColor import com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import com.jess.arms.mvp.IPresenter
import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
import com.qmuiteam.qmui.alpha.QMUIAlphaTextView import com.qmuiteam.qmui.alpha.QMUIAlphaTextView
import com.qmuiteam.qmui.util.QMUIDisplayHelper import com.qmuiteam.qmui.util.QMUIDisplayHelper
...@@ -46,7 +47,7 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopups ...@@ -46,7 +47,7 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopups
import kotlinx.android.synthetic.main.activity_other_order.* import kotlinx.android.synthetic.main.activity_other_order.*
class DeliveryOrderMainActivity : BaseActivity() { class DeliveryOrderMainActivity : BaseActivity<IPresenter>() {
private val pageViewModel by lazy { ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] } private val pageViewModel by lazy { ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java] }
private val instance by lazy { this } private val instance by lazy { this }
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliverySettingActivity.kt
...@@ -7,9 +7,10 @@ import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig ...@@ -7,9 +7,10 @@ import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.DeliveryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.DeliveryFragment
import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.UpdateDeliveryFragment import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.UpdateDeliveryFragment
import com.jess.arms.mvp.IPresenter
import kotlinx.android.synthetic.main.activity_delivery.* import kotlinx.android.synthetic.main.activity_delivery.*
class DeliverySettingActivity : BaseActivity() { class DeliverySettingActivity : BaseActivity<IPresenter>() {
lateinit var deliverylist_fragment: DeliveryFragment lateinit var deliverylist_fragment: DeliveryFragment
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/HistoryOrderActivity.kt
...@@ -15,11 +15,12 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.HistoryFragment ...@@ -15,11 +15,12 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.HistoryFragment
import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.delivery_pick_mode.util.getmColor import com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import com.google.android.material.tabs.TabLayout import com.google.android.material.tabs.TabLayout
import com.jess.arms.mvp.IPresenter
import kotlinx.android.synthetic.main.activity_history_order.* import kotlinx.android.synthetic.main.activity_history_order.*
import java.text.ParseException import java.text.ParseException
import java.util.* import java.util.*
class HistoryOrderActivity : BaseActivity() { class HistoryOrderActivity : BaseActivity<IPresenter>() {
private lateinit var mViewModel: HistoryOrderViewModel private lateinit var mViewModel: HistoryOrderViewModel
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
...@@ -46,12 +46,13 @@ import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil ...@@ -46,12 +46,13 @@ import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.gingersoft.gsa.delivery_pick_mode.util.getmColor import com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import com.gingersoft.gsa.delivery_pick_mode.util.showSelectDialog import com.gingersoft.gsa.delivery_pick_mode.util.showSelectDialog
import com.gingersoft.gsa.delivery_pick_mode.util.showWaringDialog import com.gingersoft.gsa.delivery_pick_mode.util.showWaringDialog
import com.jess.arms.mvp.IPresenter
import com.qmuiteam.qmui.widget.QMUITopBar import com.qmuiteam.qmui.widget.QMUITopBar
import kotlinx.android.synthetic.main.activity_order_details.* import kotlinx.android.synthetic.main.activity_order_details.*
import java.lang.StringBuilder import java.lang.StringBuilder
import java.util.* import java.util.*
class OrderDetailsActivity : BaseActivity() { class OrderDetailsActivity : BaseActivity<IPresenter>() {
private lateinit var pageViewModel: PageViewModel private lateinit var pageViewModel: PageViewModel
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
...@@ -20,9 +20,10 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter ...@@ -20,9 +20,10 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter
import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter
import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity import com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import com.jess.arms.mvp.IPresenter
import kotlinx.android.synthetic.main.activity_pay.* import kotlinx.android.synthetic.main.activity_pay.*
class PayActivity : BaseActivity() { class PayActivity : BaseActivity<IPresenter>() {
private lateinit var pageViewModel: PageViewModel private lateinit var pageViewModel: PageViewModel
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/base/BaseActivity.kt
package com.gingersoft.gsa.delivery_pick_mode.ui.base package com.gingersoft.gsa.delivery_pick_mode.ui.base
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog
import com.jess.arms.base.BaseActivity
import com.jess.arms.di.component.AppComponent
import com.jess.arms.mvp.BasePresenter
import com.jess.arms.mvp.IModel
import com.jess.arms.mvp.IPresenter
import com.jess.arms.mvp.IView
open class BaseActivity : AppCompatActivity() { open class BaseActivity<P : IPresenter> : BaseActivity<P>() {
fun showLoading(message: String? = null) { fun showLoading(message: String? = null) {
if (message != null) if (message != null)
...@@ -12,8 +19,33 @@ open class BaseActivity : AppCompatActivity() { ...@@ -12,8 +19,33 @@ open class BaseActivity : AppCompatActivity() {
LoadingDialog.showDialogForLoading(this) LoadingDialog.showDialogForLoading(this)
} }
fun cancelDialogForLoading(){ fun cancelDialogForLoading() {
LoadingDialog.cancelDialogForLoading() LoadingDialog.cancelDialogForLoading()
} }
override fun setupActivityComponent(appComponent: AppComponent) {
}
override fun initView(savedInstanceState: Bundle?): Int {
return 0
}
override fun initData(savedInstanceState: Bundle?) {
}
override fun initIntent() {
}
override fun initTopBar() {
}
override fun initLanguage() {
}
override fun initLayoutParams() {
}
override fun initLayoutVisible() {
}
} }
\ No newline at end of file
delivery_pick_module/src/main/res/layout/other_order_activity_send_order.xml
...@@ -23,17 +23,17 @@ ...@@ -23,17 +23,17 @@
android:id="@+id/rv_send_order_foods" android:id="@+id/rv_send_order_foods"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/send_order_top_bar"
android:paddingLeft="@dimen/dp_10" android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10" android:paddingRight="@dimen/dp_10"
android:layout_below="@id/send_order_top_bar"
app:layout_constraintTop_toBottomOf="@id/send_order_top_bar" /> app:layout_constraintTop_toBottomOf="@id/send_order_top_bar" />
<View <View
android:id="@+id/view_send_order_foods_line" android:id="@+id/view_send_order_foods_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_5" android:layout_height="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_10"
android:layout_below="@id/rv_send_order_foods" android:layout_below="@id/rv_send_order_foods"
android:layout_marginTop="@dimen/dp_10"
android:background="@color/color_ccc" /> android:background="@color/color_ccc" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/layout_btn" android:layout_above="@id/layout_btn"
android:layout_marginTop="@dimen/dp_20"
android:layout_below="@id/rv_send_order_bills" android:layout_below="@id/rv_send_order_bills"
android:layout_marginTop="@dimen/dp_20"
android:paddingLeft="@dimen/dp_10" android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10" android:paddingRight="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@id/rv_send_order_bills"> app:layout_constraintTop_toBottomOf="@id/rv_send_order_bills">
...@@ -235,7 +235,8 @@ ...@@ -235,7 +235,8 @@
android:paddingBottom="@dimen/dp_8" android:paddingBottom="@dimen/dp_8"
android:text="@string/logistics_distribution" android:text="@string/logistics_distribution"
android:textColor="@color/s_send_order_radio" android:textColor="@color/s_send_order_radio"
android:textSize="@dimen/dp_16" /> android:textSize="@dimen/dp_16"
android:visibility="gone" />
</RadioGroup> </RadioGroup>
<TextView <TextView
...@@ -286,7 +287,8 @@ ...@@ -286,7 +287,8 @@
android:paddingBottom="@dimen/dp_8" android:paddingBottom="@dimen/dp_8"
android:text="立即支付" android:text="立即支付"
android:textColor="@color/s_send_order_radio" android:textColor="@color/s_send_order_radio"
android:textSize="@dimen/dp_16" /> android:textSize="@dimen/dp_16"
android:visibility="gone" />
</RadioGroup> </RadioGroup>
<TextView <TextView
......
print-module/src/main/java/com/joe/print/mvp/print/utils/BBposPrint.java
...@@ -5,7 +5,7 @@ import android.util.Xml; ...@@ -5,7 +5,7 @@ import android.util.Xml;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils; import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
import com.gingersoft.gsa.cloud.bean.WiseposBean; import com.gingersoft.gsa.cloud.print.bean.WiseposBean;
import com.joe.print.mvp.print.PrintListener; import com.joe.print.mvp.print.PrintListener;
import com.joe.print.mvp.ui.activity.PrintActivity; import com.joe.print.mvp.ui.activity.PrintActivity;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
...@@ -24,6 +24,13 @@ import com.gingersoft.gsa.cloud.base.table.bean.TableExtBean; ...@@ -24,6 +24,13 @@ import com.gingersoft.gsa.cloud.base.table.bean.TableExtBean;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils; import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils;
import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils; import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.Function;
import com.gingersoft.gsa.cloud.function.FunctionManager;
import com.gingersoft.gsa.cloud.print.PrinterUtils;
import com.gingersoft.gsa.cloud.table.ComponentTable; import com.gingersoft.gsa.cloud.table.ComponentTable;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract; import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
...@@ -41,13 +48,6 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderTopFunctionAdapter; ...@@ -41,13 +48,6 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderTopFunctionAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter; import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.DiscountDialog; import com.gingersoft.gsa.cloud.table.mvp.ui.widget.DiscountDialog;
import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog; import com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog;
import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.constans.GoldConstants;
import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.database.bean.Discount;
import com.gingersoft.gsa.cloud.database.bean.Function;
import com.gingersoft.gsa.cloud.function.FunctionManager;
import com.gingersoft.gsa.cloud.print.PrinterUtils;
import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog;
import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
import com.jess.arms.di.scope.ActivityScope; import com.jess.arms.di.scope.ActivityScope;
......
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
package com.gingersoft.gsa.cloud.bean.mvp.ui.adapter.meal; package com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -8,16 +8,16 @@ import android.widget.ImageView; ...@@ -8,16 +8,16 @@ import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.gingersoft.gsa.cloud.bean.R2;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail; import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage; import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
import com.gingersoft.gsa.cloud.base.utils.MoneyUtil; import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
import com.gingersoft.gsa.cloud.bean.R;
import com.gingersoft.gsa.cloud.bean.mvp.presenter.MealStandPresenter;
import com.gingersoft.gsa.cloud.bean.mvp.presenter.OrderContentPresenter;
import com.gingersoft.gsa.cloud.bean.mvp.ui.activity.MealStandActivity;
import com.gingersoft.gsa.cloud.constans.MealConstant; import com.gingersoft.gsa.cloud.constans.MealConstant;
import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.mvp.presenter.MealStandPresenter;
import com.gingersoft.gsa.cloud.table.mvp.presenter.OrderContentPresenter;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
import com.jess.arms.base.BaseHolder; import com.jess.arms.base.BaseHolder;
import com.jess.arms.base.DefaultAdapter; import com.jess.arms.base.DefaultAdapter;
import com.jess.arms.mvp.BasePresenter; import com.jess.arms.mvp.BasePresenter;
......
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