Commit 2752e44f by Wyh

1、廚房單打印問題 2、新訂單功能

Signed-off-by: Wyh <1239658231>
parent 7878b112
...@@ -4,11 +4,9 @@ import android.text.TextUtils; ...@@ -4,11 +4,9 @@ import android.text.TextUtils;
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication; import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo; import com.gingersoft.gsa.cloud.bean.RestaurantExpandInfo;
import com.gingersoft.gsa.cloud.constans.ExpandConstant;
import com.gingersoft.gsa.cloud.database.bean.ExpandInfo; import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -37,40 +35,40 @@ public class RestaurantExpandInfoUtils { ...@@ -37,40 +35,40 @@ public class RestaurantExpandInfoUtils {
* @param expandInfoList * @param expandInfoList
*/ */
public static void setCommonExpandInfo(List<ExpandInfo> expandInfoList) { public static void setCommonExpandInfo(List<ExpandInfo> expandInfoList) {
for (ExpandInfo expandInfo : expandInfoList) { // for (ExpandInfo expandInfo : expandInfoList) {
switch (expandInfo.getSettingName()) { // switch (expandInfo.getSettingName()) {
case ExpandConstant.Rounding: // case ExpandConstant.Rounding:
MoneyUtil.rounding = expandInfo.getValueInt(); // MoneyUtil.rounding = expandInfo.getValueInt();
break; // break;
case ExpandConstant.RoundingDecimal: // case ExpandConstant.RoundingDecimal:
MoneyUtil.RoundingDecimal = expandInfo.getValueInt(); // MoneyUtil.RoundingDecimal = expandInfo.getValueInt();
break; // break;
case ExpandConstant.ItemDecimals: // case ExpandConstant.ItemDecimals:
MoneyUtil.ItemDecimals = expandInfo.getValueInt(); // MoneyUtil.ItemDecimals = expandInfo.getValueInt();
break; // break;
case ExpandConstant.ToPrintQRCode: // case ExpandConstant.ToPrintQRCode:
case ExpandConstant.MergeSendFood: // case ExpandConstant.MergeSendFood:
case ExpandConstant.AutoPrinterPaper: // case ExpandConstant.AutoPrinterPaper:
case ExpandConstant.PrintMemberInfo: // case ExpandConstant.PrintMemberInfo:
case ExpandConstant.PrintPage: // case ExpandConstant.PrintPage:
case ExpandConstant.PrintMergerFood: // case ExpandConstant.PrintMergerFood:
case ExpandConstant.PrintStatisticsAmount: // case ExpandConstant.PrintStatisticsAmount:
case ExpandConstant.PrintFirstOrder: // case ExpandConstant.PrintFirstOrder:
case ExpandConstant.FrozenChainAutoOrder: // case ExpandConstant.FrozenChainAutoOrder:
map.put(expandInfo.getSettingName(), expandInfo.getValueInt() == 0); // map.put(expandInfo.getSettingName(), expandInfo.getValueInt() == 0);
idMaps.put(expandInfo.getSettingName(), expandInfo.getId()); // idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
break; // break;
case ExpandConstant.OrderReceivingTimeout: // case ExpandConstant.OrderReceivingTimeout:
case ExpandConstant.DeliveryPrintCount: // case ExpandConstant.DeliveryPrintCount:
case ExpandConstant.DeliveryClosingPC: // case ExpandConstant.DeliveryClosingPC:
case ExpandConstant.TableModePrintCount: // case ExpandConstant.TableModePrintCount:
case ExpandConstant.TableModeClosingPC: // case ExpandConstant.TableModeClosingPC:
map.put(expandInfo.getSettingName(), expandInfo.getValueInt()); // map.put(expandInfo.getSettingName(), expandInfo.getValueInt());
idMaps.put(expandInfo.getSettingName(), expandInfo.getId()); // idMaps.put(expandInfo.getSettingName(), expandInfo.getId());
break; // break;
} // }
} // }
//
for (ExpandInfo expandInfo : expandInfoList) { for (ExpandInfo expandInfo : expandInfoList) {
if (expandInfo.getDataType() == ExpandInfo.data_type_int) { if (expandInfo.getDataType() == ExpandInfo.data_type_int) {
map.put(expandInfo.getSettingName(), expandInfo.getValueInt()); map.put(expandInfo.getSettingName(), expandInfo.getValueInt());
...@@ -142,6 +140,15 @@ public class RestaurantExpandInfoUtils { ...@@ -142,6 +140,15 @@ public class RestaurantExpandInfoUtils {
public static <T> T getValue(String name, Object defaultValue) { public static <T> T getValue(String name, Object defaultValue) {
if (map != null && map.containsKey(name)) { if (map != null && map.containsKey(name)) {
if (defaultValue instanceof Boolean) {
if (map.get(name) instanceof Boolean) {
return (T) map.get(name);
} else if (map.get(name) instanceof Integer) {
map.put(name, (int) map.get(name) == 0);
} else {
return (T) defaultValue;
}
}
return (T) map.get(name); return (T) map.get(name);
} else { } else {
return (T) defaultValue; return (T) defaultValue;
......
package com.gingersoft.gsa.cloud.bean;
/**
* 補單結果
*/
public class RiceponAddOrderBean {
private String code;
private String errorMsg;
private String orderNo;
private long orderId;
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getErrorMsg() {
return errorMsg;
}
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
public String getOrderNo() {
return orderNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public long getOrderId() {
return orderId;
}
public void setOrderId(long orderId) {
this.orderId = orderId;
}
}
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/layout_print_kitchen_parent" android:id="@+id/layout_print_kitchen_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"/> android:orientation="vertical"/>
\ No newline at end of file
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<activity android:name=".ui.activity.OrderDetailsActivity" /> <activity android:name=".ui.activity.OrderDetailsActivity" />
<activity android:name=".ui.activity.PayActivity" /> <activity android:name=".ui.activity.PayActivity" />
<activity android:name=".ui.activity.LogActivity" /> <activity android:name=".ui.activity.LogActivity" />
<activity android:name=".mvp.ui.activity.SendOrderActivity"/>
</application> </application>
</manifest> </manifest>
\ No newline at end of file
...@@ -8,6 +8,7 @@ import com.billy.cc.core.component.CCUtil; ...@@ -8,6 +8,7 @@ import com.billy.cc.core.component.CCUtil;
import com.billy.cc.core.component.IComponent; import com.billy.cc.core.component.IComponent;
import com.gingersoft.gsa.cloud.service.GetInfoUpdateService; import com.gingersoft.gsa.cloud.service.GetInfoUpdateService;
import com.gingersoft.gsa.delivery_pick_mode.data.network.ServiceCreator; import com.gingersoft.gsa.delivery_pick_mode.data.network.ServiceCreator;
import com.gingersoft.gsa.delivery_pick_mode.mvp.ui.activity.SendOrderActivity;
import com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliveryOrderMainActivity; import com.gingersoft.gsa.delivery_pick_mode.ui.activity.DeliveryOrderMainActivity;
import com.gingersoft.gsa.delivery_pick_mode.ui.activity.HistoryOrderActivity; import com.gingersoft.gsa.delivery_pick_mode.ui.activity.HistoryOrderActivity;
...@@ -59,6 +60,10 @@ public class DeliveryPickComponent implements IComponent { ...@@ -59,6 +60,10 @@ public class DeliveryPickComponent implements IComponent {
case "initAddress": case "initAddress":
ServiceCreator.INSTANCE.init(); ServiceCreator.INSTANCE.init();
break; break;
case "SendOrder":
CCUtil.navigateTo(cc, SendOrderActivity.class);
CC.sendCCResult(cc.getCallId(), CCResult.success());
break;
default: default:
// cc.callAsync(new IComponentCallback() { // cc.callAsync(new IComponentCallback() {
// @Override // @Override
......
package com.gingersoft.gsa.delivery_pick_mode.mvp.contract; package com.gingersoft.gsa.delivery_pick_mode.mvp.contract;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean;
import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean; import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean;
import com.jess.arms.mvp.IModel; import com.jess.arms.mvp.IModel;
import com.jess.arms.mvp.IView; import com.jess.arms.mvp.IView;
...@@ -34,7 +34,7 @@ public interface SendOrderContract { ...@@ -34,7 +34,7 @@ public interface SendOrderContract {
*/ */
Observable<String> getConfirmTakeawayOrderData(Map<String, Object> map); Observable<String> getConfirmTakeawayOrderData(Map<String, Object> map);
Observable<BaseResult> submitOrder(RequestBody requestBody); Observable<RiceponAddOrderBean> submitOrder(RequestBody requestBody);
Observable<MemberAddressInfoBean> getMemberAddressInfo(String phone); Observable<MemberAddressInfoBean> getMemberAddressInfo(String phone);
} }
......
...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model; ...@@ -2,7 +2,7 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.model;
import android.app.Application; import android.app.Application;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean;
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.server.SendOrderServer; import com.gingersoft.gsa.delivery_pick_mode.mvp.server.SendOrderServer;
import com.google.gson.Gson; import com.google.gson.Gson;
...@@ -56,7 +56,7 @@ public class SendOrderModel extends BaseModel implements SendOrderContract.Model ...@@ -56,7 +56,7 @@ public class SendOrderModel extends BaseModel implements SendOrderContract.Model
} }
@Override @Override
public Observable<BaseResult> submitOrder(RequestBody requestBody) { public Observable<RiceponAddOrderBean> submitOrder(RequestBody requestBody) {
return mRepositoryManager.obtainRetrofitService(SendOrderServer.class).submitOrder(requestBody); return mRepositoryManager.obtainRetrofitService(SendOrderServer.class).submitOrder(requestBody);
} }
......
...@@ -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.common.bean.BaseResult;
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.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean;
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;
...@@ -127,9 +127,9 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -127,9 +127,9 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
}); });
} }
public void submitOrder(String name, String phone, String address) { public void submitOrder(String name, String phone, String address, String waimaiSendTime) {
RequestBody requestBody = new FormBody.Builder() RequestBody requestBody = new FormBody.Builder()
.add("order", getOrderJson(name, phone, address)) .add("order", getOrderJson(name, phone, address, waimaiSendTime))
.add("apiversion", "1") .add("apiversion", "1")
.build(); .build();
mModel.submitOrder(requestBody) mModel.submitOrder(requestBody)
...@@ -139,10 +139,12 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -139,10 +139,12 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doAfterTerminate(() -> mRootView.hideLoading()) .doAfterTerminate(() -> mRootView.hideLoading())
.compose(RxLifecycleUtils.bindToLifecycle(mRootView)) .compose(RxLifecycleUtils.bindToLifecycle(mRootView))
.subscribe(new ErrorHandleSubscriber<BaseResult>(mErrorHandler) { .subscribe(new ErrorHandleSubscriber<RiceponAddOrderBean>(mErrorHandler) {
@Override @Override
public void onNext(@NonNull BaseResult info) { public void onNext(@NonNull RiceponAddOrderBean info) {
if (info.getCode().equals("1")) {
mRootView.killMyself();
}
} }
@Override @Override
...@@ -155,43 +157,42 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -155,43 +157,42 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
/** /**
* 订单提交 * 订单提交
*/ */
private String getOrderJson(String name, String phone, String address) { private String getOrderJson(String name, String phone, String address, String waimaiSendTime) {
JSONObject json; JSONObject json;
json = new JSONObject(); json = new JSONObject();
try { try {
json.put("shopId", GsaCloudApplication.getRestaurantId()); json.put("shopId", GsaCloudApplication.getRestaurantId());
json.put("phone", phone); json.put("phone", phone);
json.put("replenishmentType", "1"); json.put("transportationType", "0");//0 本店配送 ,是,1,Zeek,2,Lalamove
json.put("transportationType", "3");
json.put("memberId", GsaCloudApplication.getMemberId()); json.put("memberId", GsaCloudApplication.getMemberId());
json.put("addressDetail", address); json.put("addressDetail", address);
json.put("orderRemark", ""); json.put("orderRemark", "");
json.put("payType", 1); json.put("payType", 5);
//原价 //原价
json.put("originalAmount", MyOrderManage.getInstance().getWholeAmount()); json.put("originalAmount", MyOrderManage.getInstance().getWholeAmount());
json.put("orderType", 8); json.put("orderType", 2);//訂單類型#1:餐廳訂單;2:線上外賣訂單3:扫码点餐;4固定二维码订单;5:预点餐;6:積分訂單;7:自取订单
//实际总价 //实际总价
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 array = new JSONArray();
List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList(); List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList();
for (int i = 0; i < orderDetails.size(); i++) { for (int i = 0; i < orderDetails.size(); i++) {
OrderDetail orderDetail = orderDetails.get(i); OrderDetail orderDetail = orderDetails.get(i);
JSONObject food = getFoodJson(orderDetail); JSONObject food = getFoodJson(orderDetail);
if (i + 1 < orderDetails.size() && orderDetails.get(i + 1).getParentId() == orderDetail.getId() if (i + 1 < orderDetails.size() && orderDetails.get(i + 1).getParentId() == orderDetail.getProductId()
&& orderDetails.get(i + 1).getItemType() != 0) { && orderDetails.get(i + 1).getItemType() != 0) {
//如果下一個食品的父級id是當前食品的id //如果下一個食品的父級id是當前食品的id
JSONArray foodArray = new JSONArray(); JSONArray foodArray = new JSONArray();
long foodId = orderDetail.getId(); long foodId = orderDetail.getProductId();
for (int j = i + 1; j < orderDetails.size(); j++) { for (int j = i + 1; j < orderDetails.size(); j++) {
OrderDetail secondOrderDetail = orderDetails.get(j); OrderDetail secondOrderDetail = orderDetails.get(j);
JSONObject secondFood = getFoodJson(secondOrderDetail); JSONObject secondFood = getFoodJson(secondOrderDetail);
JSONArray secondArray = new JSONArray(); JSONArray secondArray = new JSONArray();
if (orderDetails.get(j).getParentId() == foodId) { if (orderDetails.get(j).getParentId() == foodId) {
secondArray.put(secondFood); secondArray.put(secondFood);
long secondFoodId = secondOrderDetail.getId(); long secondFoodId = secondOrderDetail.getProductId();
if (j + 1 < orderDetails.size() && orderDetails.get(j + 1).getParentId() == secondOrderDetail.getId()) { if (j + 1 < orderDetails.size() && orderDetails.get(j + 1).getParentId() == secondOrderDetail.getProductId()) {
for (int k = j + 1; k < orderDetails.size(); k++) { for (int k = j + 1; k < orderDetails.size(); k++) {
JSONObject thirdFood = getFoodJson(secondOrderDetail); JSONObject thirdFood = getFoodJson(secondOrderDetail);
JSONArray thirdArray = new JSONArray(); JSONArray thirdArray = new JSONArray();
...@@ -227,7 +228,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S ...@@ -227,7 +228,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
try { try {
object.put("posFid", orderDetail.getParentId()); object.put("posFid", orderDetail.getParentId());
object.put("productId", orderDetail.getId()); object.put("productId", orderDetail.getProductId());
object.put("productName", orderDetail.getProductName()); object.put("productName", orderDetail.getProductName());
object.put("number", orderDetail.getNumber()); object.put("number", orderDetail.getNumber());
object.put("price", orderDetail.getPrice()); object.put("price", orderDetail.getPrice());
......
package com.gingersoft.gsa.delivery_pick_mode.mvp.server; package com.gingersoft.gsa.delivery_pick_mode.mvp.server;
import com.gingersoft.gsa.cloud.base.common.bean.BaseResult; import com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean;
import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean; import com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean;
import java.util.Map; import java.util.Map;
...@@ -23,7 +23,7 @@ public interface SendOrderServer { ...@@ -23,7 +23,7 @@ public interface SendOrderServer {
@Headers({"Domain-Name: update_version"}) @Headers({"Domain-Name: update_version"})
@POST("order/addOrder2" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @POST("order/addOrder2" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<BaseResult> submitOrder(@Body RequestBody requestBody); Observable<RiceponAddOrderBean> submitOrder(@Body RequestBody requestBody);
@Headers({"Domain-Name: ricepon_member"}) @Headers({"Domain-Name: ricepon_member"})
@GET("member/getMemberAddressInfo" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2) @GET("member/getMemberAddressInfo" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
......
...@@ -16,16 +16,24 @@ import androidx.core.content.ContextCompat; ...@@ -16,16 +16,24 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
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.utils.other.TextUtil; import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.base.utils.time.TimePickerUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimePickerUtils;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
import com.gingersoft.gsa.cloud.ui.adapter.ListSelectAdapter; import com.gingersoft.gsa.cloud.ui.adapter.ListSelectAdapter;
import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog; import com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog;
import com.gingersoft.gsa.delivery_pick_mode.R; import com.gingersoft.gsa.delivery_pick_mode.R;
import com.gingersoft.gsa.delivery_pick_mode.R2; import com.gingersoft.gsa.delivery_pick_mode.R2;
import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.BillBean;
import com.gingersoft.gsa.delivery_pick_mode.di.component.DaggerSendOrderComponent; import com.gingersoft.gsa.delivery_pick_mode.di.component.DaggerSendOrderComponent;
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.gingersoft.gsa.delivery_pick_mode.mvp.presenter.SendOrderPresenter; import com.gingersoft.gsa.delivery_pick_mode.mvp.presenter.SendOrderPresenter;
import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter;
import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter;
import com.jess.arms.base.BaseActivity; import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent; import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
...@@ -33,6 +41,7 @@ import com.qmuiteam.qmui.widget.QMUITopBar; ...@@ -33,6 +41,7 @@ import com.qmuiteam.qmui.widget.QMUITopBar;
import com.qmuiteam.qmui.widget.popup.QMUIPopup; import com.qmuiteam.qmui.widget.popup.QMUIPopup;
import com.qmuiteam.qmui.widget.popup.QMUIPopups; import com.qmuiteam.qmui.widget.popup.QMUIPopups;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
...@@ -118,7 +127,33 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -118,7 +127,33 @@ 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);
List<OrderDetails.DataBean.PRODUCTNAMEBean> productnameBeans = new ArrayList<>();
List<OrderDetail> orderDetails = MyOrderManage.getInstance().getOrderFoodList();
for (OrderDetail orderDetail : orderDetails) {
OrderDetails.DataBean.PRODUCTNAMEBean productnameBean = new OrderDetails.DataBean.PRODUCTNAMEBean();
productnameBean.setPRODUCT_NAME(orderDetail.getProductName());
productnameBean.setNum(orderDetail.getNumber() + "");
productnameBean.setPRICE(orderDetail.getPrice() + "");
productnameBeans.add(productnameBean);
}
FoodListAdapter adapter = new FoodListAdapter(mContext, productnameBeans);
rvSendOrderFoods.setAdapter(adapter);
rvSendOrderFoods.setLayoutManager(new LinearLayoutManager(mContext));
List<BillOrderMoney> orderMoneyList = MyOrderManage.getInstance().getOrderMoneyList();
List<BillBean> billBeans = new ArrayList<>();
for (BillOrderMoney billOrderMoney : orderMoneyList) {
BillBean billBean = new BillBean();
billBean.setName(billOrderMoney.getTitle());
billBean.setAmount(billOrderMoney.getMoney());
}
billBeans.add(new BillBean("合計:", MyOrderManage.getInstance().getWholeAmount(), 0));
billBeans.add(new BillBean("應付金額:", MyOrderManage.getInstance().getTotalAmount(), 0));
PayBillAdapter payBillAdapter = new PayBillAdapter(R.layout.item_pay_bill, billBeans);
rvSendOrderBills.setAdapter(payBillAdapter);
rvSendOrderBills.setLayoutManager(new LinearLayoutManager(mContext));
} }
@Override @Override
...@@ -183,8 +218,9 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -183,8 +218,9 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
private ListSelectAdapter listSelectAdapter; private ListSelectAdapter listSelectAdapter;
private int select = 0; private int select = 0;
private List<String> deliveryTimes = Arrays.asList("現在送出", "其他時間"); private List<String> deliveryTimes = Arrays.asList("現在送出", "其他時間");
private String sendTime;
@OnClick({R2.id.iv_send_order_search, R2.id.tv_delivery_time_hour, R2.id.tv_delivery_time_min, R2.id.tv_delivery_time_type, R2.id.iv_select_delivery_time, R2.id.tv_confirm_order}) @OnClick({R2.id.tv_continue_add_food, R2.id.iv_send_order_search, R2.id.tv_delivery_time_hour, R2.id.tv_delivery_time_min, R2.id.tv_delivery_time_type, R2.id.iv_select_delivery_time, R2.id.tv_confirm_order})
@Override @Override
public void onClick(View v) { public void onClick(View v) {
int viewId = v.getId(); int viewId = v.getId();
...@@ -196,7 +232,7 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -196,7 +232,7 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
if (TextUtil.isNotEmptyOrNullOrUndefined(edSendOrderAddress)) { if (TextUtil.isNotEmptyOrNullOrUndefined(edSendOrderAddress)) {
mPresenter.submitOrder(edSendOrderName.getText().toString(), mPresenter.submitOrder(edSendOrderName.getText().toString(),
edSendOrderPhone.getText().toString(), edSendOrderPhone.getText().toString(),
edSendOrderAddress.getText().toString()); edSendOrderAddress.getText().toString(), sendTime);
} else { } else {
showMessage("請輸入送貨地址"); showMessage("請輸入送貨地址");
} }
...@@ -213,6 +249,7 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -213,6 +249,7 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
calendar.setTime(date); calendar.setTime(date);
tvDeliveryTimeHour.setText(calendar.get(Calendar.HOUR)); tvDeliveryTimeHour.setText(calendar.get(Calendar.HOUR));
tvDeliveryTimeMin.setText(calendar.get(Calendar.MINUTE)); tvDeliveryTimeMin.setText(calendar.get(Calendar.MINUTE));
sendTime = TimeUtils.getStringByFormat(date, TimeUtils.DEFAULT_DATE_FORMAT_YMDHM);
}); });
} else if (viewId == R.id.iv_send_order_search) { } else if (viewId == R.id.iv_send_order_search) {
//搜索會員信息 //搜索會員信息
...@@ -221,6 +258,8 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen ...@@ -221,6 +258,8 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
} else { } else {
showMessage("請輸入顧客電話"); showMessage("請輸入顧客電話");
} }
} else if (viewId == R.id.tv_continue_add_food) {
killMyself();
} }
} }
......
...@@ -20,7 +20,9 @@ import androidx.lifecycle.MutableLiveData ...@@ -20,7 +20,9 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewpager.widget.ViewPager import androidx.viewpager.widget.ViewPager
import com.billy.cc.core.component.CC
import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils import com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
import com.gingersoft.gsa.cloud.base.widget.DialogUtils import com.gingersoft.gsa.cloud.base.widget.DialogUtils
...@@ -533,6 +535,14 @@ class DeliveryOrderMainActivity : BaseActivity() { ...@@ -533,6 +535,14 @@ class DeliveryOrderMainActivity : BaseActivity() {
startActivity(Intent(this, LogActivity::class.java)) startActivity(Intent(this, LogActivity::class.java))
pop!!.dismiss() pop!!.dismiss()
} }
view.findViewById<QMUIAlphaTextView>(R.id.tv_new_order).setOnClickListener {
MyOrderManage.getInstance().orderType = MyOrderManage.order_type_1
CC.obtainBuilder("Component.Table")
.setActionName("showMealStandActivity")
.build()
.call()
pop!!.dismiss()
}
} else { } else {
pop!!.show(it) pop!!.show(it)
} }
......
...@@ -5,6 +5,22 @@ ...@@ -5,6 +5,22 @@
android:orientation="vertical"> android:orientation="vertical">
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView <com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_new_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_20"
android:layout_gravity="center_horizontal"
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_10"
android:text="新訂單"
android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" />
<include layout="@layout/include_horizontal_color_ccc_dividing_line" />
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_delivery_setting" android:id="@+id/tv_delivery_setting"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -14,9 +30,9 @@ ...@@ -14,9 +30,9 @@
android:paddingRight="@dimen/dp_20" android:paddingRight="@dimen/dp_20"
android:paddingBottom="@dimen/dp_10" android:paddingBottom="@dimen/dp_10"
android:text="配送設置" android:text="配送設置"
android:visibility="gone"
android:textColor="@color/theme_333_color" android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14"
android:visibility="gone" />
<include layout="@layout/include_horizontal_color_ccc_dividing_line" /> <include layout="@layout/include_horizontal_color_ccc_dividing_line" />
...@@ -49,8 +65,8 @@ ...@@ -49,8 +65,8 @@
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14" />
<include <include
android:visibility="gone" layout="@layout/include_horizontal_color_ccc_dividing_line"
layout="@layout/include_horizontal_color_ccc_dividing_line" /> android:visibility="gone" />
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView <com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_check_log" android:id="@+id/tv_check_log"
...@@ -60,10 +76,10 @@ ...@@ -60,10 +76,10 @@
android:paddingLeft="@dimen/dp_20" android:paddingLeft="@dimen/dp_20"
android:paddingTop="@dimen/dp_10" android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_20" android:paddingRight="@dimen/dp_20"
android:visibility="gone"
android:paddingBottom="@dimen/dp_10" android:paddingBottom="@dimen/dp_10"
android:text="查看日誌" android:text="查看日誌"
android:textColor="@color/theme_333_color" android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14"
android:visibility="gone" />
</LinearLayout> </LinearLayout>
...@@ -23,12 +23,16 @@ ...@@ -23,12 +23,16 @@
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:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:layout_below="@id/send_order_top_bar" 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:layout_width="0dp" android:id="@+id/view_send_order_foods_line"
android:layout_height="@dimen/dp_1" android:layout_width="match_parent"
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:background="@color/color_ccc" /> android:background="@color/color_ccc" />
...@@ -36,16 +40,17 @@ ...@@ -36,16 +40,17 @@
android:id="@+id/rv_send_order_bills" android:id="@+id/rv_send_order_bills"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/rv_send_order_foods" android:layout_below="@id/view_send_order_foods_line"
android:fadeScrollbars="false" android:fadeScrollbars="false"
android:orientation="vertical" android:orientation="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toBottomOf="@id/rv_send_order_foods" /> app:layout_constraintTop_toBottomOf="@id/view_send_order_foods_line" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
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:paddingLeft="@dimen/dp_10" android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10" android:paddingRight="@dimen/dp_10"
......
...@@ -341,6 +341,7 @@ public class MyOrderManage { ...@@ -341,6 +341,7 @@ public class MyOrderManage {
orderBean = null; orderBean = null;
modifyOrder = false; modifyOrder = false;
memberUpdateStatus = ""; memberUpdateStatus = "";
orderType = order_type_0;
} }
public int getSelpostion() { public int getSelpostion() {
......
...@@ -23,7 +23,6 @@ import java.util.List; ...@@ -23,7 +23,6 @@ import java.util.List;
public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBean.Bean, BaseViewHolder> { public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBean.Bean, BaseViewHolder> {
private int indentation = 0; private int indentation = 0;
private PrinterDeviceBean printerDeviceBean;
private int foodFontSize = 24; private int foodFontSize = 24;
private int modifierFontSize = 24; private int modifierFontSize = 24;
...@@ -31,10 +30,10 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea ...@@ -31,10 +30,10 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea
private int modifierIsBold; private int modifierIsBold;
private int foodIsItalic; private int foodIsItalic;
private int modifierIsItalic; private int modifierIsItalic;
private String[] languageTypes;
public KitChenPrjPrintFoodAdapter(@Nullable List<PrjBean.DataBean.Bean> data, PrinterDeviceBean printerDeviceBean) { public KitChenPrjPrintFoodAdapter(@Nullable List<PrjBean.DataBean.Bean> data, PrinterDeviceBean printerDeviceBean) {
super(R.layout.print_kitchen_item_parent, data); super(R.layout.print_kitchen_item_parent, data);
this.printerDeviceBean = printerDeviceBean;
try { try {
this.foodFontSize = Integer.parseInt(printerDeviceBean.getFoodFont()) * 2; this.foodFontSize = Integer.parseInt(printerDeviceBean.getFoodFont()) * 2;
this.modifierFontSize = Integer.parseInt(printerDeviceBean.getModifierFont()) * 2; this.modifierFontSize = Integer.parseInt(printerDeviceBean.getModifierFont()) * 2;
...@@ -45,11 +44,11 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea ...@@ -45,11 +44,11 @@ public class KitChenPrjPrintFoodAdapter extends BaseQuickAdapter<PrjBean.DataBea
this.modifierIsBold = printerDeviceBean.getModifierIsBold(); this.modifierIsBold = printerDeviceBean.getModifierIsBold();
this.foodIsItalic = printerDeviceBean.getFoodIsItalic(); this.foodIsItalic = printerDeviceBean.getFoodIsItalic();
this.modifierIsItalic = printerDeviceBean.getModifierIsItalic(); this.modifierIsItalic = printerDeviceBean.getModifierIsItalic();
languageTypes = printerDeviceBean.getLanguageType().split(",");
} }
@Override @Override
protected void convert(BaseViewHolder helper, PrjBean.DataBean.Bean item) { protected void convert(BaseViewHolder helper, PrjBean.DataBean.Bean item) {
String[] languageTypes = printerDeviceBean.getLanguageType().split(",");
LinearLayout layout = helper.getView(R.id.layout_print_kitchen_parent); LinearLayout layout = helper.getView(R.id.layout_print_kitchen_parent);
for (String type : languageTypes) { for (String type : languageTypes) {
String languageType = type; String languageType = type;
......
...@@ -52,21 +52,24 @@ android { ...@@ -52,21 +52,24 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/ecracalib.jar') implementation files('libs/ecracalib.jar')
if (project.ext.runAsApp) { // if (project.ext.runAsApp) {
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"] // annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
debugImplementation rootProject.ext.dependencies["canary-debug"] // debugImplementation rootProject.ext.dependencies["canary-debug"]
releaseImplementation rootProject.ext.dependencies["canary-release"] // releaseImplementation rootProject.ext.dependencies["canary-release"]
testImplementation rootProject.ext.dependencies["canary-release"] // testImplementation rootProject.ext.dependencies["canary-release"]
} else { // } else {
compileOnly rootProject.ext.dependencies["dagger2-compiler"] // compileOnly rootProject.ext.dependencies["dagger2-compiler"]
compileOnly rootProject.ext.dependencies["canary-debug"] // compileOnly rootProject.ext.dependencies["canary-debug"]
compileOnly rootProject.ext.dependencies["canary-release"] // compileOnly rootProject.ext.dependencies["canary-release"]
compileOnly rootProject.ext.dependencies["canary-release"] // compileOnly rootProject.ext.dependencies["canary-release"]
} // }
// test // test
testImplementation rootProject.ext.dependencies["junit"] testImplementation rootProject.ext.dependencies["junit"]
implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"] implementation rootProject.ext.dependencies["BaseRecyclerViewAdapter"]
implementation 'org.projectlombok:lombok:1.18.10' implementation 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10'
annotationProcessor rootProject.ext.dependencies["dagger2-compiler"]
annotationProcessor rootProject.ext.dependencies["butterknife-compiler"]
} }
...@@ -8,7 +8,7 @@ import android.widget.ImageView; ...@@ -8,7 +8,7 @@ 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.base.R2; 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;
......
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