Commit c92d78e714c7ea6da034b64cf8b70ddd62ee4914

Authored by wdn127929
1 parent d53c7578

定金去向

... ... @@ -110,6 +110,7 @@ class NotebookDetail {
dynamic is_user_comments; //是否评价过
String up_date; //订单修改时间
String deposit_cancel; //订金走向
String get statuImgAssets {
switch (status) {
... ... @@ -305,7 +306,7 @@ class NotebookDetail {
@override
String toString() {
return 'NotebookDetail{id: $id, uid: $uid ,con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid,guest_uid:$guest_uid,reserve_type:$reserve_type,place_order_name:$place_order_name,is_user_comments:$is_user_comments,up_date:$up_date}';
return 'NotebookDetail{id: $id, uid: $uid ,con_amount:$con_amount,abolition: $abolition, tableinfo: $tableinfo,actual_pum:$actual_pum, pnum: $pnum, rname: $rname, sex: $sex, phone: $phone, cusdem: $cusdem, cusman: $cusman, ddate: $ddate, is_set_ddate: $is_set_ddate, ddate_solt: $ddate_solt, status: $status, action: $action, type: $type, note_name: $note_name, seller_user_phone:$seller_user_phone, nick_name: $nick_name,channel: $channel, cdate: $cdate, demands: $demands, tables: $tables, cancel: $cancel, gid: $gid,guest_uid:$guest_uid,reserve_type:$reserve_type,place_order_name:$place_order_name,is_user_comments:$is_user_comments,deposit_cancel:$deposit_cancel,up_date:$up_date}';
}
}
... ...
... ... @@ -50,13 +50,12 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
? null
: OrderInfo.fromJson(json['order_info'] as Map<String, dynamic>)
..gid = json['gid'] as String
..guest_uid=json['guest_uid'] as String
..guest_uid = json['guest_uid'] as String
..reserve_type = json['reserve_type'] as String
..place_order_name = json['place_order_name'] as String
..is_user_comments = json['is_user_comments'] as dynamic
..up_date = json['up_date'] as String;
..up_date = json['up_date'] as String
..deposit_cancel = json['deposit_cancel'] as String;
}
Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
... ... @@ -91,11 +90,12 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
'order': instance.order,
'order_info': instance.orderInfo,
'gid': instance.gid,
'guest_uid':instance.guest_uid,
'reserve_type':instance.reserve_type,
'guest_uid': instance.guest_uid,
'reserve_type': instance.reserve_type,
'place_order_name': instance.place_order_name,
'is_user_comments': instance.is_user_comments,
'up_date':instance.up_date,
'up_date': instance.up_date,
'deposit_cancel': instance.deposit_cancel,
};
OrderInfo _$OrderInfoFromJson(Map<String, dynamic> json) {
return OrderInfo(
... ...
... ... @@ -498,4 +498,7 @@ class HttpUrl {
static const String get_reserve_type_field =
"?service=App.Seller.GetReserveTypeField"; // 获取用餐类型
static const String set_reserve_deposit =
"?service=App.Reserve.SetReserveDeposit"; // 取消订单设置定金走向
}
... ...
... ... @@ -725,7 +725,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}).toList(),
)),
VEmptyView(34),
MyDivider(double.infinity, w(1), color: MyColours.color_E7E7E7)
// MyDivider(double.infinity, w(1), color: MyColours.color_E7E7E7)
],
);
}
... ... @@ -912,7 +912,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}).toList(),
)),
VEmptyView(34),
_depositWidget(),
if (detailModel.reserveDepositList.length >
0)
_depositWidget(),
MyDivider(double.infinity, w(1),
color: MyColours.color_E7E7E7)
],
... ... @@ -953,7 +955,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
gradientEnd: Colors.transparent,
textColor: MyColours.color_438E93,
fontSize: 34,
onPressed: () {
onPressed: () async {
String desc = '';
for (var value in cancelReasonList) {
if (value['select'] == true) {
... ... @@ -962,7 +964,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
desc =
_cancelController.text.trim();
if (desc.isEmpty) {
Utils.showToast("请填写原因");
Utils.showToast("请填写取消原因");
return;
}
}
... ... @@ -970,7 +972,27 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}
if (desc == '') {
Utils.showToast('请选择原因');
Utils.showToast('请选择取消原因');
return;
}
String desc2 = '';
for (var value in depositReasonList) {
if (value['select'] == true) {
desc2 = value['title'];
if (value['title'] == '其他原因') {
desc2 =
_depositController.text.trim();
if (desc2.isEmpty) {
Utils.showToast("请填写预订订金走向");
return;
}
}
}
}
if (desc2 == '') {
Utils.showToast('请选择预订订金走向');
return;
}
... ... @@ -979,6 +1001,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
setReserveStatus('4',
desc: desc, phone: phone);
Map<String, String> pramas = {
'rid': widget.rid,
'cancel': desc2
};
await detailModel.setReserveDeposit(
context, pramas);
}),
],
),
... ... @@ -1706,7 +1736,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
))
])));
}),
// VEmptyView(20),
if (detailEntity.deposit_cancel != null &&
detailEntity.deposit_cancel != '')
VEmptyView(10),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: Text(
'${detailEntity.deposit_cancel ?? ''}',
style: TextStyle(color: MyColours.color_515151, fontSize: font(14)),
))
// MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
]);
}
... ...
... ... @@ -86,6 +86,7 @@ class _MonthItemState extends State<MonthItem> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
runSpacing: w(6),
children: [
Text(
... ... @@ -115,7 +116,7 @@ class _MonthItemState extends State<MonthItem> {
),
HEmptyView(10),
Text(
'${widget.countsListSunModel.totalPnum??0}人',
'${widget.countsListSunModel.totalPnum ?? 0}人',
style: TextStyle(
color: MyColours.color_515151,
fontSize: font(12)),
... ... @@ -150,6 +151,7 @@ class _MonthItemState extends State<MonthItem> {
),
VEmptyView(12),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
// crossAxisAlignment: WrapCrossAlignment.start,
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
... ... @@ -182,6 +184,7 @@ class _MonthItemState extends State<MonthItem> {
),
VEmptyView(12),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
// crossAxisAlignment: WrapCrossAlignment.start,
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
... ... @@ -214,6 +217,7 @@ class _MonthItemState extends State<MonthItem> {
),
VEmptyView(12),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
// crossAxisAlignment: WrapCrossAlignment.start,
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
... ...
... ... @@ -290,6 +290,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
padding: EdgeInsets.only(
left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(
... ... @@ -468,6 +469,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
Utils.formatFromMill(
... ...
... ... @@ -908,6 +908,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children:
... ... @@ -977,6 +978,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children:
... ... @@ -1194,6 +1196,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
_textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
HEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem(
... ...
... ... @@ -134,6 +134,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
children: [
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'全年累计',
... ... @@ -176,6 +177,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'记录全额订单:',
... ... @@ -218,6 +220,7 @@ class _MyCustomerOrderPageState extends State<MyCustomerOrderPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'总消费:',
... ...
... ... @@ -439,6 +439,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: w(10),
runSpacing: w(5),
children: _templateUI(),
... ...
... ... @@ -352,6 +352,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
),
VEmptyView(30),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem([
... ... @@ -388,6 +389,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
),
VEmptyView(30),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem([
... ... @@ -424,6 +426,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
),
VEmptyView(30),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem([
... ... @@ -523,6 +526,7 @@ class _MyShowCustomerListPageState extends State<MyShowCustomerListPage>
),
VEmptyView(30),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem([
... ...
... ... @@ -305,6 +305,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
padding: EdgeInsets.only(
left: w(20), right: w(20 + 72), bottom: w(12), top: w(12)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Row(
... ... @@ -479,6 +480,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
Utils.formatFromMill(
... ...
... ... @@ -1009,6 +1009,7 @@ class _CustomerListPageState extends State<CustomerListPage>
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children:
... ... @@ -1066,6 +1067,7 @@ class _CustomerListPageState extends State<CustomerListPage>
child: Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children:
_buildFilterItem(customerProvider.filterHydList, false,
(FilterBtnModel item) {
... ... @@ -1138,6 +1140,7 @@ class _CustomerListPageState extends State<CustomerListPage>
child: Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children:
_buildFilterItem(customerProvider.filterLabelList, false,
(FilterBtnModel item) {
... ... @@ -1353,6 +1356,7 @@ class _CustomerListPageState extends State<CustomerListPage>
Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children:
_buildFilterItem(customerProvider.filterDayList, false,
(FilterBtnModel item) {
... ...
... ... @@ -134,6 +134,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
children: [
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'全年累计',
... ... @@ -176,6 +177,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'记录全额订单:',
... ... @@ -218,6 +220,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'总消费:',
... ... @@ -226,7 +229,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
color: MyColours.color_353535),
),
Text(
'${customerProvider.guestReserveSunModel.count.countMoney} ',
'${customerProvider.guestReserveSunModel.count.countMoney ?? 0} ',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535),
... ... @@ -245,7 +248,7 @@ class _CustomerOrderPageState extends State<CustomerOrderPage> {
color: MyColours.color_353535),
),
Text(
'${customerProvider.guestReserveSunModel.count.countPnum} ',
'${customerProvider.guestReserveSunModel.count.countPnum ?? 0} ',
style: TextStyle(
fontSize: ScreenUtil().setSp(24),
color: MyColours.color_353535),
... ...
... ... @@ -330,6 +330,7 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
child: Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(10),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildLabelItem(customerProvider.labelList))),
Padding(
padding: EdgeInsets.only(left: w(14), right: w(10)),
... ...
... ... @@ -220,6 +220,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
crossAxisAlignment: WrapCrossAlignment.center,
children: [
if (dsoltListModel.nickName != null &&
dsoltListModel.nickName != '')
... ... @@ -273,6 +274,7 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'${dsoltListModel.pnum ?? '0'}人',
... ...
... ... @@ -165,7 +165,8 @@ class _DayOrderPageState extends State<DayOrderPage>
),
VEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.start,
// crossAxisAlignment: WrapCrossAlignment.start,
crossAxisAlignment: WrapCrossAlignment.center,
runSpacing: w(5),
children: [
Text(
... ... @@ -245,7 +246,8 @@ class _DayOrderPageState extends State<DayOrderPage>
VEmptyView(20),
Wrap(
runSpacing: w(6),
crossAxisAlignment: WrapCrossAlignment.start,
// crossAxisAlignment: WrapCrossAlignment.start,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'有金额订单数 ${widget.daylist.totalPrice}',
... ...
... ... @@ -496,6 +496,7 @@ class _ExportBookDataPageState extends State<ExportBookDataPage> {
Wrap(
runSpacing: w(10),
spacing: w(10),
crossAxisAlignment: WrapCrossAlignment.center,
children: itemWidget(),
),
VEmptyView(30),
... ...
... ... @@ -421,6 +421,7 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
child: Wrap(
spacing: w(10),
runSpacing: w(5),
crossAxisAlignment: WrapCrossAlignment.center,
children: _templateUI(),
),
)
... ...
... ... @@ -325,6 +325,7 @@ class _MarketingRecordsDetailPageState
child: Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(10),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildLabelItem(
model.marketingByIdSunModel.sellerUser))),
]))),
... ...
... ... @@ -386,6 +386,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
// crossAxisAlignment: WrapCrossAlignment.start,
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center,
runSpacing: w(5),
children: [
Text(
... ...
... ... @@ -353,6 +353,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildFilterItem([
{'title': 'kkkk', 'select': false},
{'title': 'kkkk', 'select': true},
... ... @@ -389,6 +390,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildFilterItem([
{'title': 'kkkk', 'select': false},
{'title': 'kkkk', 'select': true},
... ... @@ -425,6 +427,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildFilterItem([
{'title': 'kkkk', 'select': false},
{'title': 'kkkk', 'select': true},
... ... @@ -524,6 +527,7 @@ class _ShowCustomerListPageState extends State<ShowCustomerListPage>
Wrap(
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
crossAxisAlignment: WrapCrossAlignment.center,
children: _buildFilterItem([
{'title': '7天', 'select': true},
{'title': '30天', 'select': true},
... ...
... ... @@ -529,6 +529,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
runSpacing: w(5),
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
'到店',
... ... @@ -621,6 +622,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
// crossAxisAlignment: WrapCrossAlignment.start,
// runAlignment: WrapAlignment.center,
// alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center,
runSpacing: w(5),
children: [
Text(
... ...
... ... @@ -367,6 +367,20 @@ class NotebookDetailModel extends ChangeNotifier {
return false;
}
// 取消订单设置定金走向
setReserveDeposit(BuildContext context, Map<String, String> params) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.set_reserve_deposit,
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
});
if (baseResp.code == Constant.status_success) {
} else {
Utils.showToast(baseResp.msg);
}
}
//设置消息状态
setMessageStatus(BuildContext context, Map<String, String> params) async {
BaseResp<dynamic> baseResp = await DioUtil()
... ...