diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e079db8..99066d9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 28 17:48:08 CST 2017 +#Fri Jun 05 14:45:25 CST 2026 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/local.properties b/local.properties index 75605dc..4700932 100644 --- a/local.properties +++ b/local.properties @@ -4,6 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Mon Feb 26 18:25:25 CST 2024 +#Fri Jun 05 14:50:09 CST 2026 sdk.dir=D\:\\Android\\sdk -ndk.dir=D\:\\AndroidTools\\AStudioSDK\\ndk\\21.0.6113669 diff --git a/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java b/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java index c9e852c..b851b8d 100644 --- a/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java +++ b/src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java @@ -372,8 +372,15 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim } // base.total_num.setText("剩余 " + orderInfos.get(position).getOrderAmount() + " 份"); - LogUtil.d("ReportExpandableListAdapter", "Quantity = " + orderInfos.get(position).getProducts().get(position).getQuantity()); - base.total_num.setText("剩余 " + orderInfos.get(position).getProducts().get(position).getQuantity() + " 份"); + List products = orderInfos.get(position).getProducts(); + int totalQuantity = 0; + if (products != null && !products.isEmpty()) { + for (ProductInfoQuery product : products) { + totalQuantity += Integer.parseInt(product.getQuantity()); + } + } + LogUtil.d("ReportExpandableListAdapter", "Total Quantity = " + totalQuantity); + base.total_num.setText("剩余 " + totalQuantity + " 份"); String status = orderInfos.get(position).getOrderStatus(); String paystatus = orderInfos.get(position).getPaymentWay();