From ba96f2a660b7fe146e45e4a76ebc908776791b50 Mon Sep 17 00:00:00 2001
From: 陈力 <chenli@lotaai.com>
Date: 星期三, 14 六月 2023 14:40:04 +0800
Subject: [PATCH] 取餐

---
 app/src/main/java/com/lotaai/canguiayw/sqllitedb/OrderDao.java |   98 ++++++++++++++++++++++++++++---------------------
 1 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/lotaai/canguiayw/sqllitedb/OrderDao.java b/app/src/main/java/com/lotaai/canguiayw/sqllitedb/OrderDao.java
index 2aa0d4b..1441d02 100644
--- a/app/src/main/java/com/lotaai/canguiayw/sqllitedb/OrderDao.java
+++ b/app/src/main/java/com/lotaai/canguiayw/sqllitedb/OrderDao.java
@@ -23,13 +23,14 @@
      */
     public static class Properties {
         public final static Property Id = new Property(0, Long.class, "id", true, "_id");
-        public final static Property OrderNo = new Property(1, String.class, "orderNo", false, "ORDER_NO");
-        public final static Property GridNo = new Property(2, String.class, "gridNo", false, "GRID_NO");
-        public final static Property XuHao = new Property(3, String.class, "xuHao", false, "XU_HAO");
-        public final static Property State = new Property(4, int.class, "state", false, "STATE");
-        public final static Property PutInDate = new Property(5, String.class, "putInDate", false, "PUT_IN_DATE");
-        public final static Property TakeCode = new Property(6, String.class, "takeCode", false, "TAKE_CODE");
-        public final static Property CreateTime = new Property(7, String.class, "createTime", false, "CREATE_TIME");
+        public final static Property OrderId = new Property(1, String.class, "orderId", false, "ORDER_ID");
+        public final static Property OrderNo = new Property(2, String.class, "orderNo", false, "ORDER_NO");
+        public final static Property GridNo = new Property(3, String.class, "gridNo", false, "GRID_NO");
+        public final static Property XuHao = new Property(4, String.class, "xuHao", false, "XU_HAO");
+        public final static Property State = new Property(5, int.class, "state", false, "STATE");
+        public final static Property PutInDate = new Property(6, String.class, "putInDate", false, "PUT_IN_DATE");
+        public final static Property TakeCode = new Property(7, String.class, "takeCode", false, "TAKE_CODE");
+        public final static Property CreateTime = new Property(8, String.class, "createTime", false, "CREATE_TIME");
     }
 
 
@@ -46,13 +47,14 @@
         String constraint = ifNotExists? "IF NOT EXISTS ": "";
         db.execSQL("CREATE TABLE " + constraint + "\"ORDER\" (" + //
                 "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id
-                "\"ORDER_NO\" TEXT UNIQUE ," + // 1: orderNo
-                "\"GRID_NO\" TEXT NOT NULL ," + // 2: gridNo
-                "\"XU_HAO\" TEXT NOT NULL ," + // 3: xuHao
-                "\"STATE\" INTEGER NOT NULL ," + // 4: state
-                "\"PUT_IN_DATE\" TEXT," + // 5: putInDate
-                "\"TAKE_CODE\" TEXT," + // 6: takeCode
-                "\"CREATE_TIME\" TEXT);"); // 7: createTime
+                "\"ORDER_ID\" TEXT UNIQUE ," + // 1: orderId
+                "\"ORDER_NO\" TEXT UNIQUE ," + // 2: orderNo
+                "\"GRID_NO\" TEXT NOT NULL ," + // 3: gridNo
+                "\"XU_HAO\" TEXT NOT NULL ," + // 4: xuHao
+                "\"STATE\" INTEGER NOT NULL ," + // 5: state
+                "\"PUT_IN_DATE\" TEXT," + // 6: putInDate
+                "\"TAKE_CODE\" TEXT," + // 7: takeCode
+                "\"CREATE_TIME\" TEXT);"); // 8: createTime
     }
 
     /** Drops the underlying database table. */
@@ -70,27 +72,32 @@
             stmt.bindLong(1, id);
         }
  
+        String orderId = entity.getOrderId();
+        if (orderId != null) {
+            stmt.bindString(2, orderId);
+        }
+ 
         String orderNo = entity.getOrderNo();
         if (orderNo != null) {
-            stmt.bindString(2, orderNo);
+            stmt.bindString(3, orderNo);
         }
-        stmt.bindString(3, entity.getGridNo());
-        stmt.bindString(4, entity.getXuHao());
-        stmt.bindLong(5, entity.getState());
+        stmt.bindString(4, entity.getGridNo());
+        stmt.bindString(5, entity.getXuHao());
+        stmt.bindLong(6, entity.getState());
  
         String putInDate = entity.getPutInDate();
         if (putInDate != null) {
-            stmt.bindString(6, putInDate);
+            stmt.bindString(7, putInDate);
         }
  
         String takeCode = entity.getTakeCode();
         if (takeCode != null) {
-            stmt.bindString(7, takeCode);
+            stmt.bindString(8, takeCode);
         }
  
         String createTime = entity.getCreateTime();
         if (createTime != null) {
-            stmt.bindString(8, createTime);
+            stmt.bindString(9, createTime);
         }
     }
 
@@ -103,27 +110,32 @@
             stmt.bindLong(1, id);
         }
  
+        String orderId = entity.getOrderId();
+        if (orderId != null) {
+            stmt.bindString(2, orderId);
+        }
+ 
         String orderNo = entity.getOrderNo();
         if (orderNo != null) {
-            stmt.bindString(2, orderNo);
+            stmt.bindString(3, orderNo);
         }
-        stmt.bindString(3, entity.getGridNo());
-        stmt.bindString(4, entity.getXuHao());
-        stmt.bindLong(5, entity.getState());
+        stmt.bindString(4, entity.getGridNo());
+        stmt.bindString(5, entity.getXuHao());
+        stmt.bindLong(6, entity.getState());
  
         String putInDate = entity.getPutInDate();
         if (putInDate != null) {
-            stmt.bindString(6, putInDate);
+            stmt.bindString(7, putInDate);
         }
  
         String takeCode = entity.getTakeCode();
         if (takeCode != null) {
-            stmt.bindString(7, takeCode);
+            stmt.bindString(8, takeCode);
         }
  
         String createTime = entity.getCreateTime();
         if (createTime != null) {
-            stmt.bindString(8, createTime);
+            stmt.bindString(9, createTime);
         }
     }
 
@@ -136,13 +148,14 @@
     public Order readEntity(Cursor cursor, int offset) {
         Order entity = new Order( //
             cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id
-            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // orderNo
-            cursor.getString(offset + 2), // gridNo
-            cursor.getString(offset + 3), // xuHao
-            cursor.getInt(offset + 4), // state
-            cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // putInDate
-            cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // takeCode
-            cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7) // createTime
+            cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // orderId
+            cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // orderNo
+            cursor.getString(offset + 3), // gridNo
+            cursor.getString(offset + 4), // xuHao
+            cursor.getInt(offset + 5), // state
+            cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // putInDate
+            cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // takeCode
+            cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8) // createTime
         );
         return entity;
     }
@@ -150,13 +163,14 @@
     @Override
     public void readEntity(Cursor cursor, Order entity, int offset) {
         entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0));
-        entity.setOrderNo(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
-        entity.setGridNo(cursor.getString(offset + 2));
-        entity.setXuHao(cursor.getString(offset + 3));
-        entity.setState(cursor.getInt(offset + 4));
-        entity.setPutInDate(cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5));
-        entity.setTakeCode(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
-        entity.setCreateTime(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
+        entity.setOrderId(cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1));
+        entity.setOrderNo(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2));
+        entity.setGridNo(cursor.getString(offset + 3));
+        entity.setXuHao(cursor.getString(offset + 4));
+        entity.setState(cursor.getInt(offset + 5));
+        entity.setPutInDate(cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6));
+        entity.setTakeCode(cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7));
+        entity.setCreateTime(cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8));
      }
     
     @Override

--
Gitblit v1.7.1