订单等模块更新
This commit is contained in:
parent
ebd79b5401
commit
e016000bfc
|
|
@ -158,6 +158,8 @@ dependencies {
|
|||
implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
|
||||
|
||||
implementation project(':sdk')
|
||||
|
||||
implementation 'com.google.guava:guava:31.1-android' // Android 专用版本
|
||||
}
|
||||
//自动添加X-Library依赖
|
||||
apply from: 'x-library.gradle'
|
||||
|
|
|
|||
|
|
@ -256,7 +256,6 @@ public class InitializationActivity extends BaseActivity<InitializationMainBindi
|
|||
AppDatabase.getDatabase(InitializationActivity.this).cookMeetDetailDao().deleteAll();
|
||||
AppDatabase.getDatabase(InitializationActivity.this).cookMeetMealDao().deleteAll();
|
||||
AppDatabase.getDatabase(InitializationActivity.this).cookMeetTimesDao().deleteAll();
|
||||
|
||||
String mealList = firstJson.getString("mealList");
|
||||
Gson gson = new Gson();
|
||||
List<CookMeetMealInfo> cookBookInfoList = gson.fromJson(mealList, new TypeToken<List<CookMeetMealInfo>>() {
|
||||
|
|
@ -410,7 +409,7 @@ public class InitializationActivity extends BaseActivity<InitializationMainBindi
|
|||
Request request = new Request.Builder().url(url)
|
||||
.addHeader("Authorization", OkHttpService.getToken())
|
||||
.addHeader("MERCHANT-ID", "378915229716713472")
|
||||
.addHeader("machine-sn", "2AD2435000620350")
|
||||
.addHeader("machine-sn", "2A52450008190822")
|
||||
.post(body).build();
|
||||
try {
|
||||
String result = service.httpPost(url, body, InitializationActivity.this,request);
|
||||
|
|
@ -428,7 +427,6 @@ public class InitializationActivity extends BaseActivity<InitializationMainBindi
|
|||
sendMessage("获取餐次信息成功！", 0);
|
||||
MealTimeInfo mealTimeInfo = AppDatabase.getDatabase(InitializationActivity.this).mealTimeDao().getIsDefaultByTime(DateTimeHelper.getNowTime());
|
||||
//获取菜谱信息
|
||||
|
||||
if(mealTimeInfo !=null){
|
||||
getCookBook(mealTimeInfo);
|
||||
}else{
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ import androidx.appcompat.widget.Toolbar;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson2.JSON;
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.bonus.canteen.activity.order.MachineSaleActivity;
|
||||
import com.bonus.canteen.adapter.menu.DishListAdapter;
|
||||
import com.bonus.canteen.adapter.menu.SalesMenuAdapter;
|
||||
import com.bonus.canteen.adapter.menu.entity.DishEntity;
|
||||
|
|
@ -64,13 +65,22 @@ import com.bonus.canteen.adapter.menu.utils.WorkConfig;
|
|||
import com.bonus.canteen.adapter.utils.UrlConfig;
|
||||
import com.bonus.canteen.core.BaseActivity;
|
||||
import com.bonus.canteen.db.AppDatabase;
|
||||
import com.bonus.canteen.db.dao.base.DeviceBaseDao;
|
||||
import com.bonus.canteen.db.entity.base.CookBookInfo;
|
||||
import com.bonus.canteen.db.entity.base.CookMeetDetailInfo;
|
||||
import com.bonus.canteen.db.entity.base.CookMeetMealInfo;
|
||||
import com.bonus.canteen.db.entity.base.CookMeetTimesInfo;
|
||||
import com.bonus.canteen.db.entity.base.DeviceBaseInfo;
|
||||
import com.bonus.canteen.db.entity.base.OrderDetailsInfo;
|
||||
import com.bonus.canteen.db.entity.base.OrderInfo;
|
||||
import com.bonus.canteen.db.entity.user.CustInfo;
|
||||
import com.bonus.canteen.entity.OrderDetailListEntity;
|
||||
import com.bonus.canteen.entity.OrderDetailPayDTO;
|
||||
import com.bonus.canteen.entity.OrderEntity;
|
||||
import com.bonus.canteen.entity.OrderListEntity;
|
||||
import com.bonus.canteen.entity.OrderPayAndroidDTO;
|
||||
import com.bonus.canteen.presentation.MyPresentation;
|
||||
import com.bonus.canteen.utils.Id;
|
||||
import com.bonus.canteen.utils.MyLog;
|
||||
import com.bonus.canteen.utils.rabbitmq.RabbitMqMqttHelper;
|
||||
import com.bonus.canteen.utils.sound.Sound;
|
||||
|
|
@ -79,6 +89,7 @@ import com.ccb.facedevice.sdk.RecognizeCallback;
|
|||
import com.ccb.facedevice.sdk.data.ScanResult;
|
||||
import com.ccb.facedevice.sdk.utils.AppUtil;
|
||||
import com.ccb.facedevice.sdk.utils.FaceScanUtil;
|
||||
import com.ccb.facedevice.sdk.utils.UUIDUtil;
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.gson.Gson;
|
||||
import com.xuexiang.xui.XUI;
|
||||
|
|
@ -146,7 +157,9 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
|
|||
showPresentation();
|
||||
RabbitMqMqttHelper rabbitMqMqttHelper = new RabbitMqMqttHelper(this);
|
||||
rabbitMqMqttHelper.connect();
|
||||
String str = "{\"amount\":530,\"consumMode\":1,\"ifOnline\":1,\"macOrderId\":\"202503211122016222AD2347005970683\",\"nuClearMode\":1,\"orderList\":[{\"canteenId\":378928463446282240,\"canteenName\":\"宏源工业园\",\"deliveryRelatedId\":0,\"mealtimeName\":\"午餐\",\"mealtimeType\":2,\"orderDetailList\":[{\"detailType\":1,\"goodsDishesId\":379440123021889536,\"goodsDishesName\":\"米饭\",\"menuDetailId\":425896620844912645,\"quantity\":1,\"salePrice\":30.0,\"salesMode\":1,\"weightUnit\":100},{\"detailType\":1,\"goodsDishesId\":381242841025744896,\"goodsDishesName\":\"醋溜藕片\",\"menuDetailId\":425896620844912645,\"quantity\":1,\"salePrice\":200.0,\"salesMode\":1,\"weightUnit\":100},{\"detailType\":1,\"goodsDishesId\":413927515799687168,\"goodsDishesName\":\"京葱炒猪肝\",\"menuDetailId\":425896620844912645,\"quantity\":1,\"salePrice\":300.0,\"salesMode\":1,\"weightUnit\":100}],\"orderTime\":\"2025-03-21 11:22:01\",\"placeId\":0,\"stallId\":379082300370980864,\"stallName\":\"本周菜谱\"}],\"orderType\":11,\"payType\":1,\"serialNum\":\"9414F423\"}\n";
|
||||
|
||||
addOrderMeal(str);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -637,6 +650,63 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
|
|||
mDishListAdapter = new DishListAdapter(this, dishEntityList, salesMenuEntityList, mSalesMenuAdapter);
|
||||
dishListView.setAdapter(mDishListAdapter);
|
||||
|
||||
binding.orderManagement.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(OperationActivity.this, MachineSaleActivity.class);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private void addOrderMeal(String mealStr){
|
||||
ThreadPoolManager.getExecutor().execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
OrderEntity orderEntity = JSONObject.parseObject(mealStr,OrderEntity.class);
|
||||
OrderInfo orderInfo = new OrderInfo();
|
||||
List<OrderDetailsInfo> orderDetailsListInfo = new ArrayList<>();
|
||||
Log.e("orderEntity",""+orderEntity.toString());
|
||||
String orderId = UUIDUtil.uuid().toString().replaceAll("-","");
|
||||
String macOrderId = orderEntity.getMacOrderId();
|
||||
Log.e("orderEntity orderId",""+orderId);
|
||||
int sourceType = 20;
|
||||
String qrCode = orderEntity.getQrCode(); //不为null 则为二维码支付 3
|
||||
String openid = orderEntity.getOpenid(); //不为null 则为人脸支付 2
|
||||
String serialNum = orderEntity.getSerialNum(); //不为null 则为刷卡支付 1
|
||||
|
||||
CustInfo custInfo = new CustInfo();
|
||||
if(serialNum != null){
|
||||
custInfo = AppDatabase.getDatabase(OperationActivity.this).custInfoDao().getCustInfoBySerialNum(serialNum);
|
||||
}else{
|
||||
custInfo = AppDatabase.getDatabase(OperationActivity.this).custInfoDao().getCustInfoByCustId(orderEntity.getCustId()+"");
|
||||
}
|
||||
String orderDate = DateTimeHelper.getNowDate();
|
||||
DeviceBaseInfo deviceBaseInfo = AppDatabase.getDatabase(OperationActivity.this).deviceBaseDao().getDeviceBase().get(0);
|
||||
List<OrderListEntity> orderListEntities = orderEntity.getOrderList();
|
||||
//添加订单基础信息
|
||||
orderInfo.setOrderId(orderId);
|
||||
orderInfo.setMacOrderId(orderEntity.getMacOrderId());
|
||||
orderInfo.setSourceType(sourceType+"");
|
||||
orderInfo.setCustId(custInfo.getCustId());
|
||||
orderInfo.setCustName(custInfo.getCustName());
|
||||
orderInfo.setMobile(custInfo.getCustNum());
|
||||
orderInfo.setOrderDate(orderDate);
|
||||
orderInfo.setCanteenId(deviceBaseInfo.getCanteenId());
|
||||
orderInfo.setCanteenName(deviceBaseInfo.getCanteenName());
|
||||
|
||||
|
||||
OrderListEntity orderList ;
|
||||
if(orderListEntities !=null && orderListEntities.size()>0){
|
||||
orderList = orderListEntities.get(0);
|
||||
List<OrderDetailListEntity> orderDetailsInfoList = orderList.getOrderDetailList();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package com.bonus.canteen.activity.order;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
|
|
@ -9,6 +10,7 @@ import android.widget.ListView;
|
|||
import android.widget.TextView;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.bonus.canteen.activity.OperationActivity;
|
||||
import com.bonus.canteen.adapter.menu.utils.OkHttpService;
|
||||
import com.bonus.canteen.adapter.menu.utils.StringHelper;
|
||||
import com.bonus.canteen.adapter.menu.utils.ThreadPoolManager;
|
||||
|
|
@ -19,6 +21,8 @@ import com.bonus.canteen.adapter.order.entity.OrderDetailAndroidVO;
|
|||
import com.bonus.canteen.adapter.order.entity.OrderListAndroidVO;
|
||||
import com.bonus.canteen.core.BaseActivity;
|
||||
import com.bonus.canteen.db.AppDatabase;
|
||||
import com.bonus.canteen.db.entity.base.OrderDetailsInfo;
|
||||
import com.bonus.canteen.db.entity.base.OrderInfo;
|
||||
import com.bonus.canteen.db.entity.user.CustInfo;
|
||||
import com.bonus.canteen.utils.Utils;
|
||||
import com.google.gson.Gson;
|
||||
|
|
@ -118,8 +122,8 @@ public class MachineSaleActivity extends BaseActivity<MachineSaleOrderMainBindi
|
|||
// WAIT_TAKE(3, "待领取"),
|
||||
// ALREADY_TAKE(4, "已领取");
|
||||
try {
|
||||
json.put("startDate", "2025-02-14");
|
||||
json.put("endDate", "2025-02-14");
|
||||
json.put("startDate", "2025-04-01");
|
||||
json.put("endDate", "2025-04-01");
|
||||
if(dishesStateList !=null){
|
||||
json.put("dishesStateList", new int[]{dishesStateList});
|
||||
}
|
||||
|
|
@ -136,7 +140,23 @@ public class MachineSaleActivity extends BaseActivity<MachineSaleOrderMainBindi
|
|||
|
||||
// 创建 RequestBody
|
||||
RequestBody body = RequestBody.create(JSON,jsonString);
|
||||
String result = service.httpPost(WorkConfig.getBaseUrl() + "/api/v3/order/android/page", body, MachineSaleActivity.this);
|
||||
String result = "";
|
||||
if(6 != dishesStateList){
|
||||
result = service.httpPost(WorkConfig.getBaseUrl() + "/api/v3/order/android/page", body, MachineSaleActivity.this);
|
||||
}else{
|
||||
List<OrderInfo> orderInfoList = AppDatabase.getDatabase(MachineSaleActivity.this).orderDao().getOrderInfoList();
|
||||
for(OrderInfo orderInfo:orderInfoList){
|
||||
List<OrderDetailsInfo> orderDetailsInfoList = AppDatabase.getDatabase(MachineSaleActivity.this).orderDetailsDao().getOrderInfoListByOrderId(orderInfo.getOrderId());
|
||||
orderInfo.setOrderDetailList(orderDetailsInfoList);
|
||||
}
|
||||
|
||||
if(orderInfoList !=null && orderInfoList.size()>0){
|
||||
Gson gson = new Gson();
|
||||
result = gson.toJson(orderInfoList);
|
||||
}else{
|
||||
return;
|
||||
}
|
||||
}
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
String onjData= jsonObject.getString("data");
|
||||
JSONObject jsonRecords = JSONObject.parseObject(onjData);
|
||||
|
|
@ -256,6 +276,9 @@ public class MachineSaleActivity extends BaseActivity<MachineSaleOrderMainBindi
|
|||
case R.id.mac_back:
|
||||
// 处理 button1 被点击的逻辑
|
||||
Log.i("Button","Button 1 clicked!");
|
||||
Intent intent = new Intent(MachineSaleActivity.this, OperationActivity.class);
|
||||
startActivity(intent);
|
||||
finish();
|
||||
break;
|
||||
case R.id.mac_make_all:
|
||||
// 处理 button2 被点击的逻辑
|
||||
|
|
@ -290,7 +313,7 @@ public class MachineSaleActivity extends BaseActivity<MachineSaleOrderMainBindi
|
|||
Log.i("Button","Button 6 clicked!");
|
||||
changeView();
|
||||
findViewById(R.id.mac_offline).setBackgroundResource(R.drawable.btn_border_yes_bg);
|
||||
initData(null,null);
|
||||
initData(null,6);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -109,8 +109,8 @@ public class OrderAdapter extends BaseAdapter {
|
|||
holder.machineTotalAmount.setText(Utils.conversionMoney(bean.getNeedPayAmount()+""));
|
||||
holder.machineRealAmount.setText(Utils.conversionMoney(bean.getRealAmount()+""));
|
||||
holder.machineMacOrdId.setText(bean.getMealCode()+"");
|
||||
holder.machineOrState.setText(bean.getOrderState()+"");
|
||||
holder.machineDeliveryState.setText(bean.getDishesState()+"");
|
||||
holder.machineOrState.setText(changeView(bean.getOrderState()+""));
|
||||
holder.machineDeliveryState.setText(changeView(bean.getDishesState()+""));
|
||||
|
||||
|
||||
holder.linearLayout.setOnClickListener(new View.OnClickListener() {
|
||||
|
|
@ -184,6 +184,31 @@ public class OrderAdapter extends BaseAdapter {
|
|||
return convertView;
|
||||
}
|
||||
|
||||
// UN_MAKE(1, "待制作"),
|
||||
// MAKING(2, "制作中"),
|
||||
// WAIT_DELIVERY(21, "待配送"),
|
||||
// DELIVERING(22, "配送中"),
|
||||
// WAIT_TAKE(3, "待领取"),
|
||||
// ALREADY_TAKE(4, "已领取");
|
||||
private String changeView(String str){
|
||||
|
||||
switch (str){
|
||||
case "1":
|
||||
return "待制作";
|
||||
case "2":
|
||||
return "制作中";
|
||||
case "21":
|
||||
return "待配送";
|
||||
case "22":
|
||||
return "配送中";
|
||||
case "4":
|
||||
return "已领取";
|
||||
default:
|
||||
return str;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private class ViewHolder {
|
||||
|
||||
LinearLayout linearLayout;
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ import com.bonus.canteen.db.dao.base.CookMeetTimesDao;
|
|||
import com.bonus.canteen.db.dao.base.CustPhotoFulDao;
|
||||
import com.bonus.canteen.db.dao.base.DeviceBaseDao;
|
||||
import com.bonus.canteen.db.dao.base.MealTimeDao;
|
||||
import com.bonus.canteen.db.dao.base.OrderDao;
|
||||
import com.bonus.canteen.db.dao.base.OrderDetailsDao;
|
||||
import com.bonus.canteen.db.dao.base.SecretKeyDao;
|
||||
import com.bonus.canteen.db.dao.user.CustInfoDao;
|
||||
import com.bonus.canteen.db.entity.base.CookBookInfo;
|
||||
|
|
@ -18,6 +20,8 @@ import com.bonus.canteen.db.entity.base.CookMeetTimesInfo;
|
|||
import com.bonus.canteen.db.entity.base.CustPhotoFulInfo;
|
||||
import com.bonus.canteen.db.entity.base.DeviceBaseInfo;
|
||||
import com.bonus.canteen.db.entity.base.MealTimeInfo;
|
||||
import com.bonus.canteen.db.entity.base.OrderDetailsInfo;
|
||||
import com.bonus.canteen.db.entity.base.OrderInfo;
|
||||
import com.bonus.canteen.db.entity.base.SecretKeyInfo;
|
||||
import com.bonus.canteen.db.entity.user.CustInfo;
|
||||
|
||||
|
|
@ -27,7 +31,7 @@ import androidx.room.RoomDatabase;
|
|||
import androidx.room.TypeConverters;
|
||||
|
||||
@Database(entities = {CustInfo.class, SecretKeyInfo.class, MealTimeInfo.class, DeviceBaseInfo.class, CookBookInfo.class, CookMeetDetailInfo.class,
|
||||
CookMeetTimesInfo.class, CookMeetMealInfo.class, CustPhotoFulInfo.class}, version = 1)
|
||||
CookMeetTimesInfo.class, CookMeetMealInfo.class, CustPhotoFulInfo.class, OrderInfo.class, OrderDetailsInfo.class}, version = 2)
|
||||
@TypeConverters(ListConverter.class)
|
||||
public abstract class AppDatabase extends RoomDatabase {
|
||||
|
||||
|
|
@ -46,6 +50,12 @@ public abstract class AppDatabase extends RoomDatabase {
|
|||
|
||||
public abstract CustPhotoFulDao custPhotoFulDao();
|
||||
|
||||
public abstract OrderDao orderDao();
|
||||
|
||||
public abstract OrderDetailsDao orderDetailsDao();
|
||||
|
||||
|
||||
|
||||
|
||||
private static volatile AppDatabase INSTANCE;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ public interface MealTimeDao {
|
|||
@Query("delete from meal_time_info")
|
||||
void deleteAll(); // 删除数据
|
||||
|
||||
@Query("select * from meal_time_info where :time between startTime and endTime")
|
||||
@Query("select * from meal_time_info where :time between startTime and endTime ")
|
||||
MealTimeInfo getIsDefaultByTime(String time);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
package com.bonus.canteen.db.dao.base;
|
||||
|
||||
import com.bonus.canteen.db.entity.base.OrderInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import androidx.room.Dao;
|
||||
import androidx.room.Delete;
|
||||
import androidx.room.Insert;
|
||||
import androidx.room.Query;
|
||||
import androidx.room.Update;
|
||||
|
||||
@Dao
|
||||
public interface OrderDao {
|
||||
|
||||
@Query("select * from order_info")
|
||||
List<OrderInfo> getOrderInfoList();
|
||||
|
||||
@Query("select * from order_info where orderId =:orderId")
|
||||
List<OrderInfo> getOrderInfoListByOrderId(String orderId);
|
||||
|
||||
@Insert
|
||||
void insert(OrderInfo orderInfo); // 插入数据
|
||||
|
||||
@Update
|
||||
void update(OrderInfo orderInfo); // 更新数据
|
||||
|
||||
@Delete
|
||||
void delete(OrderInfo orderInfo); // 删除数据
|
||||
|
||||
@Query("delete from order_info")
|
||||
void deleteAll(); // 删除数据
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
package com.bonus.canteen.db.dao.base;
|
||||
|
||||
|
||||
import com.bonus.canteen.db.entity.base.OrderDetailsInfo;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import androidx.room.Dao;
|
||||
import androidx.room.Delete;
|
||||
import androidx.room.Insert;
|
||||
import androidx.room.Query;
|
||||
import androidx.room.Update;
|
||||
|
||||
@Dao
|
||||
public interface OrderDetailsDao {
|
||||
|
||||
@Query("select * from order_details_info")
|
||||
List<OrderDetailsInfo> getOrderDetailsInfoList();
|
||||
|
||||
@Query("select * from order_details_info where detailId =:detailId")
|
||||
OrderDetailsInfo getOrderInfoListByDetailIdId(String detailId);
|
||||
|
||||
@Query("select * from order_details_info where orderId =:orderId")
|
||||
List<OrderDetailsInfo> getOrderInfoListByOrderId(String orderId);
|
||||
|
||||
@Insert
|
||||
void insert(OrderDetailsInfo orderInfo); // 插入数据
|
||||
|
||||
@Update
|
||||
void update(OrderDetailsInfo orderInfo); // 更新数据
|
||||
|
||||
@Delete
|
||||
void delete(OrderDetailsInfo orderInfo); // 删除数据
|
||||
|
||||
@Query("delete from order_details_info")
|
||||
void deleteAll(); // 删除数据
|
||||
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ import androidx.room.Update;
|
|||
@Dao
|
||||
public interface CustInfoDao {
|
||||
|
||||
@Query("select * from cust_info where custId = :custId")
|
||||
@Query("select * from cust_info where custId = :custId limit 1")
|
||||
CustInfo getCustInfoByCustId(String custId);
|
||||
|
||||
@Query("select * from cust_info ORDER BY id ")
|
||||
|
|
@ -32,4 +32,8 @@ public interface CustInfoDao {
|
|||
@Delete
|
||||
void delete(CustInfo user); // 删除数据
|
||||
|
||||
@Query("select * from cust_info where serialNum = :serialNum limit 1")
|
||||
CustInfo getCustInfoBySerialNum(String serialNum);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,283 @@
|
|||
package com.bonus.canteen.db.entity.base;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import androidx.room.ColumnInfo;
|
||||
import androidx.room.Entity;
|
||||
import androidx.room.PrimaryKey;
|
||||
|
||||
@Entity(tableName = "order_details_info")
|
||||
public class OrderDetailsInfo {
|
||||
|
||||
@PrimaryKey
|
||||
@NotNull
|
||||
private String detailId;//订单菜品id(唯一标识)
|
||||
|
||||
@ColumnInfo
|
||||
private String orderId;
|
||||
|
||||
@ColumnInfo
|
||||
private String detailType;//类别:1 菜品 2 套餐 3 商品 4 按键 5 补扣 6 报餐
|
||||
|
||||
@ColumnInfo
|
||||
private String goodsDishesId;//菜品id
|
||||
|
||||
@ColumnInfo
|
||||
private String goodsDishesName;//菜品名称
|
||||
|
||||
@ColumnInfo
|
||||
private String goodsDishesImgUrl;//菜谱图片
|
||||
|
||||
@ColumnInfo
|
||||
private String menuDetailId;//菜品详情id
|
||||
|
||||
@ColumnInfo
|
||||
private String salePrice;//ifOnline
|
||||
|
||||
@ColumnInfo
|
||||
private String prefPrice;//优惠价
|
||||
|
||||
@ColumnInfo
|
||||
private String price;//菜品基础单价(分
|
||||
|
||||
@ColumnInfo
|
||||
private String weightUnit;//每份重量 g
|
||||
|
||||
@ColumnInfo
|
||||
private String quantity;//数量/重量
|
||||
|
||||
@ColumnInfo
|
||||
private String unitName;//单位
|
||||
|
||||
@ColumnInfo
|
||||
private String totalAmount;//餐券制作总金额
|
||||
|
||||
@ColumnInfo
|
||||
private String calcTotalAmount;//菜品实际应付款金额合计 单位为分
|
||||
|
||||
@ColumnInfo
|
||||
private String realAmount;//实付金额
|
||||
|
||||
@ColumnInfo
|
||||
private String refundAmount ="0"; //退款金额
|
||||
|
||||
@ColumnInfo
|
||||
private String salesMode; //销售方式 1 按份 2 称重
|
||||
|
||||
@ColumnInfo
|
||||
private String tasteName; //口味名称 多个值用,分隔
|
||||
|
||||
@ColumnInfo
|
||||
private String detailState;//订单详情状态 1 正常 2 已退菜 3 部分退菜
|
||||
|
||||
@ColumnInfo
|
||||
private String goodsRefundNum;//商品已退数量
|
||||
|
||||
@ColumnInfo
|
||||
private String makingComplete;
|
||||
|
||||
@NotNull
|
||||
public String getDetailId() {
|
||||
return detailId;
|
||||
}
|
||||
|
||||
public void setDetailId(@NotNull String detailId) {
|
||||
this.detailId = detailId;
|
||||
}
|
||||
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public String getDetailType() {
|
||||
return detailType;
|
||||
}
|
||||
|
||||
public void setDetailType(String detailType) {
|
||||
this.detailType = detailType;
|
||||
}
|
||||
|
||||
public String getGoodsDishesId() {
|
||||
return goodsDishesId;
|
||||
}
|
||||
|
||||
public void setGoodsDishesId(String goodsDishesId) {
|
||||
this.goodsDishesId = goodsDishesId;
|
||||
}
|
||||
|
||||
public String getGoodsDishesName() {
|
||||
return goodsDishesName;
|
||||
}
|
||||
|
||||
public void setGoodsDishesName(String goodsDishesName) {
|
||||
this.goodsDishesName = goodsDishesName;
|
||||
}
|
||||
|
||||
public String getGoodsDishesImgUrl() {
|
||||
return goodsDishesImgUrl;
|
||||
}
|
||||
|
||||
public void setGoodsDishesImgUrl(String goodsDishesImgUrl) {
|
||||
this.goodsDishesImgUrl = goodsDishesImgUrl;
|
||||
}
|
||||
|
||||
public String getMenuDetailId() {
|
||||
return menuDetailId;
|
||||
}
|
||||
|
||||
public void setMenuDetailId(String menuDetailId) {
|
||||
this.menuDetailId = menuDetailId;
|
||||
}
|
||||
|
||||
public String getSalePrice() {
|
||||
return salePrice;
|
||||
}
|
||||
|
||||
public void setSalePrice(String salePrice) {
|
||||
this.salePrice = salePrice;
|
||||
}
|
||||
|
||||
public String getPrefPrice() {
|
||||
return prefPrice;
|
||||
}
|
||||
|
||||
public void setPrefPrice(String prefPrice) {
|
||||
this.prefPrice = prefPrice;
|
||||
}
|
||||
|
||||
public String getPrice() {
|
||||
return price;
|
||||
}
|
||||
|
||||
public void setPrice(String price) {
|
||||
this.price = price;
|
||||
}
|
||||
|
||||
public String getWeightUnit() {
|
||||
return weightUnit;
|
||||
}
|
||||
|
||||
public void setWeightUnit(String weightUnit) {
|
||||
this.weightUnit = weightUnit;
|
||||
}
|
||||
|
||||
public String getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(String quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getUnitName() {
|
||||
return unitName;
|
||||
}
|
||||
|
||||
public void setUnitName(String unitName) {
|
||||
this.unitName = unitName;
|
||||
}
|
||||
|
||||
public String getTotalAmount() {
|
||||
return totalAmount;
|
||||
}
|
||||
|
||||
public void setTotalAmount(String totalAmount) {
|
||||
this.totalAmount = totalAmount;
|
||||
}
|
||||
|
||||
public String getCalcTotalAmount() {
|
||||
return calcTotalAmount;
|
||||
}
|
||||
|
||||
public void setCalcTotalAmount(String calcTotalAmount) {
|
||||
this.calcTotalAmount = calcTotalAmount;
|
||||
}
|
||||
|
||||
public String getRealAmount() {
|
||||
return realAmount;
|
||||
}
|
||||
|
||||
public void setRealAmount(String realAmount) {
|
||||
this.realAmount = realAmount;
|
||||
}
|
||||
|
||||
public String getRefundAmount() {
|
||||
return refundAmount;
|
||||
}
|
||||
|
||||
public void setRefundAmount(String refundAmount) {
|
||||
this.refundAmount = refundAmount;
|
||||
}
|
||||
|
||||
public String getSalesMode() {
|
||||
return salesMode;
|
||||
}
|
||||
|
||||
public void setSalesMode(String salesMode) {
|
||||
this.salesMode = salesMode;
|
||||
}
|
||||
|
||||
public String getTasteName() {
|
||||
return tasteName;
|
||||
}
|
||||
|
||||
public void setTasteName(String tasteName) {
|
||||
this.tasteName = tasteName;
|
||||
}
|
||||
|
||||
public String getDetailState() {
|
||||
return detailState;
|
||||
}
|
||||
|
||||
public void setDetailState(String detailState) {
|
||||
this.detailState = detailState;
|
||||
}
|
||||
|
||||
public String getGoodsRefundNum() {
|
||||
return goodsRefundNum;
|
||||
}
|
||||
|
||||
public void setGoodsRefundNum(String goodsRefundNum) {
|
||||
this.goodsRefundNum = goodsRefundNum;
|
||||
}
|
||||
|
||||
public String getMakingComplete() {
|
||||
return makingComplete;
|
||||
}
|
||||
|
||||
public void setMakingComplete(String makingComplete) {
|
||||
this.makingComplete = makingComplete;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OrderDetailsInfo{" +
|
||||
"detailId='" + detailId + '\'' +
|
||||
", orderId='" + orderId + '\'' +
|
||||
", detailType='" + detailType + '\'' +
|
||||
", goodsDishesId='" + goodsDishesId + '\'' +
|
||||
", goodsDishesName='" + goodsDishesName + '\'' +
|
||||
", goodsDishesImgUrl='" + goodsDishesImgUrl + '\'' +
|
||||
", menuDetailId='" + menuDetailId + '\'' +
|
||||
", salePrice='" + salePrice + '\'' +
|
||||
", prefPrice='" + prefPrice + '\'' +
|
||||
", price='" + price + '\'' +
|
||||
", weightUnit='" + weightUnit + '\'' +
|
||||
", quantity='" + quantity + '\'' +
|
||||
", unitName='" + unitName + '\'' +
|
||||
", totalAmount='" + totalAmount + '\'' +
|
||||
", calcTotalAmount='" + calcTotalAmount + '\'' +
|
||||
", realAmount='" + realAmount + '\'' +
|
||||
", refundAmount='" + refundAmount + '\'' +
|
||||
", salesMode='" + salesMode + '\'' +
|
||||
", tasteName='" + tasteName + '\'' +
|
||||
", detailState='" + detailState + '\'' +
|
||||
", goodsRefundNum='" + goodsRefundNum + '\'' +
|
||||
", makingComplete='" + makingComplete + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,546 @@
|
|||
package com.bonus.canteen.db.entity.base;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import androidx.room.ColumnInfo;
|
||||
import androidx.room.Entity;
|
||||
import androidx.room.Ignore;
|
||||
import androidx.room.PrimaryKey;
|
||||
|
||||
@Entity(tableName = "order_info")
|
||||
public class OrderInfo {
|
||||
@PrimaryKey
|
||||
@NotNull
|
||||
private String orderId;//订单id
|
||||
@ColumnInfo
|
||||
private String macOrderId;//macId
|
||||
@ColumnInfo
|
||||
private String sourceType;//来源
|
||||
@ColumnInfo
|
||||
private String plateSerialNum;//餐盘物理卡号
|
||||
@ColumnInfo
|
||||
private String plateNum;//餐盘号
|
||||
@ColumnInfo
|
||||
private String custId;//人员id
|
||||
@ColumnInfo
|
||||
private String custName;//人员名称
|
||||
@ColumnInfo
|
||||
private String custNum;//人员编号
|
||||
@ColumnInfo
|
||||
private String mobile;//
|
||||
@ColumnInfo
|
||||
private String orderDate;//订单时间
|
||||
@ColumnInfo
|
||||
private String canteenId;//食堂id
|
||||
@ColumnInfo
|
||||
private String canteenName;//试食堂名称
|
||||
@ColumnInfo
|
||||
private String stallId;//档口id不能为空
|
||||
@ColumnInfo
|
||||
private String stallName;//档口名称
|
||||
@ColumnInfo
|
||||
private String permissionCode;//食堂档口权限码，格式：[食堂id]_[档口id]
|
||||
@ColumnInfo
|
||||
private String mealtimeType;//餐次类型
|
||||
@ColumnInfo
|
||||
private String mealtimeName;//餐次类型名称
|
||||
@ColumnInfo
|
||||
private String machineSn;//设备sn码
|
||||
@ColumnInfo
|
||||
private String mealCode;//流水号前缀
|
||||
@ColumnInfo
|
||||
private String payableAmount;//应付金额 分
|
||||
@ColumnInfo
|
||||
private String discountsAmount = "0";//优惠金额
|
||||
@ColumnInfo
|
||||
private String couponAmount = "0";//餐券金额
|
||||
@ColumnInfo
|
||||
private String deliveryAmount = "0";//配送费
|
||||
@ColumnInfo
|
||||
private String packingAmount = "0";//包装费 分
|
||||
@ColumnInfo
|
||||
private String realAmount;//订单实付总金额
|
||||
@ColumnInfo
|
||||
private String needPayAmount;//实际应付款金额 单位为分
|
||||
@ColumnInfo
|
||||
private String refundAmount = "0";
|
||||
@ColumnInfo
|
||||
private String orderTime;//下单时间
|
||||
@ColumnInfo
|
||||
private String payTime;//支付时间
|
||||
@ColumnInfo
|
||||
private String payType;//支付方式
|
||||
@ColumnInfo
|
||||
private String payState;//支付状态
|
||||
@ColumnInfo
|
||||
private String deductionType;//扣款类型 1 下单扣款 2 核销扣款
|
||||
@ColumnInfo
|
||||
private String orderType;//订单类型
|
||||
@ColumnInfo
|
||||
private String orderState;//订单状态
|
||||
|
||||
//(1, "已支付"),
|
||||
//(9, "已取消"),
|
||||
//(10, "已退单"),
|
||||
//(11, "已完成"),
|
||||
//(22, "未支付"),
|
||||
//(23, "部分支付"),
|
||||
//(24, "支付失败"),
|
||||
//(25, "部分退单"),
|
||||
//(26, "支付中");
|
||||
@ColumnInfo
|
||||
private String orderStateMix;
|
||||
|
||||
//(1, "待制作"),
|
||||
//(2, "制作中"),
|
||||
//(21, "待配送"),
|
||||
//(22, "配送中"),
|
||||
//(3, "待领取"),
|
||||
//(4, "已领取");
|
||||
@ColumnInfo
|
||||
private String dishesState;
|
||||
@ColumnInfo
|
||||
private String orderRefundState;//"订单退款状态 1 未申请 2 已退单 3 部分退单"
|
||||
@ColumnInfo
|
||||
private String commentState;//评价状态 1 已评价 2 未评价
|
||||
@ColumnInfo
|
||||
private String checkState;//"审核状态 1 待审核 2 审核通过 3 审核失败
|
||||
@ColumnInfo
|
||||
private String imgUrl;
|
||||
@ColumnInfo
|
||||
private String remark;
|
||||
@ColumnInfo
|
||||
private String goodsCount;//菜品总数量
|
||||
@ColumnInfo
|
||||
private String ifOnline; //是否在线
|
||||
@ColumnInfo
|
||||
private String payChannel = "1";//默认乐牛系统账户 详情PayChannelEnum
|
||||
|
||||
@ColumnInfo
|
||||
private String isPush;
|
||||
|
||||
@Ignore
|
||||
private List<OrderDetailsInfo> orderDetailList;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OrderInfo{" +
|
||||
"orderId='" + orderId + '\'' +
|
||||
", macOrderId='" + macOrderId + '\'' +
|
||||
", sourceType='" + sourceType + '\'' +
|
||||
", plateSerialNum='" + plateSerialNum + '\'' +
|
||||
", plateNum='" + plateNum + '\'' +
|
||||
", custId='" + custId + '\'' +
|
||||
", custName='" + custName + '\'' +
|
||||
", custNum='" + custNum + '\'' +
|
||||
", mobile='" + mobile + '\'' +
|
||||
", orderDate='" + orderDate + '\'' +
|
||||
", canteenId='" + canteenId + '\'' +
|
||||
", canteenName='" + canteenName + '\'' +
|
||||
", stallId='" + stallId + '\'' +
|
||||
", stallName='" + stallName + '\'' +
|
||||
", permissionCode='" + permissionCode + '\'' +
|
||||
", mealtimeType='" + mealtimeType + '\'' +
|
||||
", mealtimeName='" + mealtimeName + '\'' +
|
||||
", machineSn='" + machineSn + '\'' +
|
||||
", mealCode='" + mealCode + '\'' +
|
||||
", payableAmount='" + payableAmount + '\'' +
|
||||
", discountsAmount='" + discountsAmount + '\'' +
|
||||
", couponAmount='" + couponAmount + '\'' +
|
||||
", deliveryAmount='" + deliveryAmount + '\'' +
|
||||
", packingAmount='" + packingAmount + '\'' +
|
||||
", realAmount='" + realAmount + '\'' +
|
||||
", needPayAmount='" + needPayAmount + '\'' +
|
||||
", refundAmount='" + refundAmount + '\'' +
|
||||
", orderTime='" + orderTime + '\'' +
|
||||
", payTime='" + payTime + '\'' +
|
||||
", payType='" + payType + '\'' +
|
||||
", payState='" + payState + '\'' +
|
||||
", deductionType='" + deductionType + '\'' +
|
||||
", orderType='" + orderType + '\'' +
|
||||
", orderState='" + orderState + '\'' +
|
||||
", orderStateMix='" + orderStateMix + '\'' +
|
||||
", dishesState='" + dishesState + '\'' +
|
||||
", orderRefundState='" + orderRefundState + '\'' +
|
||||
", commentState='" + commentState + '\'' +
|
||||
", checkState='" + checkState + '\'' +
|
||||
", imgUrl='" + imgUrl + '\'' +
|
||||
", remark='" + remark + '\'' +
|
||||
", goodsCount='" + goodsCount + '\'' +
|
||||
", ifOnline='" + ifOnline + '\'' +
|
||||
", payChannel='" + payChannel + '\'' +
|
||||
", isPush='" + isPush + '\'' +
|
||||
", orderDetailList=" + orderDetailList +
|
||||
'}';
|
||||
}
|
||||
|
||||
public String getIsPush() {
|
||||
return isPush;
|
||||
}
|
||||
|
||||
public void setIsPush(String isPush) {
|
||||
this.isPush = isPush;
|
||||
}
|
||||
|
||||
public List<OrderDetailsInfo> getOrderDetailList() {
|
||||
return orderDetailList;
|
||||
}
|
||||
|
||||
public void setOrderDetailList(List<OrderDetailsInfo> orderDetailList) {
|
||||
this.orderDetailList = orderDetailList;
|
||||
}
|
||||
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public String getMacOrderId() {
|
||||
return macOrderId;
|
||||
}
|
||||
|
||||
public void setMacOrderId(String macOrderId) {
|
||||
this.macOrderId = macOrderId;
|
||||
}
|
||||
|
||||
public String getSourceType() {
|
||||
return sourceType;
|
||||
}
|
||||
|
||||
public void setSourceType(String sourceType) {
|
||||
this.sourceType = sourceType;
|
||||
}
|
||||
|
||||
public String getPlateSerialNum() {
|
||||
return plateSerialNum;
|
||||
}
|
||||
|
||||
public void setPlateSerialNum(String plateSerialNum) {
|
||||
this.plateSerialNum = plateSerialNum;
|
||||
}
|
||||
|
||||
public String getPlateNum() {
|
||||
return plateNum;
|
||||
}
|
||||
|
||||
public void setPlateNum(String plateNum) {
|
||||
this.plateNum = plateNum;
|
||||
}
|
||||
|
||||
public String getCustId() {
|
||||
return custId;
|
||||
}
|
||||
|
||||
public void setCustId(String custId) {
|
||||
this.custId = custId;
|
||||
}
|
||||
|
||||
public String getCustName() {
|
||||
return custName;
|
||||
}
|
||||
|
||||
public void setCustName(String custName) {
|
||||
this.custName = custName;
|
||||
}
|
||||
|
||||
public String getCustNum() {
|
||||
return custNum;
|
||||
}
|
||||
|
||||
public void setCustNum(String custNum) {
|
||||
this.custNum = custNum;
|
||||
}
|
||||
|
||||
public String getMobile() {
|
||||
return mobile;
|
||||
}
|
||||
|
||||
public void setMobile(String mobile) {
|
||||
this.mobile = mobile;
|
||||
}
|
||||
|
||||
public String getOrderDate() {
|
||||
return orderDate;
|
||||
}
|
||||
|
||||
public void setOrderDate(String orderDate) {
|
||||
this.orderDate = orderDate;
|
||||
}
|
||||
|
||||
public String getCanteenId() {
|
||||
return canteenId;
|
||||
}
|
||||
|
||||
public void setCanteenId(String canteenId) {
|
||||
this.canteenId = canteenId;
|
||||
}
|
||||
|
||||
public String getCanteenName() {
|
||||
return canteenName;
|
||||
}
|
||||
|
||||
public void setCanteenName(String canteenName) {
|
||||
this.canteenName = canteenName;
|
||||
}
|
||||
|
||||
public String getStallId() {
|
||||
return stallId;
|
||||
}
|
||||
|
||||
public void setStallId(String stallId) {
|
||||
this.stallId = stallId;
|
||||
}
|
||||
|
||||
public String getStallName() {
|
||||
return stallName;
|
||||
}
|
||||
|
||||
public void setStallName(String stallName) {
|
||||
this.stallName = stallName;
|
||||
}
|
||||
|
||||
public String getPermissionCode() {
|
||||
return permissionCode;
|
||||
}
|
||||
|
||||
public void setPermissionCode(String permissionCode) {
|
||||
this.permissionCode = permissionCode;
|
||||
}
|
||||
|
||||
public String getMealtimeType() {
|
||||
return mealtimeType;
|
||||
}
|
||||
|
||||
public void setMealtimeType(String mealtimeType) {
|
||||
this.mealtimeType = mealtimeType;
|
||||
}
|
||||
|
||||
public String getMealtimeName() {
|
||||
return mealtimeName;
|
||||
}
|
||||
|
||||
public void setMealtimeName(String mealtimeName) {
|
||||
this.mealtimeName = mealtimeName;
|
||||
}
|
||||
|
||||
public String getMachineSn() {
|
||||
return machineSn;
|
||||
}
|
||||
|
||||
public void setMachineSn(String machineSn) {
|
||||
this.machineSn = machineSn;
|
||||
}
|
||||
|
||||
public String getMealCode() {
|
||||
return mealCode;
|
||||
}
|
||||
|
||||
public void setMealCode(String mealCode) {
|
||||
this.mealCode = mealCode;
|
||||
}
|
||||
|
||||
public String getPayableAmount() {
|
||||
return payableAmount;
|
||||
}
|
||||
|
||||
public void setPayableAmount(String payableAmount) {
|
||||
this.payableAmount = payableAmount;
|
||||
}
|
||||
|
||||
public String getDiscountsAmount() {
|
||||
return discountsAmount;
|
||||
}
|
||||
|
||||
public void setDiscountsAmount(String discountsAmount) {
|
||||
this.discountsAmount = discountsAmount;
|
||||
}
|
||||
|
||||
public String getCouponAmount() {
|
||||
return couponAmount;
|
||||
}
|
||||
|
||||
public void setCouponAmount(String couponAmount) {
|
||||
this.couponAmount = couponAmount;
|
||||
}
|
||||
|
||||
public String getDeliveryAmount() {
|
||||
return deliveryAmount;
|
||||
}
|
||||
|
||||
public void setDeliveryAmount(String deliveryAmount) {
|
||||
this.deliveryAmount = deliveryAmount;
|
||||
}
|
||||
|
||||
public String getPackingAmount() {
|
||||
return packingAmount;
|
||||
}
|
||||
|
||||
public void setPackingAmount(String packingAmount) {
|
||||
this.packingAmount = packingAmount;
|
||||
}
|
||||
|
||||
public String getRealAmount() {
|
||||
return realAmount;
|
||||
}
|
||||
|
||||
public void setRealAmount(String realAmount) {
|
||||
this.realAmount = realAmount;
|
||||
}
|
||||
|
||||
public String getNeedPayAmount() {
|
||||
return needPayAmount;
|
||||
}
|
||||
|
||||
public void setNeedPayAmount(String needPayAmount) {
|
||||
this.needPayAmount = needPayAmount;
|
||||
}
|
||||
|
||||
public String getRefundAmount() {
|
||||
return refundAmount;
|
||||
}
|
||||
|
||||
public void setRefundAmount(String refundAmount) {
|
||||
this.refundAmount = refundAmount;
|
||||
}
|
||||
|
||||
public String getOrderTime() {
|
||||
return orderTime;
|
||||
}
|
||||
|
||||
public void setOrderTime(String orderTime) {
|
||||
this.orderTime = orderTime;
|
||||
}
|
||||
|
||||
public String getPayTime() {
|
||||
return payTime;
|
||||
}
|
||||
|
||||
public void setPayTime(String payTime) {
|
||||
this.payTime = payTime;
|
||||
}
|
||||
|
||||
public String getPayType() {
|
||||
return payType;
|
||||
}
|
||||
|
||||
public void setPayType(String payType) {
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
public String getPayState() {
|
||||
return payState;
|
||||
}
|
||||
|
||||
public void setPayState(String payState) {
|
||||
this.payState = payState;
|
||||
}
|
||||
|
||||
public String getDeductionType() {
|
||||
return deductionType;
|
||||
}
|
||||
|
||||
public void setDeductionType(String deductionType) {
|
||||
this.deductionType = deductionType;
|
||||
}
|
||||
|
||||
public String getOrderType() {
|
||||
return orderType;
|
||||
}
|
||||
|
||||
public void setOrderType(String orderType) {
|
||||
this.orderType = orderType;
|
||||
}
|
||||
|
||||
public String getOrderState() {
|
||||
return orderState;
|
||||
}
|
||||
|
||||
public void setOrderState(String orderState) {
|
||||
this.orderState = orderState;
|
||||
}
|
||||
|
||||
public String getOrderStateMix() {
|
||||
return orderStateMix;
|
||||
}
|
||||
|
||||
public void setOrderStateMix(String orderStateMix) {
|
||||
this.orderStateMix = orderStateMix;
|
||||
}
|
||||
|
||||
public String getDishesState() {
|
||||
return dishesState;
|
||||
}
|
||||
|
||||
public void setDishesState(String dishesState) {
|
||||
this.dishesState = dishesState;
|
||||
}
|
||||
|
||||
public String getOrderRefundState() {
|
||||
return orderRefundState;
|
||||
}
|
||||
|
||||
public void setOrderRefundState(String orderRefundState) {
|
||||
this.orderRefundState = orderRefundState;
|
||||
}
|
||||
|
||||
public String getCommentState() {
|
||||
return commentState;
|
||||
}
|
||||
|
||||
public void setCommentState(String commentState) {
|
||||
this.commentState = commentState;
|
||||
}
|
||||
|
||||
public String getCheckState() {
|
||||
return checkState;
|
||||
}
|
||||
|
||||
public void setCheckState(String checkState) {
|
||||
this.checkState = checkState;
|
||||
}
|
||||
|
||||
public String getImgUrl() {
|
||||
return imgUrl;
|
||||
}
|
||||
|
||||
public void setImgUrl(String imgUrl) {
|
||||
this.imgUrl = imgUrl;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public String getGoodsCount() {
|
||||
return goodsCount;
|
||||
}
|
||||
|
||||
public void setGoodsCount(String goodsCount) {
|
||||
this.goodsCount = goodsCount;
|
||||
}
|
||||
|
||||
public String getIfOnline() {
|
||||
return ifOnline;
|
||||
}
|
||||
|
||||
public void setIfOnline(String ifOnline) {
|
||||
this.ifOnline = ifOnline;
|
||||
}
|
||||
|
||||
public String getPayChannel() {
|
||||
return payChannel;
|
||||
}
|
||||
|
||||
public void setPayChannel(String payChannel) {
|
||||
this.payChannel = payChannel;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
package com.bonus.canteen.entity;
|
||||
|
||||
public class OrderDetailListEntity {
|
||||
|
||||
private int detailType;
|
||||
|
||||
private long goodsDishesId;
|
||||
|
||||
private String goodsDishesName;
|
||||
|
||||
private long menuDetailId;
|
||||
|
||||
private int quantity;
|
||||
|
||||
private int salePrice;
|
||||
|
||||
private int salesMode;
|
||||
|
||||
private int weightUnit;
|
||||
|
||||
public int getDetailType() {
|
||||
return detailType;
|
||||
}
|
||||
|
||||
public void setDetailType(int detailType) {
|
||||
this.detailType = detailType;
|
||||
}
|
||||
|
||||
public long getGoodsDishesId() {
|
||||
return goodsDishesId;
|
||||
}
|
||||
|
||||
public void setGoodsDishesId(long goodsDishesId) {
|
||||
this.goodsDishesId = goodsDishesId;
|
||||
}
|
||||
|
||||
public String getGoodsDishesName() {
|
||||
return goodsDishesName;
|
||||
}
|
||||
|
||||
public void setGoodsDishesName(String goodsDishesName) {
|
||||
this.goodsDishesName = goodsDishesName;
|
||||
}
|
||||
|
||||
public long getMenuDetailId() {
|
||||
return menuDetailId;
|
||||
}
|
||||
|
||||
public void setMenuDetailId(long menuDetailId) {
|
||||
this.menuDetailId = menuDetailId;
|
||||
}
|
||||
|
||||
public int getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setQuantity(int quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public int getSalePrice() {
|
||||
return salePrice;
|
||||
}
|
||||
|
||||
public void setSalePrice(int salePrice) {
|
||||
this.salePrice = salePrice;
|
||||
}
|
||||
|
||||
public int getSalesMode() {
|
||||
return salesMode;
|
||||
}
|
||||
|
||||
public void setSalesMode(int salesMode) {
|
||||
this.salesMode = salesMode;
|
||||
}
|
||||
|
||||
public int getWeightUnit() {
|
||||
return weightUnit;
|
||||
}
|
||||
|
||||
public void setWeightUnit(int weightUnit) {
|
||||
this.weightUnit = weightUnit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "orderDetailListEntity{" +
|
||||
"detailType=" + detailType +
|
||||
", goodsDishesId=" + goodsDishesId +
|
||||
", goodsDishesName='" + goodsDishesName + '\'' +
|
||||
", menuDetailId=" + menuDetailId +
|
||||
", quantity=" + quantity +
|
||||
", salePrice=" + salePrice +
|
||||
", salesMode=" + salesMode +
|
||||
", weightUnit=" + weightUnit +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,144 @@
|
|||
package com.bonus.canteen.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class OrderEntity {
|
||||
|
||||
private int amount;
|
||||
|
||||
private int consumMode;
|
||||
|
||||
private long custId;
|
||||
|
||||
private int ifOnline;
|
||||
|
||||
private String macOrderId;
|
||||
|
||||
private int nuClearMode;
|
||||
|
||||
private List<OrderListEntity> orderList;
|
||||
|
||||
private int orderType;
|
||||
|
||||
private int payType;
|
||||
|
||||
private String qrCode;
|
||||
|
||||
private String openid;
|
||||
|
||||
private String serialNum;
|
||||
|
||||
public int getAmount() {
|
||||
return amount;
|
||||
}
|
||||
|
||||
public void setAmount(int amount) {
|
||||
this.amount = amount;
|
||||
}
|
||||
|
||||
public int getConsumMode() {
|
||||
return consumMode;
|
||||
}
|
||||
|
||||
public void setConsumMode(int consumMode) {
|
||||
this.consumMode = consumMode;
|
||||
}
|
||||
|
||||
public long getCustId() {
|
||||
return custId;
|
||||
}
|
||||
|
||||
public void setCustId(long custId) {
|
||||
this.custId = custId;
|
||||
}
|
||||
|
||||
public int getIfOnline() {
|
||||
return ifOnline;
|
||||
}
|
||||
|
||||
public void setIfOnline(int ifOnline) {
|
||||
this.ifOnline = ifOnline;
|
||||
}
|
||||
|
||||
public String getMacOrderId() {
|
||||
return macOrderId;
|
||||
}
|
||||
|
||||
public void setMacOrderId(String macOrderId) {
|
||||
this.macOrderId = macOrderId;
|
||||
}
|
||||
|
||||
public int getNuClearMode() {
|
||||
return nuClearMode;
|
||||
}
|
||||
|
||||
public void setNuClearMode(int nuClearMode) {
|
||||
this.nuClearMode = nuClearMode;
|
||||
}
|
||||
|
||||
public List<OrderListEntity> getOrderList() {
|
||||
return orderList;
|
||||
}
|
||||
|
||||
public void setOrderList(List<OrderListEntity> orderList) {
|
||||
this.orderList = orderList;
|
||||
}
|
||||
|
||||
public int getOrderType() {
|
||||
return orderType;
|
||||
}
|
||||
|
||||
public void setOrderType(int orderType) {
|
||||
this.orderType = orderType;
|
||||
}
|
||||
|
||||
public int getPayType() {
|
||||
return payType;
|
||||
}
|
||||
|
||||
public void setPayType(int payType) {
|
||||
this.payType = payType;
|
||||
}
|
||||
|
||||
public String getQrCode() {
|
||||
return qrCode;
|
||||
}
|
||||
|
||||
public void setQrCode(String qrCode) {
|
||||
this.qrCode = qrCode;
|
||||
}
|
||||
|
||||
public String getOpenid() {
|
||||
return openid;
|
||||
}
|
||||
|
||||
public void setOpenid(String openid) {
|
||||
this.openid = openid;
|
||||
}
|
||||
|
||||
public String getSerialNum() {
|
||||
return serialNum;
|
||||
}
|
||||
|
||||
public void setSerialNum(String serialNum) {
|
||||
this.serialNum = serialNum;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OrderEntity{" +
|
||||
"amount=" + amount +
|
||||
", consumMode=" + consumMode +
|
||||
", custId=" + custId +
|
||||
", ifOnline=" + ifOnline +
|
||||
", macOrderId='" + macOrderId + '\'' +
|
||||
", nuClearMode=" + nuClearMode +
|
||||
", orderList=" + orderList +
|
||||
", orderType=" + orderType +
|
||||
", payType=" + payType +
|
||||
", qrCode='" + qrCode + '\'' +
|
||||
", openid='" + openid + '\'' +
|
||||
", serialNum='" + serialNum + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
package com.bonus.canteen.entity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class OrderListEntity {
|
||||
|
||||
private long canteenId;
|
||||
|
||||
private String canteenName;
|
||||
|
||||
private int deliveryRelatedId;
|
||||
|
||||
private String mealtimeName;
|
||||
|
||||
private int mealtimeType;
|
||||
|
||||
private List<OrderDetailListEntity> orderDetailList;
|
||||
|
||||
private String orderTime;
|
||||
|
||||
private int placeId;
|
||||
|
||||
private long stallId;
|
||||
|
||||
private String stallName;
|
||||
|
||||
public long getCanteenId() {
|
||||
return canteenId;
|
||||
}
|
||||
|
||||
public void setCanteenId(long canteenId) {
|
||||
this.canteenId = canteenId;
|
||||
}
|
||||
|
||||
public String getCanteenName() {
|
||||
return canteenName;
|
||||
}
|
||||
|
||||
public void setCanteenName(String canteenName) {
|
||||
this.canteenName = canteenName;
|
||||
}
|
||||
|
||||
public int getDeliveryRelatedId() {
|
||||
return deliveryRelatedId;
|
||||
}
|
||||
|
||||
public void setDeliveryRelatedId(int deliveryRelatedId) {
|
||||
this.deliveryRelatedId = deliveryRelatedId;
|
||||
}
|
||||
|
||||
public String getMealtimeName() {
|
||||
return mealtimeName;
|
||||
}
|
||||
|
||||
public void setMealtimeName(String mealtimeName) {
|
||||
this.mealtimeName = mealtimeName;
|
||||
}
|
||||
|
||||
public int getMealtimeType() {
|
||||
return mealtimeType;
|
||||
}
|
||||
|
||||
public void setMealtimeType(int mealtimeType) {
|
||||
this.mealtimeType = mealtimeType;
|
||||
}
|
||||
|
||||
public List<OrderDetailListEntity> getOrderDetailList() {
|
||||
return orderDetailList;
|
||||
}
|
||||
|
||||
public void setOrderDetailList(List<OrderDetailListEntity> orderDetailList) {
|
||||
this.orderDetailList = orderDetailList;
|
||||
}
|
||||
|
||||
public String getOrderTime() {
|
||||
return orderTime;
|
||||
}
|
||||
|
||||
public void setOrderTime(String orderTime) {
|
||||
this.orderTime = orderTime;
|
||||
}
|
||||
|
||||
public int getPlaceId() {
|
||||
return placeId;
|
||||
}
|
||||
|
||||
public void setPlaceId(int placeId) {
|
||||
this.placeId = placeId;
|
||||
}
|
||||
|
||||
public long getStallId() {
|
||||
return stallId;
|
||||
}
|
||||
|
||||
public void setStallId(long stallId) {
|
||||
this.stallId = stallId;
|
||||
}
|
||||
|
||||
public String getStallName() {
|
||||
return stallName;
|
||||
}
|
||||
|
||||
public void setStallName(String stallName) {
|
||||
this.stallName = stallName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OrderListEntity{" +
|
||||
"canteenId=" + canteenId +
|
||||
", canteenName='" + canteenName + '\'' +
|
||||
", deliveryRelatedId=" + deliveryRelatedId +
|
||||
", mealtimeName='" + mealtimeName + '\'' +
|
||||
", mealtimeType=" + mealtimeType +
|
||||
", orderDetailList=" + orderDetailList +
|
||||
", orderTime='" + orderTime + '\'' +
|
||||
", placeId=" + placeId +
|
||||
", stallId=" + stallId +
|
||||
", stallName='" + stallName + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue