From 639d2033f0878f5174052b45e205e717a7e3e475 Mon Sep 17 00:00:00 2001
From: peima <pei@toptons.com>
Date: Sat, 1 Aug 2026 02:22:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(runtime):=20add=5Fremove=5Fbutton=20cartInf?=
 =?UTF-8?q?o=20=E8=AF=AF=E5=8A=A0=20!=20(nullfix=20=E8=84=9A=E6=9C=AC)=20-?=
 =?UTF-8?q?>=20=E5=8E=BB=E6=8E=89.=20getCartInfoByBusiness=20=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=AF=E7=A9=BA,=20=E8=B4=AD=E7=89=A9=E8=BD=A6?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=20!=20=E5=B4=A9=E6=BA=83=20->=20AddRemoveBut?=
 =?UTF-8?q?ton=20build=20L197=20Unexpected=20null=20value.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20/shop=20=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=92=8C=20/checkout=20lineItem=20=E7=9A=84=20+/-=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/widgets/desktop/desktop_checkout.dart  | 4 +---
 lib/widgets/general/add_remove_button.dart | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/widgets/desktop/desktop_checkout.dart b/lib/widgets/desktop/desktop_checkout.dart
index 7998b81..12e3ff7 100644
--- a/lib/widgets/desktop/desktop_checkout.dart
+++ b/lib/widgets/desktop/desktop_checkout.dart
@@ -288,13 +288,11 @@ class DesktopCheckoutState extends State<DesktopCheckout> with SingleTickerProvi
   }
 
   Widget mainBody() {
-    final _bi = cartInfo?.businessInfo;
-    print('CK_DEBUG: bi=${_bi != null} shipTime=${_bi?.shippingTime} addr=${_bi?.address != null} name=${_bi?.name}');
     return ListView.builder(
       itemCount: 6,
       addAutomaticKeepAlives: true,
       itemBuilder: (BuildContext context, int position) {
-        var deliveryTimeInSeconds = (_bi?.shippingTime ?? 0) * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
+        var deliveryTimeInSeconds = (cartInfo!.businessInfo!.shippingTime ?? 0) * 60 + (durationInTraffic != null ? durationInTraffic!.value ?? 0 : 0);
         print('aaa: $deliveryTimeInSeconds');
         DateTime now = DateTime.now();
         var formatter = DateFormat('H:mm');
diff --git a/lib/widgets/general/add_remove_button.dart b/lib/widgets/general/add_remove_button.dart
index 7b42241..f83ffb3 100644
--- a/lib/widgets/general/add_remove_button.dart
+++ b/lib/widgets/general/add_remove_button.dart
@@ -61,7 +61,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
   Widget build(BuildContext context) {
     if (widget.product!.leftNum == null) {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id
@@ -102,7 +102,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
     }
     if (widget.addToBasket) {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id) {
@@ -194,7 +194,7 @@ class AddRemoveButtonState extends State<AddRemoveButton> {
       );
     } else {
       _qty = 0;
-      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!)!;
+      cartInfo = Utils.getCartInfoByBusiness(store.state.cartInfos, widget.business!);
       if (cartInfo != null) {
         for (var i = 0; i < cartInfo!.productList!.length; i++) {
           if (cartInfo!.productList![i].product!.id == widget.product!.id) {