修复bug
diff --git a/app/src/main/java/com/supwisdom/activities/transdtl/TransdtlActivity.kt b/app/src/main/java/com/supwisdom/activities/transdtl/TransdtlActivity.kt
index c20049a..2516bf6 100644
--- a/app/src/main/java/com/supwisdom/activities/transdtl/TransdtlActivity.kt
+++ b/app/src/main/java/com/supwisdom/activities/transdtl/TransdtlActivity.kt
@@ -152,8 +152,12 @@
"市民卡"
}
val sb = StringBuilder("查询成功 \n")
- sb.append("姓名: ").append(record.username).append("\n")
- .append("支付方式: ").append(payWay).append("\n")
+ if (record.username != null) {
+ sb.append("姓名: ").append(record.username)
+ } else {
+ sb.append("卡号: ").append(record.cardno)
+ }
+ sb.append("\n").append("支付方式: ").append(payWay).append("\n")
.append(String.format("支付金额: %.02f元", record.payamt / 100.0f)).append("\n")
.append("支付时间: ").append(transdatetime.toString()).append("\n")
.append("支付结果: ").append(result)
diff --git a/app/src/main/java/com/supwisdom/db/TransdtlUnionDao.kt b/app/src/main/java/com/supwisdom/db/TransdtlUnionDao.kt
index e764afa..b304c45 100644
--- a/app/src/main/java/com/supwisdom/db/TransdtlUnionDao.kt
+++ b/app/src/main/java/com/supwisdom/db/TransdtlUnionDao.kt
@@ -52,22 +52,25 @@
var cursor: Cursor? = null
var sql = when (flag) {
0 -> {
- (tablesql.toString()
- + " where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ ("select * from ("
+ + tablesql.toString()
+ + ") where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ "' order by " + BeanPropEnum.TransdtlUnion.transtime
+ " desc ")
}
1 -> {
- (tablesql.toString()
- + " where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ ("select * from ("
+ + tablesql.toString()
+ + ") where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ "' and " + BeanPropEnum.TransdtlUnion.status + "='"
+ PayStatus.SUC.toString()
+ "' order by " + BeanPropEnum.TransdtlUnion.transtime
+ " desc ")
}
else -> {
- (tablesql.toString()
- + " where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ ("select * from ("
+ + tablesql.toString()
+ + ") where " + BeanPropEnum.TransdtlUnion.transdate + "='" + date
+ "' and " + BeanPropEnum.TransdtlUnion.status + "='"
+ PayStatus.FAIL.toString()
+ "' order by " + BeanPropEnum.TransdtlUnion.transtime
diff --git a/app/src/main/java/com/supwisdom/utils/PublicDef.kt b/app/src/main/java/com/supwisdom/utils/PublicDef.kt
index 551a3ac..b7c482f 100644
--- a/app/src/main/java/com/supwisdom/utils/PublicDef.kt
+++ b/app/src/main/java/com/supwisdom/utils/PublicDef.kt
@@ -87,6 +87,6 @@
/**
*
*/
- const val APP_ID = "3000004"
- const val APP_SECRET = "c9ae5b4fe5014b5b9eb19e1a0797a3a3"
+ const val APP_ID = "200001"
+ const val APP_SECRET = "dc1d26c0d43e442588092c8d45c21bce"
}
\ No newline at end of file