xt / Flutter-ReserveApp · Commits

Go to a project

Commit 34d63e6067f0037faba9a7ddb241d3985a55daa3

Authored by wdn127929
1 parent 310333f8
build: skipped

修复未来订单不能变更到此刻之后未来订单之前的时间bug

Inline Side-by-side
Showing 3 changed files with 58 additions and 19 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "531" 21 +def flutterVersionCode = "532"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '531' 23 + flutterVersionCode = '532'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.3.1" 30 +def flutterVersionName = "5.3.2"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.3.1' 33 + flutterVersionName = '5.3.2'
34 34
35 35
36 } 36 }
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 5312; 551 + CURRENT_PROJECT_VERSION = 5320;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -563,7 +563,7 @@ @@ -563,7 +563,7 @@
563 "$(inherited)", 563 "$(inherited)",
564 "$(PROJECT_DIR)/Flutter", 564 "$(PROJECT_DIR)/Flutter",
565 ); 565 );
566 - MARKETING_VERSION = 5.3.1; 566 + MARKETING_VERSION = 5.3.2;
567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
568 PRODUCT_NAME = Runner; 568 PRODUCT_NAME = Runner;
569 PROVISIONING_PROFILE_SPECIFIER = ""; 569 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 5312; 699 + CURRENT_PROJECT_VERSION = 5320;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -711,7 +711,7 @@ @@ -711,7 +711,7 @@
711 "$(inherited)", 711 "$(inherited)",
712 "$(PROJECT_DIR)/Flutter", 712 "$(PROJECT_DIR)/Flutter",
713 ); 713 );
714 - MARKETING_VERSION = 5.3.1; 714 + MARKETING_VERSION = 5.3.2;
715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
716 PRODUCT_NAME = Runner; 716 PRODUCT_NAME = Runner;
717 PROVISIONING_PROFILE_SPECIFIER = ""; 717 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 5312; 735 + CURRENT_PROJECT_VERSION = 5320;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -747,7 +747,7 @@ @@ -747,7 +747,7 @@
747 "$(inherited)", 747 "$(inherited)",
748 "$(PROJECT_DIR)/Flutter", 748 "$(PROJECT_DIR)/Flutter",
749 ); 749 );
750 - MARKETING_VERSION = 5.3.1; 750 + MARKETING_VERSION = 5.3.2;
751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
752 PRODUCT_NAME = Runner; 752 PRODUCT_NAME = Runner;
753 PROVISIONING_PROFILE_SPECIFIER = ""; 753 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -865,9 +865,14 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { @@ -865,9 +865,14 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
865 '${dateTime.month}' + 865 '${dateTime.month}' +
866 '-' + 866 '-' +
867 '${dateTime.day}' + 867 '${dateTime.day}' +
868 - ' ${datanow[1]}:00'); //选中餐段开始时间戳 868 + ' ${datanow[1]}:00'); //选中餐段结束时间戳
869 869
870 - if (nowStime.isBefore(reserveStime)) { 870 +
  871 + //选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
  872 +
  873 +
  874 +
  875 + if (nowStime.isBefore(reserveStime)&&nowStime.isBefore(DateTime.now())) {
871 // 变更到过去餐段 876 // 变更到过去餐段
872 return true; 877 return true;
873 } else { 878 } else {
@@ -1169,19 +1174,53 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> { @@ -1169,19 +1174,53 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
1169 //属于未来时间的订单 1174 //属于未来时间的订单
1170 //将要变更的时间是不是过去 1175 //将要变更的时间是不是过去
1171 1176
1172 - if (DateTime.parse('${day.year}' + 1177 + //选中的时间+餐段组合的时间戳结束日期和现在比较，< 现在，则会变更到过去
  1178 +
  1179 + String times;
  1180 + //找到当前餐段对应的时间段
  1181 + if (currTimeIndex == 1) {
  1182 + times = morning;
  1183 + } else if (currTimeIndex == 2) {
  1184 + times = noon;
  1185 + } else if (currTimeIndex == 3) {
  1186 + times = night;
  1187 + }
  1188 + //else if (currTimeIndex == 4) {
  1189 + // times = meal1;
  1190 + // } else if (currTimeIndex == 5) {
  1191 + // times = meal2;
  1192 + // }
  1193 + //组装时间戳
  1194 + List<String> datas = times.split('-');
  1195 + // DateTime selectStime = DateTime.parse('${dateTimeSelect.year}' +
  1196 + // '-' +
  1197 + // '${dateTimeSelect.month}' +
  1198 + // '-' +
  1199 + // '${dateTimeSelect.day}' +
  1200 + // ' ${datas[0]}:00'); //选中餐段开始时间戳
  1201 + DateTime selectEtime = DateTime.parse(
  1202 + '${day.year}' +
1173 '-' + 1203 '-' +
1174 '${day.month}' + 1204 '${day.month}' +
1175 '-' + 1205 '-' +
1176 '${day.day}' + 1206 '${day.day}' +
1177 - ' 00:00:00')  
1178 - .isBefore(DateTime.parse(  
1179 - '${reservedate.year}' + 1207 + ' ${datas[1]}:00'); //选中餐段结束时间戳
  1208 +
  1209 + if (DateTime.parse('${day.year}' +
1180 '-' + 1210 '-' +
1181 - '${reservedate.month}' + 1211 + '${day.month}' +
1182 '-' + 1212 '-' +
1183 - '${reservedate.day}' +  
1184 - ' 00:00:00'))) { 1213 + '${day.day}' +
  1214 + ' 00:00:00')
  1215 + .isBefore(DateTime.parse(
  1216 + '${reservedate.year}' +
  1217 + '-' +
  1218 + '${reservedate.month}' +
  1219 + '-' +
  1220 + '${reservedate.day}' +
  1221 + ' 00:00:00')) &&
  1222 + selectEtime
  1223 + .isBefore(DateTime.now())) {
1185 Utils.showToast('不允许变更订单到过去餐段'); 1224 Utils.showToast('不允许变更订单到过去餐段');
1186 return; 1225 return;
1187 } 1226 }