6.21 1.1.03

lib/main.dart

@@ -261,35 +261,65 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
         if (res != null) {
           print('-----------data[i].template-----------');
           print(data[i].template);
-          print(json.encode(res));
+          print('json.encode(res) =============\n${json.encode(res)}');
           var order = parse2(res);
-          print(order.toString());
-          var maxAmount = 0;
+          print('order.toString()=============\n${order.toString()}');
+          var maxAmount = 0.0;
           int maxAmountNum = 0;
-          order.forEach((element) {
-            if (maxAmount < element.seller.amount) {
-              maxAmount = element.seller.amount;
-              maxAmountNum = 1;
-            } else if (maxAmount == element.seller.amount) {
-              maxAmountNum++;
+          List<String> maxAmountOwner = [];
+
+          res.forEach((key, value) {
+            if (key.contains('amount')) {
+              try {
+                if (double.parse(value) > maxAmount) {
+                  maxAmount = double.parse(value);
+                  maxAmountNum = 1;
+                  maxAmountOwner.clear();
+                  maxAmountOwner.add(res[key.replaceAll('amount', 'person')]);
+                } else if (double.parse(value) == maxAmount) {
+                  maxAmountNum++;
+                  maxAmountOwner.add(res[key.replaceAll('amount', 'person')]);
+                }
+              } catch (e) {}
             }
           });
-          print('maxAmount---------$maxAmount');
-          print('maxAmountNum---------$maxAmountNum');
-          int meIsMaximum = order.indexWhere((element) =>
-              element.seller.amount == maxAmount &&
-              (element.seller.name
-                      .contains(MyCookie().loginInformation.data.extra.name) ||
-                  MyCookie()
-                      .loginInformation
-                      .data
-                      .extra
-                      .name
-                      .contains(element.seller.name)));
-          if (meIsMaximum >= 0) {
-            commissionPayerNum = maxAmountNum;
+
+
+          // order.forEach((element) {
+          //   if (maxAmount < element.seller.amount) {
+          //     maxAmount = element.seller.amount;
+          //     maxAmountNum = 1;
+          //   } else if (maxAmount == element.seller.amount) {
+          //     maxAmountNum++;
+          //   }
+          // });
+          // print('maxAmount===========  $maxAmount');
+          // print('maxAmountNum===========  $maxAmountNum');
+          if(maxAmountOwner.isNotEmpty){
+            maxAmountOwner.forEach((element) {
+              if(MyCookie().getName().contains(element)||element.contains(MyCookie().getName())){
+                commissionPayerNum = maxAmountNum;
+              }
+            });
           }
-          print('commissionPayerNum-----------$commissionPayerNum');
+          // int meIsMaximum = order.indexWhere((element) =>
+          //     element.seller.amount == maxAmount &&
+          //     (element.seller.name
+          //             .contains(MyCookie().loginInformation.data.extra.name) ||
+          //         MyCookie()
+          //             .loginInformation
+          //             .data
+          //             .extra
+          //             .name
+          //             .contains(element.seller.name)));
+          // print('meIsMaximum ===========  $meIsMaximum');
+          // if (meIsMaximum >= 0) {
+          //   commissionPayerNum = maxAmountNum;
+          // }
+          print('maxAmount============\n$maxAmount\n==============');
+          print('maxAmountNum==============\n$maxAmountNum\n==============');
+          print('maxAmountOwner==============\n${maxAmountOwner.toString()}\n==============');
+          print('commissionPayerNum================  \n$commissionPayerNum\n==============');
           order.removeWhere((element) =>
               !element.seller.name
                   .contains(MyCookie().loginInformation.data.extra.name) &&

lib/paegs/gang_page/gang_page.dart

@@ -504,7 +504,7 @@ class _GangPageState extends State<GangPage>
     selfBuilt.forEach((element) {
       list.removeWhere((data) => data.id==element.id);
     });
-    if (list.isEmpty) return;
+    if (list.isEmpty&&selfBuilt.isEmpty) return;
     for (int i = 0, length = list.length; i < length; i++) {
       String pinyin = PinyinHelper.getPinyinE(list[i].shopName);
       String tag = pinyin.substring(0, 1).toUpperCase();