From 3e823958fa12d4246cb24940e17599aa382a1605 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Mon, 30 Jul 2018 20:00:09 +0800
Subject: [PATCH] update
---
pom.xml | 2 +-
.../payment/manage/mappers/custom/CustomReportsMapper.xml | 7 ++++---
src/main/ui/index.html | 2 +-
src/main/ui/static/payment/custom/custom.js | 1 -
src/main/ui/static/payment/custom/templates/custom.html | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index fcc8224a2..351b5ceee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
au.com.royalpay.payment
payment-parent
- 0.2.0-dev
+ 0.2.0
4.0.0
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml
index e3a2aadf3..723e91688 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml
@@ -22,10 +22,11 @@
pmt_custom_reports r
on r.order_id = o.order_id
and o.client_id = #{client_id}
+ and o.channel = 'Alipay'
-
- and o.channel = #{channel}
-
+
+
+
and DATE(t.transaction_time) = #{date}
diff --git a/src/main/ui/index.html b/src/main/ui/index.html
index b9c3eb001..734b8d2fe 100644
--- a/src/main/ui/index.html
+++ b/src/main/ui/index.html
@@ -932,7 +932,7 @@ margin-bottom: 10%;"/>
-
+
Declare Custom
diff --git a/src/main/ui/static/payment/custom/custom.js b/src/main/ui/static/payment/custom/custom.js
index bd69213d0..99dfb5d7a 100644
--- a/src/main/ui/static/payment/custom/custom.js
+++ b/src/main/ui/static/payment/custom/custom.js
@@ -42,7 +42,6 @@
}]
}
}).result.then(function () {
- alert(1);
$scope.loadList(1);
})
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 19c082b96..a2b86c38c 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -21,7 +21,7 @@