feat:交易记录、日期组建

lib/common/models/database/database_enum_models.dart

@@ -54,7 +54,7 @@ enum OrderPayType implements BaseEnum {
 /// 订单状态
 enum OrderStatus implements BaseEnum {
   // 查询使用
-  total("-1", "未付款"),
+  total("-1", "全部"),
 
   nonePay("1", "未付款"),
   pay("5", "已付款"),

lib/common/models/database/database_models.dart

@@ -88,6 +88,18 @@ class SysSetting extends Equatable {
   /// 长链接重连
   DateTime? mqSyncTime;
 
+  /// 商品时间段类型
+  ProductHourType? hourType;
+
+  // 全局字体大小
+  SettingGlobalFontSize? globalFontSize;
+
+  // 使用支付方式
+  List<OrderPayDisplayType>? usePayDisplayType;
+
+  // 默认支付方式
+  OrderPayDisplayType? defaultPayDisplayType;
+
   SysSetting({
     required this.sysType,
     this.androidId,
@@ -133,6 +145,10 @@ class SysSetting extends Equatable {
         supermarketProductSyncTime?.millisecondsSinceEpoch,
         offlineOrderSyncTime?.millisecondsSinceEpoch,
         mqSyncTime?.millisecondsSinceEpoch,
+        hourType,
+        globalFontSize,
+        usePayDisplayType,
+        defaultPayDisplayType,
       ];
 }
 
@@ -164,12 +180,6 @@ class UserSetting extends Equatable {
 
   /// end 服务端信息 end
 
-  /// 商品时间段类型
-  ProductHourType? hourType;
-
-  // 全局字体大小
-  SettingGlobalFontSize? globalFontSize;
-
   UserSetting({
     this.username,
     this.password,
@@ -189,7 +199,6 @@ class UserSetting extends Equatable {
         accessToken,
         refreshToken,
         expiresTime,
-        hourType,
       ];
 }
 

lib/common/models/database/database_models.g.dart

@@ -49,7 +49,16 @@ SysSetting _$SysSettingFromJson(Map<String, dynamic> json) => SysSetting(
           : DateTime.parse(json['offlineOrderSyncTime'] as String)
       ..mqSyncTime = json['mqSyncTime'] == null
           ? null
-          : DateTime.parse(json['mqSyncTime'] as String);
+          : DateTime.parse(json['mqSyncTime'] as String)
+      ..hourType =
+          $enumDecodeNullable(_$ProductHourTypeEnumMap, json['hourType'])
+      ..globalFontSize = $enumDecodeNullable(
+          _$SettingGlobalFontSizeEnumMap, json['globalFontSize'])
+      ..usePayDisplayType = (json['usePayDisplayType'] as List<dynamic>?)
+          ?.map((e) => $enumDecode(_$OrderPayDisplayTypeEnumMap, e))
+          .toList()
+      ..defaultPayDisplayType = $enumDecodeNullable(
+          _$OrderPayDisplayTypeEnumMap, json['defaultPayDisplayType']);
 
 Map<String, dynamic> _$SysSettingToJson(SysSetting instance) =>
     <String, dynamic>{
@@ -84,6 +93,13 @@ Map<String, dynamic> _$SysSettingToJson(SysSetting instance) =>
           instance.supermarketProductSyncTime?.toIso8601String(),
       'offlineOrderSyncTime': instance.offlineOrderSyncTime?.toIso8601String(),
       'mqSyncTime': instance.mqSyncTime?.toIso8601String(),
+      'hourType': _$ProductHourTypeEnumMap[instance.hourType],
+      'globalFontSize': _$SettingGlobalFontSizeEnumMap[instance.globalFontSize],
+      'usePayDisplayType': instance.usePayDisplayType
+          ?.map((e) => _$OrderPayDisplayTypeEnumMap[e]!)
+          .toList(),
+      'defaultPayDisplayType':
+          _$OrderPayDisplayTypeEnumMap[instance.defaultPayDisplayType],
     };
 
 const _$SysTypeEnumMap = {
@@ -91,33 +107,6 @@ const _$SysTypeEnumMap = {
   SysType.canteen: 'canteen',
 };
 
-UserSetting _$UserSettingFromJson(Map<String, dynamic> json) => UserSetting(
-      username: json['username'] as String?,
-      password: json['password'] as String?,
-    )
-      ..sysType = $enumDecodeNullable(_$SysTypeEnumMap, json['sysType'])
-      ..userId = (json['userId'] as num?)?.toInt()
-      ..accessToken = json['accessToken'] as String?
-      ..refreshToken = json['refreshToken'] as String?
-      ..expiresTime = (json['expiresTime'] as num?)?.toInt()
-      ..hourType =
-          $enumDecodeNullable(_$ProductHourTypeEnumMap, json['hourType'])
-      ..globalFontSize = $enumDecodeNullable(
-          _$SettingGlobalFontSizeEnumMap, json['globalFontSize']);
-
-Map<String, dynamic> _$UserSettingToJson(UserSetting instance) =>
-    <String, dynamic>{
-      'username': instance.username,
-      'password': instance.password,
-      'sysType': _$SysTypeEnumMap[instance.sysType],
-      'userId': instance.userId,
-      'accessToken': instance.accessToken,
-      'refreshToken': instance.refreshToken,
-      'expiresTime': instance.expiresTime,
-      'hourType': _$ProductHourTypeEnumMap[instance.hourType],
-      'globalFontSize': _$SettingGlobalFontSizeEnumMap[instance.globalFontSize],
-    };
-
 const _$ProductHourTypeEnumMap = {
   ProductHourType.all: 'all',
   ProductHourType.morning: 'morning',
@@ -132,6 +121,34 @@ const _$SettingGlobalFontSizeEnumMap = {
   SettingGlobalFontSize.xl4: 'xl4',
 };
 
+const _$OrderPayDisplayTypeEnumMap = {
+  OrderPayDisplayType.qrCode: 'qrCode',
+  OrderPayDisplayType.walletCard: 'walletCard',
+  OrderPayDisplayType.face: 'face',
+  OrderPayDisplayType.cash: 'cash',
+};
+
+UserSetting _$UserSettingFromJson(Map<String, dynamic> json) => UserSetting(
+      username: json['username'] as String?,
+      password: json['password'] as String?,
+    )
+      ..sysType = $enumDecodeNullable(_$SysTypeEnumMap, json['sysType'])
+      ..userId = (json['userId'] as num?)?.toInt()
+      ..accessToken = json['accessToken'] as String?
+      ..refreshToken = json['refreshToken'] as String?
+      ..expiresTime = (json['expiresTime'] as num?)?.toInt();
+
+Map<String, dynamic> _$UserSettingToJson(UserSetting instance) =>
+    <String, dynamic>{
+      'username': instance.username,
+      'password': instance.password,
+      'sysType': _$SysTypeEnumMap[instance.sysType],
+      'userId': instance.userId,
+      'accessToken': instance.accessToken,
+      'refreshToken': instance.refreshToken,
+      'expiresTime': instance.expiresTime,
+    };
+
 CanteenExtraPriceSetting _$CanteenExtraPriceSettingFromJson(
         Map<String, dynamic> json) =>
     CanteenExtraPriceSetting(