Commit 9e428c25de8e99c650d21660bca910e142a6ec81

Authored by wdn127929
1 parent b0cda2c4

删除桌位的时候402code提示“当前桌位有未到店预订,不能被删除

@@ -59,7 +59,7 @@ android { @@ -59,7 +59,7 @@ android {
59 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). 59 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
60 applicationId "com.naji.one_key" 60 applicationId "com.naji.one_key"
61 minSdkVersion 21 61 minSdkVersion 21
62 - targetSdkVersion 28 62 + targetSdkVersion 30
63 versionCode flutterVersionCode.toInteger() 63 versionCode flutterVersionCode.toInteger()
64 versionName flutterVersionName 64 versionName flutterVersionName
65 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" 65 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -512,7 +512,7 @@ @@ -512,7 +512,7 @@
512 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 512 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
513 CODE_SIGN_IDENTITY = "Apple Development"; 513 CODE_SIGN_IDENTITY = "Apple Development";
514 CODE_SIGN_STYLE = Automatic; 514 CODE_SIGN_STYLE = Automatic;
515 - CURRENT_PROJECT_VERSION = 5144; 515 + CURRENT_PROJECT_VERSION = 5146;
516 DEVELOPMENT_TEAM = 8J59HM8B82; 516 DEVELOPMENT_TEAM = 8J59HM8B82;
517 ENABLE_BITCODE = NO; 517 ENABLE_BITCODE = NO;
518 FLUTTER_BUILD_MODE = release; 518 FLUTTER_BUILD_MODE = release;
@@ -658,7 +658,7 @@ @@ -658,7 +658,7 @@
658 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 658 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
659 CODE_SIGN_IDENTITY = "Apple Development"; 659 CODE_SIGN_IDENTITY = "Apple Development";
660 CODE_SIGN_STYLE = Automatic; 660 CODE_SIGN_STYLE = Automatic;
661 - CURRENT_PROJECT_VERSION = 5144; 661 + CURRENT_PROJECT_VERSION = 5146;
662 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
663 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
664 FLUTTER_BUILD_MODE = release; 664 FLUTTER_BUILD_MODE = release;
@@ -694,7 +694,7 @@ @@ -694,7 +694,7 @@
694 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 694 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
695 CODE_SIGN_IDENTITY = "Apple Development"; 695 CODE_SIGN_IDENTITY = "Apple Development";
696 CODE_SIGN_STYLE = Automatic; 696 CODE_SIGN_STYLE = Automatic;
697 - CURRENT_PROJECT_VERSION = 5144; 697 + CURRENT_PROJECT_VERSION = 5146;
698 DEVELOPMENT_TEAM = 8J59HM8B82; 698 DEVELOPMENT_TEAM = 8J59HM8B82;
699 ENABLE_BITCODE = NO; 699 ENABLE_BITCODE = NO;
700 FLUTTER_BUILD_MODE = release; 700 FLUTTER_BUILD_MODE = release;
@@ -158,10 +158,10 @@ class _BookDepositPageState extends State<BookDepositPage> { @@ -158,10 +158,10 @@ class _BookDepositPageState extends State<BookDepositPage> {
158 Utils.showToast('请选择支付方式'); 158 Utils.showToast('请选择支付方式');
159 return; 159 return;
160 } 160 }
161 - if (receiptNumberC.text.trim().length == 0) {  
162 - Utils.showToast('请输入收据编号');  
163 - return;  
164 - } 161 + // if (receiptNumberC.text.trim().length == 0) {
  162 + // Utils.showToast('请输入收据编号');
  163 + // return;
  164 + // }
165 Map<String, String> pramas = { 165 Map<String, String> pramas = {
166 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid, 166 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
167 'rid': widget.rid, 167 'rid': widget.rid,
@@ -177,8 +177,9 @@ class _BookDepositPageState extends State<BookDepositPage> { @@ -177,8 +177,9 @@ class _BookDepositPageState extends State<BookDepositPage> {
177 .toString(), 177 .toString(),
178 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex], 178 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex],
179 179
180 - 'pay_no': receiptNumberC.text,  
181 - 'insert_uid':Provider.of<UserModel>(context,listen: false).user.openid 180 + 'pay_no':
  181 + receiptNumberC.text.trim().length == 0 ? null : receiptNumberC.text,
  182 + 'insert_uid': Provider.of<UserModel>(context, listen: false).user.openid
182 }; 183 };
183 print(feastModel.sellerManageList[collectionPIndex].title); 184 print(feastModel.sellerManageList[collectionPIndex].title);
184 bool success = await detailModel.createReserveDeposit(context, pramas); 185 bool success = await detailModel.createReserveDeposit(context, pramas);
@@ -56,6 +56,7 @@ import '../../provider/store_base_info_provider.dart'; @@ -56,6 +56,7 @@ import '../../provider/store_base_info_provider.dart';
56 import '../../utils/event_bus.dart'; 56 import '../../utils/event_bus.dart';
57 import '../../utils/screen_util.dart'; 57 import '../../utils/screen_util.dart';
58 import '../feast/feast_page.dart'; 58 import '../feast/feast_page.dart';
  59 +// import 'package:sipflutterplugin/sipflutterplugin.dart';
59 60
60 class HomePage extends StatefulWidget { 61 class HomePage extends StatefulWidget {
61 final int initialIndex; //初始tab 62 final int initialIndex; //初始tab
@@ -154,7 +154,7 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -154,7 +154,7 @@ class MyTableManageHomeModel with ChangeNotifier {
154 pageState = PageState.Success; 154 pageState = PageState.Success;
155 } 155 }
156 156
157 - App.sp.setString('table_list', json.encode(tableOuterList)); 157 + App.sp.setString('table_list', json.encode(tableOuterList));
158 158
159 return tableOuterList; 159 return tableOuterList;
160 } 160 }
@@ -575,7 +575,12 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -575,7 +575,12 @@ class MyTableManageHomeModel with ChangeNotifier {
575 Utils.showToast(baseResp.msg ?? '删除桌位失败!'); 575 Utils.showToast(baseResp.msg ?? '删除桌位失败!');
576 } 576 }
577 } else { 577 } else {
578 - Utils.showToast(baseResp.msg ?? '删除桌位失败!'); 578 + if (baseResp.code == 402) {
  579 + //有预订
  580 + Utils.showToast('当前桌位有未到店预订,不能被删除!');
  581 + } else {
  582 + Utils.showToast(baseResp.msg ?? '删除桌位失败!');
  583 + }
579 } 584 }
580 return false; 585 return false;
581 } 586 }
@@ -217,6 +217,8 @@ dependencies: @@ -217,6 +217,8 @@ dependencies:
217 fijkplayer: ^0.11.0 217 fijkplayer: ^0.11.0
218 218
219 city_pickers: ^1.1.3 219 city_pickers: ^1.1.3
  220 +
  221 +
220 222
221 223
222 224