1、完善賬單 食品折扣

2、新增公共細項
3、彈窗風格統一

public-base/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java

@@ -6,6 +6,8 @@ import com.gingersoft.gsa.cloud.database.bean.ComboItem;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
 import com.gingersoft.gsa.cloud.database.bean.Modifier;
+import com.gingersoft.gsa.cloud.print.bean.OrderDetails;
+
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
@@ -786,48 +788,6 @@ public class OrderDetail implements Serializable {
         return hasDiscount;
         return hasDiscount;
     }
     }
 
 
-
-//    public static List<OrderDetail> productNameBeanTransOrderDetail(List<OrderDetails.DataBean.PRODUCTNAMEBean> orderDetails) {
-//        if (orderDetails != null) {
-//            List<OrderDetail> orderDetailList = new ArrayList<>();
-//            for (OrderDetails.DataBean.PRODUCTNAMEBean bean : orderDetails) {
-//                OrderDetail orderData = new OrderDetail();
-//                orderData.setProductName(bean.getPRODUCT_NAME());
-//                orderData.setPrice(Double.parseDouble(Objects.requireNonNull(bean.getPRICE())));
-//                orderData.setNumber(Integer.parseInt(Objects.requireNonNull(bean.getNum())));
-//                orderData.setPrintseting(bean.getPrintseting());
-//                orderData.setItemType(1);
-//                if (bean.getChild() != null) {
-//                    for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBeanX : bean.getChild()) {
-//                        OrderDetail childOrderData = new OrderDetail();
-//                        childOrderData.setProductName(childBeanX.getPRODUCT_NAME());
-//                        childOrderData.setPrice(Double.parseDouble(Objects.requireNonNull(childBeanX.getPRICE())));
-//                        childOrderData.setNumber(Integer.parseInt(Objects.requireNonNull(childBeanX.getNum())));
-//                        childOrderData.setPrintseting(childBeanX.getPrintseting());
-//                        childOrderData.setItemType(2);
-//                        if (childBeanX.getChild() != null) {
-//                            for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean : childBeanX.getChild()) {
-//                                OrderDetail childOrderData2 = new OrderDetail();
-//                                childOrderData2.setProductName(childBean.getPRODUCT_NAME());
-//                                childOrderData2.setPrice(Double.parseDouble(Objects.requireNonNull(childBean.getPRICE())));
-//                                childOrderData2.setNumber(Integer.parseInt(Objects.requireNonNull(childBean.getNum())));
-//                                childOrderData2.setPrintseting(childBean.getPrintseting());
-//                                childOrderData2.setItemType(3);
-//                                orderDetailList.add(childOrderData2);
-//                            }
-//                        }
-//                        orderDetailList.add(childOrderData);
-//                    }
-//                }
-//                orderDetailList.add(orderData);
-//            }
-//            return orderDetailList;
-//        }
-//        return null;
-//    }
-
-
-
     public static List<OrderDetail> productNameBeanTransOrderDetail(List<OrderDetails.DataBean.PRODUCTNAMEBean> orderDetails) {
     public static List<OrderDetail> productNameBeanTransOrderDetail(List<OrderDetails.DataBean.PRODUCTNAMEBean> orderDetails) {
         if (orderDetails != null) {
         if (orderDetails != null) {
             List<OrderDetail> orderDetailList = new ArrayList<>();
             List<OrderDetail> orderDetailList = new ArrayList<>();

table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/MealStandPresenter.java

@@ -553,8 +553,6 @@ public class MealStandPresenter extends BaseOrderPresenter<MealStandContract.Mod
         CreateOrderRequest request = getCreateOrderRequest(getOrderFoodLists());
         CreateOrderRequest request = getCreateOrderRequest(getOrderFoodLists());
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), GsonUtils.GsonString(request));
         String json = GsonUtils.GsonString(request);
         String json = GsonUtils.GsonString(request);
-        MyOrderManage.getInstance().setNewFoodList(getOrderFoodLists());
-        printSendOrder(true);
         mModel.createOrder(requestBody)
         mModel.createOrder(requestBody)
                 .subscribeOn(Schedulers.io())
                 .subscribeOn(Schedulers.io())
                 .doOnSubscribe(disposable -> mRootView.showLoading(null))
                 .doOnSubscribe(disposable -> mRootView.showLoading(null))