feat: 添加商户规则支持和用户实体扩展
- 在 `UserEntity` 中添加 `canteenId` 字段以支持离线模式 - 新增 `ServiceMchRule` 模型和相关 API 方法用于获取商户规则 - 更新 `CanteenExtraPriceSetting` 模型以包含商户规则列表 - 在 `CanteenProductController` 中添加获取商户规则的逻辑 - 更新数据库表结构以支持 `canteenId` 字段
This commit is contained in:
1 parent
47ad782e9a
commit
cf9f8da767
10 files changed
+104
-4
No files matched your search
@@ -136,7 +136,7 @@ class _$AppDatabase extends AppDatabase {
|
||||
await database.execute(
|
||||
'CREATE TABLE IF NOT EXISTS `print_history` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `orderId` TEXT NOT NULL, `serviceOrderId` TEXT NOT NULL, `servicePrintId` TEXT NOT NULL, `invoiceUrl` TEXT NOT NULL, `status` TEXT NOT NULL, `printTime` TEXT, `syncTime` TEXT, `createTime` TEXT NOT NULL)');
|
||||
await database.execute(
|
||||
'CREATE TABLE IF NOT EXISTS `user_record` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `userId` TEXT NOT NULL, `nickname` TEXT NOT NULL, `mobile` TEXT, `avatar` TEXT, `walletCardNumber` TEXT, `walletId` TEXT, `walletTypeId` TEXT, `walletBalance` INTEGER, `createTime` TEXT, `updateTime` TEXT)');
|
||||
'CREATE TABLE IF NOT EXISTS `user_record` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `userId` TEXT NOT NULL, `nickname` TEXT NOT NULL, `mobile` TEXT, `avatar` TEXT, `walletCardNumber` TEXT, `walletId` TEXT, `walletTypeId` TEXT, `walletBalance` INTEGER, `canteenId` INTEGER, `createTime` TEXT, `updateTime` TEXT)');
|
||||
await database.execute(
|
||||
'CREATE TABLE IF NOT EXISTS `face` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `userId` TEXT NOT NULL, `sampleId` TEXT NOT NULL, `userName` TEXT NOT NULL, `deptId` TEXT, `deptName` TEXT, `imagePath` TEXT NOT NULL, `path` TEXT, `faceModel` TEXT, `createTime` TEXT, `updateTime` TEXT)');
|
||||
await database.execute(
|
||||
@@ -1381,6 +1381,7 @@ class _$UserDao extends UserDao {
|
||||
'walletId': item.walletId,
|
||||
'walletTypeId': item.walletTypeId,
|
||||
'walletBalance': item.walletBalance,
|
||||
'canteenId': item.canteenId,
|
||||
'createTime': _dateTimeEmptyConverter.encode(item.createTime),
|
||||
'updateTime': _dateTimeEmptyConverter.encode(item.updateTime)
|
||||
}),
|
||||
@@ -1398,6 +1399,7 @@ class _$UserDao extends UserDao {
|
||||
'walletId': item.walletId,
|
||||
'walletTypeId': item.walletTypeId,
|
||||
'walletBalance': item.walletBalance,
|
||||
'canteenId': item.canteenId,
|
||||
'createTime': _dateTimeEmptyConverter.encode(item.createTime),
|
||||
'updateTime': _dateTimeEmptyConverter.encode(item.updateTime)
|
||||
}),
|
||||
@@ -1415,6 +1417,7 @@ class _$UserDao extends UserDao {
|
||||
'walletId': item.walletId,
|
||||
'walletTypeId': item.walletTypeId,
|
||||
'walletBalance': item.walletBalance,
|
||||
'canteenId': item.canteenId,
|
||||
'createTime': _dateTimeEmptyConverter.encode(item.createTime),
|
||||
'updateTime': _dateTimeEmptyConverter.encode(item.updateTime)
|
||||
});
|
||||
@@ -1445,6 +1448,7 @@ class _$UserDao extends UserDao {
|
||||
walletId: row['walletId'] as String?,
|
||||
walletTypeId: row['walletTypeId'] as String?,
|
||||
walletBalance: row['walletBalance'] as int?,
|
||||
canteenId: row['canteenId'] as int?,
|
||||
createTime:
|
||||
_dateTimeEmptyConverter.decode(row['createTime'] as String),
|
||||
updateTime:
|
||||
@@ -1466,6 +1470,7 @@ class _$UserDao extends UserDao {
|
||||
walletId: row['walletId'] as String?,
|
||||
walletTypeId: row['walletTypeId'] as String?,
|
||||
walletBalance: row['walletBalance'] as int?,
|
||||
canteenId: row['canteenId'] as int?,
|
||||
createTime:
|
||||
_dateTimeEmptyConverter.decode(row['createTime'] as String),
|
||||
updateTime:
|
||||
|
||||
@@ -35,6 +35,9 @@ class UserEntity extends Equatable {
|
||||
/// 钱包余额
|
||||
int? walletBalance;
|
||||
|
||||
/// 用户所属的商户id(主要用于机器的离线模式)
|
||||
int? canteenId;
|
||||
|
||||
/// 创建时间
|
||||
DateTime? createTime;
|
||||
|
||||
@@ -51,6 +54,7 @@ class UserEntity extends Equatable {
|
||||
this.walletId,
|
||||
this.walletTypeId,
|
||||
this.walletBalance,
|
||||
this.canteenId,
|
||||
this.createTime,
|
||||
this.updateTime,
|
||||
});
|
||||
|
||||
@@ -16,6 +16,7 @@ UserEntity _$UserEntityFromJson(Map<String, dynamic> json) => UserEntity(
|
||||
walletId: json['walletId'] as String?,
|
||||
walletTypeId: json['walletTypeId'] as String?,
|
||||
walletBalance: (json['walletBalance'] as num?)?.toInt(),
|
||||
canteenId: (json['canteenId'] as num?)?.toInt(),
|
||||
createTime: json['createTime'] == null
|
||||
? null
|
||||
: DateTime.parse(json['createTime'] as String),
|
||||
@@ -35,6 +36,7 @@ Map<String, dynamic> _$UserEntityToJson(UserEntity instance) =>
|
||||
'walletId': instance.walletId,
|
||||
'walletTypeId': instance.walletTypeId,
|
||||
'walletBalance': instance.walletBalance,
|
||||
'canteenId': instance.canteenId,
|
||||
'createTime': instance.createTime?.toIso8601String(),
|
||||
'updateTime': instance.updateTime?.toIso8601String(),
|
||||
};
|
||||
Reference in new issue
Block a user