feat:广播

lib/common/services/database/dao/broadcast_dao.dart

@@ -56,10 +56,10 @@ abstract class BroadcastDao {
   @Query("""
   DELETE FROM broadcast
   WHERE
-  isDone = 1
-  AND (:serviceCode = '-1' OR serviceCode = :serviceCode) 
+  isDone = 0
+  AND (:serviceOrderCode = '-1' OR serviceOrderCode = :serviceOrderCode) 
   """)
-  Future<void> del(String serviceCode);
+  Future<void> del(String serviceOrderCode);
 
   @update
   Future<void> edit(BroadcastEntity entity);

lib/common/services/database/database.g.dart

@@ -118,7 +118,7 @@ class _$AppDatabase extends AppDatabase {
       },
       onCreate: (database, version) async {
         await database.execute(
-            'CREATE TABLE IF NOT EXISTS `broadcast` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `content` TEXT NOT NULL, `broadcastCount` INTEGER NOT NULL, `broadcastMaxCount` INTEGER NOT NULL, `isBroadcast` INTEGER NOT NULL, `isDone` INTEGER NOT NULL, `isDoneTime` TEXT, `serviceCode` TEXT NOT NULL, `userId` TEXT NOT NULL, `username` TEXT NOT NULL, `userMobile` TEXT NOT NULL, `productDesc` TEXT NOT NULL, `payPrice` INTEGER NOT NULL, `hourType` INTEGER, `enable` INTEGER NOT NULL, `createTime` TEXT NOT NULL)');
+            'CREATE TABLE IF NOT EXISTS `broadcast` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `content` TEXT NOT NULL, `broadcastCount` INTEGER NOT NULL, `broadcastMaxCount` INTEGER NOT NULL, `isBroadcast` INTEGER NOT NULL, `isDone` INTEGER NOT NULL, `isDoneTime` TEXT, `serviceCode` TEXT NOT NULL, `serviceOrderCode` TEXT NOT NULL, `userId` TEXT NOT NULL, `username` TEXT NOT NULL, `userMobile` TEXT NOT NULL, `productDesc` TEXT NOT NULL, `payPrice` INTEGER NOT NULL, `hourType` INTEGER, `enable` INTEGER NOT NULL, `createTime` TEXT NOT NULL)');
         await database.execute(
             'CREATE TABLE IF NOT EXISTS `order_record` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `uniqueCode` TEXT NOT NULL, `serviceUniqueCode` TEXT NOT NULL, `sysType` TEXT NOT NULL, `userCode` TEXT NOT NULL, `username` TEXT, `hourType` TEXT, `price` INTEGER NOT NULL, `extraPrice` INTEGER NOT NULL, `payPrice` INTEGER NOT NULL, `walletId` TEXT, `orderSourceTypeId` TEXT, `type` TEXT NOT NULL, `status` TEXT NOT NULL, `payType` TEXT NOT NULL, `productDesc` TEXT, `count` INTEGER NOT NULL, `weight` REAL NOT NULL, `payTime` TEXT, `createTime` TEXT NOT NULL)');
         await database.execute(
@@ -232,6 +232,7 @@ class _$BroadcastDao extends BroadcastDao {
                   'isDone': _boolConverter.encode(item.isDone),
                   'isDoneTime': _dateTimeEmptyConverter.encode(item.isDoneTime),
                   'serviceCode': item.serviceCode,
+                  'serviceOrderCode': item.serviceOrderCode,
                   'userId': item.userId,
                   'username': item.username,
                   'userMobile': item.userMobile,
@@ -254,6 +255,7 @@ class _$BroadcastDao extends BroadcastDao {
                   'isDone': _boolConverter.encode(item.isDone),
                   'isDoneTime': _dateTimeEmptyConverter.encode(item.isDoneTime),
                   'serviceCode': item.serviceCode,
+                  'serviceOrderCode': item.serviceOrderCode,
                   'userId': item.userId,
                   'username': item.username,
                   'userMobile': item.userMobile,
@@ -277,7 +279,7 @@ class _$BroadcastDao extends BroadcastDao {
   @override
   Future<void> del(String serviceCode) async {
     await _queryAdapter.queryNoReturn(
-        'DELETE FROM broadcast   WHERE   isDone = 1   AND (?1 = \'-1\' OR serviceCode = ?1)',
+        'DELETE FROM broadcast   WHERE   isDone = 0   AND (?1 = \'-1\' OR serviceCode = ?1)',
         arguments: [serviceCode]);
   }
 
@@ -285,7 +287,7 @@ class _$BroadcastDao extends BroadcastDao {
   Future<List<BroadcastEntity>> getAll(String hourType) async {
     return _queryAdapter.queryList(
         'SELECT * FROM broadcast   WHERE    isDone = 0   AND enable = 1   AND broadcastCount < broadcastMaxCount   AND (?1 = \'-1\' OR hourType = ?1)   AND strftime(\'%Y-%m-%d\', createTime) = strftime(\'%Y-%m-%d\', \'now\', \'localtime\')',
-        mapper: (Map<String, Object?> row) => BroadcastEntity(id: row['id'] as int?, content: row['content'] as String, broadcastCount: row['broadcastCount'] as int, broadcastMaxCount: row['broadcastMaxCount'] as int, isBroadcast: _boolConverter.decode(row['isBroadcast'] as int), isDone: _boolConverter.decode(row['isDone'] as int), createTime: _dateTimeConverter.decode(row['createTime'] as String), serviceCode: row['serviceCode'] as String, userId: row['userId'] as String, username: row['username'] as String, userMobile: row['userMobile'] as String, productDesc: row['productDesc'] as String, payPrice: row['payPrice'] as int, hourType: row['hourType'] == null ? null : ProductHourType.values[row['hourType'] as int], enable: _boolConverter.decode(row['enable'] as int)),
+        mapper: (Map<String, Object?> row) => BroadcastEntity(id: row['id'] as int?, content: row['content'] as String, broadcastCount: row['broadcastCount'] as int, broadcastMaxCount: row['broadcastMaxCount'] as int, isBroadcast: _boolConverter.decode(row['isBroadcast'] as int), isDone: _boolConverter.decode(row['isDone'] as int), createTime: _dateTimeConverter.decode(row['createTime'] as String), serviceCode: row['serviceCode'] as String, serviceOrderCode: row['serviceOrderCode'] as String, userId: row['userId'] as String, username: row['username'] as String, userMobile: row['userMobile'] as String, productDesc: row['productDesc'] as String, payPrice: row['payPrice'] as int, hourType: row['hourType'] == null ? null : ProductHourType.values[row['hourType'] as int], enable: _boolConverter.decode(row['enable'] as int)),
         arguments: [hourType]);
   }
 
@@ -297,7 +299,7 @@ class _$BroadcastDao extends BroadcastDao {
   ) async {
     return _queryAdapter.queryList(
         'SELECT * FROM broadcast   WHERE   strftime(\'%Y-%m-%d\', createTime) = strftime(\'%Y-%m-%d\', \'now\', \'localtime\')   AND (?1 = \'-1\' OR hourType = ?1)   LIMIT ?2 OFFSET ?3',
-        mapper: (Map<String, Object?> row) => BroadcastEntity(id: row['id'] as int?, content: row['content'] as String, broadcastCount: row['broadcastCount'] as int, broadcastMaxCount: row['broadcastMaxCount'] as int, isBroadcast: _boolConverter.decode(row['isBroadcast'] as int), isDone: _boolConverter.decode(row['isDone'] as int), createTime: _dateTimeConverter.decode(row['createTime'] as String), serviceCode: row['serviceCode'] as String, userId: row['userId'] as String, username: row['username'] as String, userMobile: row['userMobile'] as String, productDesc: row['productDesc'] as String, payPrice: row['payPrice'] as int, hourType: row['hourType'] == null ? null : ProductHourType.values[row['hourType'] as int], enable: _boolConverter.decode(row['enable'] as int)),
+        mapper: (Map<String, Object?> row) => BroadcastEntity(id: row['id'] as int?, content: row['content'] as String, broadcastCount: row['broadcastCount'] as int, broadcastMaxCount: row['broadcastMaxCount'] as int, isBroadcast: _boolConverter.decode(row['isBroadcast'] as int), isDone: _boolConverter.decode(row['isDone'] as int), createTime: _dateTimeConverter.decode(row['createTime'] as String), serviceCode: row['serviceCode'] as String, serviceOrderCode: row['serviceOrderCode'] as String, userId: row['userId'] as String, username: row['username'] as String, userMobile: row['userMobile'] as String, productDesc: row['productDesc'] as String, payPrice: row['payPrice'] as int, hourType: row['hourType'] == null ? null : ProductHourType.values[row['hourType'] as int], enable: _boolConverter.decode(row['enable'] as int)),
         arguments: [hourType, pageSize, offset]);
   }
 

lib/common/services/database/entity/broadcast_entity.dart

@@ -32,6 +32,9 @@ class BroadcastEntity {
   /// 服务单号
   String serviceCode;
 
+  /// 服务订单号
+  String serviceOrderCode;
+
   /// 用户id
   String userId;
 
@@ -65,6 +68,7 @@ class BroadcastEntity {
     required this.isDone,
     required this.createTime,
     required this.serviceCode,
+    required this.serviceOrderCode,
     required this.userId,
     required this.username,
     required this.userMobile,

lib/common/services/database/entity/broadcast_entity.g.dart

@@ -16,6 +16,7 @@ BroadcastEntity _$BroadcastEntityFromJson(Map<String, dynamic> json) =>
       isDone: json['isDone'] as bool,
       createTime: DateTime.parse(json['createTime'] as String),
       serviceCode: json['serviceCode'] as String,
+      serviceOrderCode: json['serviceOrderCode'] as String,
       userId: json['userId'] as String,
       username: json['username'] as String,
       userMobile: json['userMobile'] as String,
@@ -37,6 +38,7 @@ Map<String, dynamic> _$BroadcastEntityToJson(BroadcastEntity instance) =>
       'isDone': instance.isDone,
       'isDoneTime': instance.isDoneTime?.toIso8601String(),
       'serviceCode': instance.serviceCode,
+      'serviceOrderCode': instance.serviceOrderCode,
       'userId': instance.userId,
       'username': instance.username,
       'userMobile': instance.userMobile,