zianxin/pj_supermarket_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:预约页面

Browse Source
This commit is contained in:
dzc committed 2025-04-23 12:31:25 +08:00
1 parent 17914f5d10
commit 2d53ed5622
8 files changed
+279 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/common/services/database/dao/broadcast_dao.dart
+23
View File
@@ -20,4 +20,27 @@ abstract class BroadcastDao {
AND strftime('%Y-%m-%d', createTime) = strftime('%Y-%m-%d', 'now', 'localtime')
""")
Future<List<BroadcastEntity>> getAll();
@Query("""
SELECT * FROM broadcast
WHERE
strftime('%Y-%m-%d', createTime) = strftime('%Y-%m-%d', 'now', 'localtime')
AND (:hourType = '-1' OR hourType = :hourType)
LIMIT :pageSize OFFSET :offset
""")
Future<List<BroadcastEntity>> findAllPage(
String hourType,
int pageSize,
int offset,
);
@Query("""
SELECT COUNT(0) FROM broadcast
WHERE
strftime('%Y-%m-%d', createTime) = strftime('%Y-%m-%d', 'now', 'localtime')
AND (:hourType = '-1' OR hourType = :hourType)
""")
Future<int?> count(
String hourType,
);
}
lib/common/services/database/database.g.dart
+22 -1
View File
@@ -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, `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, `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(
@@ -237,6 +237,7 @@ class _$BroadcastDao extends BroadcastDao {
'userMobile': item.userMobile,
'productDesc': item.productDesc,
'payPrice': item.payPrice,
'hourType': item.hourType?.index,
'enable': _boolConverter.encode(item.enable),
'createTime': _dateTimeConverter.encode(item.createTime)
});
@@ -267,6 +268,26 @@ class _$BroadcastDao extends BroadcastDao {
payPrice: row['payPrice'] as int));
}
@override
Future<List<BroadcastEntity>> findAllPage(
String hourType,
int pageSize,
int offset,
) 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, broadcastMaxCount: row['broadcastMaxCount'] as int, isBroadcast: _boolConverter.decode(row['isBroadcast'] 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),
arguments: [hourType, pageSize, offset]);
}
@override
Future<int?> count(String hourType) async {
return _queryAdapter.query(
'SELECT COUNT(0) FROM broadcast WHERE strftime(\'%Y-%m-%d\', createTime) = strftime(\'%Y-%m-%d\', \'now\', \'localtime\') AND (?1 = \'-1\' OR hourType = ?1)',
mapper: (Map<String, Object?> row) => row.values.first as int,
arguments: [hourType]);
}
@override
Future<void> save(BroadcastEntity entity) async {
await _broadcastEntityInsertionAdapter.insert(
lib/common/services/database/entity/broadcast_entity.dart
+4
View File
@@ -1,5 +1,6 @@
import 'package:floor/floor.dart';
import 'package:json_annotation/json_annotation.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
part 'broadcast_entity.g.dart';
@@ -46,6 +47,9 @@ class BroadcastEntity {
/// 支付价格
int payPrice;
/// 菜品时间类型
ProductHourType? hourType;
/// 手动开关
bool enable = true;
lib/common/services/database/entity/broadcast_entity.g.dart
+10
View File
@@ -25,6 +25,8 @@ BroadcastEntity _$BroadcastEntityFromJson(Map<String, dynamic> json) =>
..isDoneTime = json['isDoneTime'] == null
? null
: DateTime.parse(json['isDoneTime'] as String)
..hourType =
$enumDecodeNullable(_$ProductHourTypeEnumMap, json['hourType'])
..enable = json['enable'] as bool;
Map<String, dynamic> _$BroadcastEntityToJson(BroadcastEntity instance) =>
@@ -42,6 +44,14 @@ Map<String, dynamic> _$BroadcastEntityToJson(BroadcastEntity instance) =>
'userMobile': instance.userMobile,
'productDesc': instance.productDesc,
'payPrice': instance.payPrice,
'hourType': _$ProductHourTypeEnumMap[instance.hourType],
'enable': instance.enable,
'createTime': instance.createTime.toIso8601String(),
};
const _$ProductHourTypeEnumMap = {
ProductHourType.TOTAL: 'TOTAL',
ProductHourType.MORNING: 'MORNING',
ProductHourType.NOON: 'NOON',
ProductHourType.NIGHT: 'NIGHT',
};
lib/pages/canteen_product/controller.dart
+7 -1
View File
@@ -68,7 +68,13 @@ class CanteenProductController extends GetxController with OrderMixin {
sysType = SysType.CANTEEN;
_listenPayTypeSelectCallback();
// 更新分类和商品
await SyncProductTool.updateDatabase();
try {
await SyncProductTool.updateDatabase();
} catch (e) {
Toast.error(msg: "初始化资源失败,请检查网络情况");
EasyLoading.dismiss();
Get.offAndToNamed(RouteNames.panel);
}
// 获取分类和商品
await getClassify();
await getProduct();
lib/pages/canteen_reserve/controller.dart
+65 -2
View File
@@ -1,17 +1,50 @@
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:forui/forui.dart';
import 'package:get/get.dart';
import 'package:pj_supermarket_cloud/common/index.dart';
class CanteenReserveController extends GetxController {
CanteenReserveController();
final appC = Get.find<AppControl>();
RxList<BroadcastEntity> reserveList = <BroadcastEntity>[].obs;
Rx<ProductHourType> hourType = Rx(ProductHourType.MORNING);
var hourTypeC = FRadioSelectGroupController(
value: ProductHourType.MORNING.code,
);
// table
RxInt currentPage = 1.obs;
RxInt totalPage = 0.obs;
RxInt pageSize = 10.obs;
_initData() {
update(["canteen_reserve"]);
}
void onTap() {}
@override
void onInit() {
super.onInit();
hourTypeC.addValueListener((v) async {
final currentHourType = ProductHourType.values.fromCode(
v.first,
);
if (currentHourType == null) return;
EasyLoading.show(
status: '切换中...',
maskType: EasyLoadingMaskType.black,
);
hourType.value = currentHourType;
currentPage.value = 1;
await _getReservePage();
EasyLoading.dismiss();
});
}
@override
@@ -24,4 +57,34 @@ class CanteenReserveController extends GetxController {
void onClose() {
super.onClose();
}
Future<void> doPage({int? page}) async {
if (page != null) {
currentPage.value = page;
}
await _getReservePage();
}
/// 获取预约列表
Future<void> _getReservePage() async {
final appSetting = await AppSettingTool.getSysSetting();
final sysType = appSetting.sysType.name;
final broadcastDao = appC.dataBase.getBroadcastDao;
/// 处理查询参数
String hourTypeCode = hourType.value.code;
if (sysType == SysType.SUPERMARKET.name) {
hourTypeCode = "-1";
}
final list = await broadcastDao.findAllPage(
hourTypeCode,
pageSize.value,
(currentPage.value - 1) * pageSize.value,
);
final total = await broadcastDao.count(hourTypeCode);
totalPage.value = total ?? 0;
reserveList.value = list;
}
}
lib/pages/canteen_reserve/view.dart
+146 -3
View File
@@ -1,3 +1,5 @@
import 'package:common_utils/common_utils.dart';
import 'package:data_table_2/data_table_2.dart';
import 'package:ducafe_ui_core/ducafe_ui_core.dart';
import 'package:flutter/material.dart';
import 'package:forui/forui.dart';
@@ -12,8 +14,149 @@ class CanteenReservePage extends GetView<CanteenReserveController> {
// 主视图
Widget _buildView(BuildContext context) {
return const Center(
child: Text("CanteenReservePage"),
final height = context.height;
final headerHeight = height * 0.08;
return <Widget>[
_buildCondition(context, headerHeight),
SizedBox(height: 20.h),
_buildTable(context).center().expanded(),
Obx(
() => appPage(
context,
pageNo: controller.currentPage.value,
pageSize: controller.pageSize.value,
total: controller.totalPage.value,
onPageChanged: (page) => controller.doPage(page: page),
),
)
].toColumn();
}
/// 搜索条件
Widget _buildCondition(BuildContext context, double headerHeight) {
final theme = FTheme.of(context);
return <Widget>[
const Spacer(),
appRadioHourTypeDialog(context, controller.hourTypeC)
.width(300.w)
.marginOnly(right: 15.w),
].toRowSpace(space: 15.w, mainAxisAlignment: MainAxisAlignment.center);
}
/// 表格
Widget _buildTable(BuildContext context) {
final theme = FTheme.of(context);
return LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
final height = constraints.maxHeight;
final hdHeight = (height - 50.h) / 10.5;
return Obx(
() => DataTable2(
columnSpacing: 12.w,
horizontalMargin: 12.w,
minWidth: 600.w,
showBottomBorder: true,
headingTextStyle: theme.typography.lg,
dataTextStyle: theme.typography.base,
dataRowHeight: hdHeight,
columns: [
DataColumn2(
label: Text("用户", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("商品", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("价格", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("当前广播次数", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("最大广播次数", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("是否开启广播", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("下单时间", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
DataColumn2(
label: Text("操作", textAlign: TextAlign.center),
headingRowAlignment: MainAxisAlignment.center,
fixedWidth: 230.w,
),
],
rows: controller.reserveList
.map(
(v) => DataRow(
cells: [
DataCell(
Text(
"${v.username}-${v.userMobile}",
textAlign: TextAlign.center,
).center(),
),
DataCell(
Text(
v.productDesc,
textAlign: TextAlign.center,
).center(),
),
DataCell(
appPrice(context, v.payPrice).center(),
),
DataCell(
Text(
"${v.broadcastCount}",
textAlign: TextAlign.center,
).center(),
),
DataCell(
Text(
"${v.broadcastMaxCount}",
textAlign: TextAlign.center,
).center(),
),
DataCell(
Text(
v.enable ? "是" : "否",
textAlign: TextAlign.center,
).center(),
),
DataCell(
Text(
DateUtil.formatDate(v.createTime),
textAlign: TextAlign.center,
).center(),
),
DataCell(
Text(
DateUtil.formatDate(v.createTime),
textAlign: TextAlign.center,
).center(),
),
],
),
)
.toList(),
),
);
},
);
}
@@ -25,7 +168,7 @@ class CanteenReservePage extends GetView<CanteenReserveController> {
builder: (_) {
return FScaffold(
header: appDefaultNav(context, title: "预定"),
content: _buildView(context).marginOnly(top: 20.h),
content: _buildView(context),
resizeToAvoidBottomInset: false,
);
},
lib/pages/setting/widgets/setting_baseInfo.dart
+2 -2
View File
@@ -21,9 +21,9 @@ Future<void> _bindServiceDialog(BuildContext context, SysSetting sys) async {
// 正式环境-测试
// uniqueCodeC.text = "1896157295523049473";
// 测试环境-测试设备
// uniqueCodeC.text = "1877592554489143298";
uniqueCodeC.text = "1877592554489143298";
// 测试环境-食堂-浦阳
uniqueCodeC.text = "1914567628657778690";
// uniqueCodeC.text = "1914567628657778690";
}
await showAdaptiveDialog(
context: context,