xt / Flutter-ReserveApp · Commits

Go to a project

Commit 85b78bc09182ba285ee9fc0f144b851df1965088

Authored by wdn127929
1 parent 166dc67b
build: skipped

取消预订发送短信

Inline Side-by-side
Showing 7 changed files with 142 additions and 34 deletions
... ... @@ -445,14 +445,13 @@ class HttpUrl {
static const String get_seller_counts_list =
"?service=App.GuestManage.GetSellerCountsList"; // 获取全店全年订单统计数据
static const String get_seller_counts_list_by_month =
static const String get_seller_counts_list_by_month =
"?service=App.GuestManage.GetSellerCountsListByMonth"; // 获取全店全月订单统计数据
static const String get_seller_counts_list_by_day =
static const String get_seller_counts_list_by_day =
"?service=App.GuestManage.GetSellerCountsListByDay"; // 获取全店日订单统计数据
static const String wx_send_cancel_sms =
"?service=App.SendSMS.WxSendCancelSms"; // 取消订单发送短信
}
... ...
... ... @@ -14,12 +14,14 @@ import 'package:one_key/models/notebook_detail.dart';
import 'package:one_key/models/remark.dart';
import 'package:one_key/pages/detail/notebook_detail_change_page.dart';
import 'package:one_key/pages/detail/notebook_detail_change_page_f.dart';
import 'package:one_key/provider/marketing_center_provider.dart';
import 'package:one_key/provider/message_dialog_model.dart';
import 'package:one_key/provider/notebook_detail_model.dart';
import 'package:one_key/provider/online_check_edit_provider.dart';
import 'package:one_key/provider/remark_manager_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/route_handles.dart';
import 'package:one_key/utils/NumLengthInputFormatter.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/event_bus.dart';
... ... @@ -438,7 +440,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
///处理在线预订
setReserveStatus(String status, {String tid = "", String desc}) async {
setReserveStatus(String status,
{String tid = "", String desc, String phone}) async {
// bus.emit("remove_untreated_message",widget.mid);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> causeMap = {
... ... @@ -453,19 +456,41 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
// "mid": widget.mid,
"cause": json.encode(causeMap),
"uid": userModel.user.openid,
'note_name': userModel.user.account,
};
bool success =
await detailModel.setReserveStatus(context, params, ifPush: false);
if (success) {
bus.emit("refresh_book_list");
if (status == "4") {
if (status == "4" && phone != null && phone != '') {
//取消预订
bus.emit("refresh_tablemanager"); //刷新桌位
getDzSellerConf(widget.rid);
}
_getReserveDetail();
}
}
getDzSellerConf(String rid) async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
bool selectSms =
marketingCenterProvider.dzSellerConfModel.isOpenCancel == '1'
? true
: false;
if (selectSms) {
Map<String, String> pramas = {
'rid': rid,
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
};
detailModel.wxSendCancelSms(context, pramas);
}
}
}
/// 取消预订， 变更预订按钮
Widget _cancelAndChangeBtn(GestureTapCallback onTap, String title,
{Color bgColor = MyColours.color_ffffff,
... ... @@ -492,7 +517,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
///取消预订弹框
_showCancelWidget(context) {
_showCancelWidget(context, phone) {
_scrollController = ScrollController();
showGeneralDialog(
context: context,
... ... @@ -682,7 +707,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
Navigator.of(context).pop();
Loading.showLoading(context);
setReserveStatus('4', desc: desc);
setReserveStatus('4', desc: desc, phone: phone);
},
text: '确认',
height: ScreenUtil().setWidth(80),
... ... @@ -3268,7 +3293,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
context, '取消预订') ||
widget.uid ==
userModel.user.openid) {
_showCancelWidget(context);
_showCancelWidget(
context, detailEntity.phone);
}
}, '取消预订',
fontColor: !(Utils.getAuthority(
... ...
... ... @@ -46,6 +46,8 @@ import '../../app.dart';
import '../../models/get_seller_info_model.dart';
import '../../models/user.dart';
import '../../provider/feast_model.dart';
import '../../provider/marketing_center_provider.dart';
import '../../provider/notebook_detail_model.dart';
import '../../provider/remark_manager_model.dart';
import '../../provider/store_base_info_provider.dart';
import '../../utils/event_bus.dart';
... ... @@ -155,14 +157,18 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// child: SafeArea(child: EnterPage(detailEntity:NotebookDetail.def(context),rid: "-1",)),
// ))
..add(ChangeNotifierProvider<NoteBookModel>(
create: (_) => NoteBookModel(),
child: SafeArea(
child: NoteBookPage(
tabIndex: widget.mine ? 1 : 0,
date: widget.date,
solt: widget.solt,
)),
))
create: (_) => NoteBookModel(),
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
child: SafeArea(
child: NoteBookPage(
tabIndex: widget.mine ? 1 : 0,
date: widget.date,
solt: widget.solt,
)),
))))
..add(ChangeNotifierProvider<MyModel>(
create: (_) => MyModel(),
child: ChangeNotifierProvider<BaseIndoProvider>(
... ...
... ... @@ -18,6 +18,8 @@ import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../provider/marketing_center_provider.dart';
/**
* 详细模式
*/
... ... @@ -114,7 +116,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
}
///处理在线预订
setReserveStatus(String status, {String desc}) async {
setReserveStatus(String status, {String desc, String phone}) async {
// bus.emit("remove_untreated_message",widget.mid);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
... ... @@ -138,6 +140,11 @@ class NoteBookItemFState extends State<NoteBookItemF>
await detailModel.setReserveStatus(context, params, ifPush: false);
if (success) {
bus.emit("refresh_book_list");
if (status == "4" && phone != null && phone != '') {
getDzSellerConf(widget.notebook.id);
// //取消预订
// bus.emit("refresh_tablemanager"); //刷新桌位
}
// if (status == "4") {
// //取消预订
// bus.emit("refresh_tablemanager"); //刷新桌位
... ... @@ -146,8 +153,30 @@ class NoteBookItemFState extends State<NoteBookItemF>
}
}
getDzSellerConf(String rid) async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
bool selectSms =
marketingCenterProvider.dzSellerConfModel.isOpenCancel == '1'
? true
: false;
if (selectSms) {
Map<String, String> pramas = {
'rid': rid,
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
};
NotebookDetailModel detailModel =
Provider.of<NotebookDetailModel>(context, listen: false);
detailModel.wxSendCancelSms(context, pramas);
}
}
}
///取消预订弹框
_showCancelWidget(context) {
_showCancelWidget(context, phone) {
_scrollController = ScrollController();
_initCancel();
showGeneralDialog(
... ... @@ -386,7 +415,8 @@ class NoteBookItemFState extends State<NoteBookItemF>
Navigator.of(context).pop();
Loading.showLoading(context);
setReserveStatus('4', desc: desc);
setReserveStatus('4',
desc: desc, phone: phone);
},
text: '确认',
height: ScreenUtil().setWidth(80),
... ... @@ -857,7 +887,8 @@ class NoteBookItemFState extends State<NoteBookItemF>
userModel.user.openid))
InkWell(
onTap: () {
_showCancelWidget(context);
_showCancelWidget(
context, notebook.phone);
},
child: Text(
'取消预订',
... ...
... ... @@ -30,6 +30,8 @@ import 'package:one_key/widgets/round_button.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../provider/marketing_center_provider.dart';
/**
* 详细模式
*/
... ... @@ -126,7 +128,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
}
///处理在线预订
setReserveStatus(String status, {String desc}) async {
setReserveStatus(String status, {String desc, String phone}) async {
// bus.emit("remove_untreated_message",widget.mid);
UserModel userModel = Provider.of<UserModel>(context, listen: false);
... ... @@ -150,6 +152,10 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
await detailModel.setReserveStatus(context, params, ifPush: false);
if (success) {
bus.emit("refresh_book_list");
if (status == "4" && phone != null && phone != '') {
//取消预订
getDzSellerConf(widget.notebook.id);
}
// if (status == "4") {
// //取消预订
// bus.emit("refresh_tablemanager"); //刷新桌位
... ... @@ -158,8 +164,30 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
}
}
getDzSellerConf(String rid) async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
bool selectSms =
marketingCenterProvider.dzSellerConfModel.isOpenCancel == '1'
? true
: false;
if (selectSms) {
Map<String, String> pramas = {
'rid': rid,
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
};
NotebookDetailModel detailModel =
Provider.of<NotebookDetailModel>(context, listen: false);
detailModel.wxSendCancelSms(context, pramas);
}
}
}
///取消预订弹框
_showCancelWidget(context) {
_showCancelWidget(context, phone) {
_scrollController = ScrollController();
_initCancel();
showGeneralDialog(
... ... @@ -398,7 +426,8 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
Navigator.of(context).pop();
Loading.showLoading(context);
setReserveStatus('4', desc: desc);
setReserveStatus('4',
desc: desc, phone: phone);
},
text: '确认',
height: ScreenUtil().setWidth(80),
... ... @@ -819,7 +848,8 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
userModel.user.openid))
InkWell(
onTap: () {
_showCancelWidget(context);
_showCancelWidget(
context, notebook.phone);
},
child: Text(
'取消预订',
... ...
... ... @@ -149,11 +149,25 @@ class NotebookDetailModel extends ChangeNotifier {
}
}
//取消预订发送短信
wxSendCancelSms(BuildContext context, Map<String, String> params) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.wx_send_cancel_sms,
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
});
if (baseResp.code == Constant.status_success) {
Utils.showToast('取消预订短信已发送给客户');
} else {
Utils.showToast(baseResp.msg);
}
}
//安排在线预订
Future<bool> setReserveStatus(
BuildContext context, Map<String, String> params,
{ifPush = true, showLoading = false}) async {
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
.request<Map<String, dynamic>>(
context, Method.get, HttpUrl.set_reserve_status,
... ...
... ... @@ -292,12 +292,14 @@ var reserveDetailHandler = new Handler(
create: (_) => OnlineCheckEditProvider(),
child: ChangeNotifierProvider<NotebookDetailModel>(
create: (_) => NotebookDetailModel(),
child: NotebookDetailPage(
rid,
mid: mid,
uid: uid,
fromNotify: fromNotify,
))));
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: NotebookDetailPage(
rid,
mid: mid,
uid: uid,
fromNotify: fromNotify,
)))));
});
// 填写预订人信息
... ...