From aa86ae678e6090729921cb76b505fb3da8d320cd Mon Sep 17 00:00:00 2001
From: 18034727885 <973609879@qq.com>
Date: 星期五, 17 七月 2026 11:11:02 +0800
Subject: [PATCH] 优惠券优化
---
app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt | 2 +-
app/src/main/java/com/driver/igotrip/bean/MajorMoneyBean.java | 9 +++++++++
app/src/main/res/layout/activity_major_money_detail.xml | 30 ++++++++++++++++++++++++++++++
app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt | 2 +-
app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoney2Activity.kt | 2 +-
app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt | 7 +++----
app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt | 4 ++++
7 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/driver/igotrip/bean/MajorMoneyBean.java b/app/src/main/java/com/driver/igotrip/bean/MajorMoneyBean.java
index dbc4bb0..61e07da 100644
--- a/app/src/main/java/com/driver/igotrip/bean/MajorMoneyBean.java
+++ b/app/src/main/java/com/driver/igotrip/bean/MajorMoneyBean.java
@@ -70,6 +70,7 @@
private double duration;
private double longDistance;
private double priceDifference;
+ private double payMoney;
public int isDispute;
public double getPriceDifference() {
@@ -207,5 +208,13 @@
public void setWaitMoney(double waitMoney) {
this.waitMoney = waitMoney;
}
+
+ public double getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(double payMoney) {
+ this.payMoney = payMoney;
+ }
}
}
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
index 67b9690..40e0863 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/OrderOverActivity.kt
@@ -119,7 +119,7 @@
}
tv_order_money.text = getString(R.string.money) + it.orderMoney
tv_service_money.text = getString(R.string.money) + it.platformServerMoney
- tv_coupon_price.text = getString(R.string.money) + it.couponMoney
+ tv_coupon_price.text = "-" + getString(R.string.money) + it.couponMoney
ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0
tv_real_income.text = getString(R.string.money) + it.driverServerMoney
when (orderBean.orderState) {
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt
index a1c8710..60bb953 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorMoneyDetailActivity.kt
@@ -29,6 +29,7 @@
private val tv_mileage_money by lazy { find<TextView>(R.id.tv_mileage_money) }
private val tv_time_name by lazy { find<TextView>(R.id.tv_time_name) }
private val tv_time_money by lazy { find<TextView>(R.id.tv_time_money) }
+ private val tv_coupon_price by lazy { find<TextView>(R.id.tv_coupon_price) }
private val tv_long_distance_name by lazy { find<TextView>(R.id.tv_long_distance_name) }
private val tv_long_distance_money by lazy { find<TextView>(R.id.tv_long_distance_money) }
private val tv_long_go_money by lazy { find<TextView>(R.id.tv_long_go_money) }
@@ -38,6 +39,7 @@
private val rl_wait_name by lazy { find<View>(R.id.rl_wait_name) }
private val rl_mileage_money by lazy { find<View>(R.id.rl_mileage_money) }
private val rl_time_money by lazy { find<View>(R.id.rl_time_money) }
+ private val rl_coupon_price by lazy { find<View>(R.id.rl_coupon_price) }
private val rl_long_distance_money by lazy { find<View>(R.id.rl_long_distance_money) }
private val rl_long_go_money by lazy { find<View>(R.id.rl_long_go_money) }
private val rl_stop_car_money by lazy { find<View>(R.id.rl_stop_car_money) }
@@ -76,6 +78,7 @@
tv_mileage_money.text = "FCFA"+it.data.mileageMoney.toString()
tv_time_name.text = getString(R.string.time_money, doubleTwo(it.data.duration))
tv_time_money.text = "FCFA"+it.data.durationMoney.toString()
+ tv_coupon_price.text = "-FCFA"+it.data.couponMoney.toString()
tv_long_distance_name.text = getString(R.string.远途费公里, doubleTwo(it.data.longDistance))
tv_long_distance_money.text = "FCFA"+it.data.longDistanceMoney.toString()
tv_long_go_money.text = "FCFA"+it.data.roadTollMoney.toString()
@@ -85,6 +88,7 @@
rl_wait_name.visibility = if (it.data.wait == 0.0) View.GONE else View.VISIBLE
rl_mileage_money.visibility = if (it.data.mileageMoney == 0.0) View.GONE else View.VISIBLE
rl_time_money.visibility = if (it.data.durationMoney == 0.0) View.GONE else View.VISIBLE
+ rl_coupon_price.visibility = if (it.data.couponMoney == 0.0) View.GONE else View.VISIBLE
rl_long_distance_money.visibility = if (it.data.longDistanceMoney == 0.0) View.GONE else View.VISIBLE
// rl_long_go_money.visibility = if (it.data.roadTollMoney == 0.0) View.GONE else View.VISIBLE
//rl_stop_car_money.visibility = if (it.data.parkMoney == 0.0) View.GONE else View.VISIBLE
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoney2Activity.kt b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoney2Activity.kt
index 9ad69cc..49b3eca 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoney2Activity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoney2Activity.kt
@@ -63,7 +63,7 @@
callNet(false, Api.queryMoneyInfo, map) {
var bean = gson.fromJson<MajorMoneyBean>(it, MajorMoneyBean::class.java)
- tv_all_money.text = getString(R.string.money) + " " + bean.data.orderMoney.toString()
+ tv_all_money.text = getString(R.string.money) + " " + bean.data.payMoney.toString()
}
}
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
index 3516c92..5b49065 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/major/MajorSureMoneyActivity.kt
@@ -89,7 +89,7 @@
tv_long_distance_name.text =
getString(R.string.远途费公里, it.data.longDistance.toString())
tv_long_distance_money.text = "FCFA" + it.data.longDistanceMoney.toString()
- tv_all_money.text = getString(R.string.money) + " " + it.data.orderMoney.toString()
+ tv_all_money.text = getString(R.string.money) + " " + it.data.payMoney.toString()
price_difference_layout.visibility =
if (it.data.priceDifference != null && it.data.priceDifference > 0) View.VISIBLE else View.GONE
@@ -97,8 +97,7 @@
"${getString(R.string.money)} ${it.data.priceDifference}"
rl_coupon_price.visibility =
if (it.data.couponMoney != null && it.data.couponMoney > 0) View.VISIBLE else View.GONE
- tv_price_difference_money.text =
- "-${getString(R.string.money)} ${it.data.couponMoney}"
+ tv_coupon_price.text = "-${getString(R.string.money)} ${it.data.couponMoney}"
}
}
@@ -123,7 +122,7 @@
var allmoney = 0.0
if (tv_all_money.text.toString().isNotEmpty()) {
- setbean?.data?.orderMoney?.let {
+ setbean?.data?.payMoney?.let {
allmoney += it.toString().toDouble()
}
diff --git a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
index c36c750..d25ac86 100644
--- a/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
+++ b/app/src/main/java/com/driver/igotrip/ui/main/small_cargo/SmallOverActivity.kt
@@ -111,7 +111,7 @@
tv_pay_result_title.text = getString(R.string.订单) + getSmallStatue(it.orderState)
tv_order_money.text = getString(R.string.money) + it.orderMoney
tv_service_money.text = getString(R.string.money) + it.platformServerMoney
- tv_coupon_price.text = getString(R.string.money) + it.couponMoney
+ tv_coupon_price.text = "-" + getString(R.string.money) + it.couponMoney
ll_coupon_price.isVisible = (it.couponMoney?.toDoubleOrNull() ?: 0.0) > 0
tv_real_income.text = getString(R.string.money) + it.driverServerMoney
ll_pay_result.visible()
diff --git a/app/src/main/res/layout/activity_major_money_detail.xml b/app/src/main/res/layout/activity_major_money_detail.xml
index ed2419c..c2ac2e8 100644
--- a/app/src/main/res/layout/activity_major_money_detail.xml
+++ b/app/src/main/res/layout/activity_major_money_detail.xml
@@ -292,6 +292,36 @@
</RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/rl_coupon_price"
+ android:layout_marginTop="15dp"
+ android:layout_marginStart="12dp"
+ android:visibility="visible"
+ android:layout_marginEnd="12dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView
+ android:layout_width="200dp"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:text="@string/优惠券"
+ android:textColor="#ff000000"
+ android:textSize="12sp" />
+
+ <TextView
+ android:id="@+id/tv_coupon_price"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentEnd="true"
+ tools:text="0.00元"
+ android:textColor="#ff333333"
+ android:textSize="12sp"
+ />
+
+ </RelativeLayout>
+
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
--
Gitblit v1.7.1